From 43e705ec5b655ae1ecb95a8bce9bc0ebab4bdf94 Mon Sep 17 00:00:00 2001
From: ruglory <ruglory@cac9541e-1b8d-4bfa-827e-589bba606050>
Date: Thu, 5 Mar 2009 02:47:51 +0000
Subject: [PATCH] Dbus service file created Dbus variables fixed Installation
 of lscribed and config files added

git-svn-id: https://svn.code.sf.net/p/qlscribe/svn/trunk@110 cac9541e-1b8d-4bfa-827e-589bba606050
---
 lscribed/CMakeLists.txt      |  9 +++++++--
 lscribed/lightscribe.conf.in | 16 ++++++++++------
 lscribed/lscribed.h.in       |  7 ++++---
 lscribed/service.in          |  4 ++++
 4 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 lscribed/service.in

diff --git a/lscribed/CMakeLists.txt b/lscribed/CMakeLists.txt
index 8c76a69..a341dc2 100644
--- a/lscribed/CMakeLists.txt
+++ b/lscribed/CMakeLists.txt
@@ -21,8 +21,12 @@
 FIND_PACKAGE( Dbus32 REQUIRED )
 FIND_PACKAGE( LightScribe REQUIRED )
 
+SET( LSCRIBED_CONF_FILE ${CMAKE_CURRENT_BINARY_DIR}/lightscribe.conf )
+SET( LSCRIBED_SERVICE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${QLSCRIBE_DBUS_SERVICE}.Manager.service )
+
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/lscribed.h.in ${CMAKE_CURRENT_BINARY_DIR}/lscribed.h @ONLY )
-CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/lightscribe.conf.in ${CMAKE_CURRENT_BINARY_DIR}/lightscribe.conf @ONLY )
+CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/lightscribe.conf.in ${LSCRIBED_CONF_FILE}  @ONLY )
+CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/service.in ${LSCRIBED_SERVICE_FILE} @ONLY )
 
 # lightSribe provides library only for m32 (yet?)
 IF( CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND CMAKE_COMPILER_IS_GNUCXX )
@@ -41,5 +45,6 @@ ADD_EXECUTABLE( lscribed ${LSCRIBED_SRCS} )
 
 TARGET_LINK_LIBRARIES( lscribed ${LSCRIBE_LIBRARIES} ${DBUS_LIBRARIES} )
 
-#INSTALL( TARGETS qlscribe DESTINATION sbin )
+INSTALL( TARGETS lscribed DESTINATION sbin )
+INSTALL( FILES ${LSCRIBED_CONF_FILE} ${LSCRIBED_SERVICE_FILE} DESTINATION share/qlscribe )
 
diff --git a/lscribed/lightscribe.conf.in b/lscribed/lightscribe.conf.in
index 9e2210d..b73db37 100644
--- a/lscribed/lightscribe.conf.in
+++ b/lscribed/lightscribe.conf.in
@@ -4,13 +4,17 @@
 
   <!-- ../system.conf have denied everything, so we just punch some holes -->
 
+  <!-- Only root can own the service -->
+  <policy user="root">
+    <allow own="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
+    <allow send_interface="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
+    <allow send_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
+  </policy>
+
+  <!-- Allow anyone to invoke methods on the interfaces -->
   <policy context="default">
-    <allow own="@QLSCRIBE_DBUS_SERVICE@"/>
-
-    <allow send_destination="@QLSCRIBE_DBUS_SERVICE@"/>
-    <allow receive_sender="@QLSCRIBE_DBUS_SERVICE@"/>
-
-    <allow send_path="@QLSCRIBE_DBUS_MANAGER@"/>
+    <allow send_interface="@QLSCRIBE_DBUS_MANAGER_SERVICE@"/>
+    <allow send_interface="@QLSCRIBE_DBUS_DRIVES_SERVICE@"/>
   </policy>
 
 </busconfig>
diff --git a/lscribed/lscribed.h.in b/lscribed/lscribed.h.in
index 166ac1d..17d1a60 100644
--- a/lscribed/lscribed.h.in
+++ b/lscribed/lscribed.h.in
@@ -24,9 +24,10 @@
 #include <map>
 #include <string>
 
-const char * const DBusServiceName = "@QLSCRIBE_DBUS_SERVICE@";
-const char * const DBusManagerPath = "@QLSCRIBE_DBUS_MANAGER@";
-const char * const DBusDrivesPath = "@QLSCRIBE_DBUS_DRIVES@";
+const char * const DBusServiceName = "@QLSCRIBE_DBUS_MANAGER_SERVICE@";
+const char * const DBusPath = "@QLSCRIBE_DBUS_PATH@";
+const char * const DBusManagerPath = "@QLSCRIBE_DBUS_MANAGER_PATH@";
+const char * const DBusDrivesPath = "@QLSCRIBE_DBUS_DRIVES_PATH@";
 
 extern unsigned int lastActivity;
 
diff --git a/lscribed/service.in b/lscribed/service.in
new file mode 100644
index 0000000..650b15a
--- /dev/null
+++ b/lscribed/service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=@QLSCRIBE_DBUS_MANAGER_SERVICE@
+Exec=@CMAKE_INSTALL_PREFIX@/sbin/lscribed
+User=root