From df281b5a0d82c531a8648522718e5067ef302cdb Mon Sep 17 00:00:00 2001
From: DoHyun Pyun <dh79.pyun@samsung.com>
Date: Wed, 19 Aug 2015 13:36:49 +0900
Subject: [PATCH] Modify bt-service's permission as system

Change-Id: I2f9bc99fcf183da211abb44156e5e934a402bc14
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>
---
 bt-service/CMakeLists.txt                 | 2 +-
 bt-service/bluetooth-frwk-service.conf.in | 2 +-
 bt-service/org.projectx.bt.service        | 3 ++-
 bt-service/org.projectx.bt.service.in     | 4 ----
 packaging/bluetooth-frwk-mobile.service   | 2 ++
 packaging/bluetooth-frwk.spec             | 3 ++-
 6 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 bt-service/org.projectx.bt.service.in

diff --git a/bt-service/CMakeLists.txt b/bt-service/CMakeLists.txt
index 3fc3231..81014d4 100644
--- a/bt-service/CMakeLists.txt
+++ b/bt-service/CMakeLists.txt
@@ -126,7 +126,7 @@ ELSE(LIBNOTIFY_SUPPORT)
 	TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${service_pkgs_LDFLAGS})
 ENDIF(LIBNOTIFY_SUPPORT)
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/org.projectx.bt.service.in ${CMAKE_CURRENT_SOURCE_DIR}/org.projectx.bt.service)
+#CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/org.projectx.bt.service.in ${CMAKE_CURRENT_SOURCE_DIR}/org.projectx.bt.service)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/org.projectx.bt.service DESTINATION share/dbus-1/system-services)
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
diff --git a/bt-service/bluetooth-frwk-service.conf.in b/bt-service/bluetooth-frwk-service.conf.in
index 03f609b..86bcd8a 100644
--- a/bt-service/bluetooth-frwk-service.conf.in
+++ b/bt-service/bluetooth-frwk-service.conf.in
@@ -1,7 +1,7 @@
 <!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
  "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 <busconfig>
-    <policy group="@TZ_SYS_USER_GROUP@">
+    <policy group="system">
         <allow own="org.projectx.bt"/>
         <allow own="org.projectx.bt_event"/>
 	<allow send_type="method_call"/>
diff --git a/bt-service/org.projectx.bt.service b/bt-service/org.projectx.bt.service
index d43d517..f612e67 100644
--- a/bt-service/org.projectx.bt.service
+++ b/bt-service/org.projectx.bt.service
@@ -1,5 +1,6 @@
 [D-BUS Service]
 Name=org.projectx.bt
 Exec=/bin/false
-User=guest
+User=system
+Group=system
 SystemdService=bluetooth-frwk.service
diff --git a/bt-service/org.projectx.bt.service.in b/bt-service/org.projectx.bt.service.in
deleted file mode 100644
index 799c82b..0000000
--- a/bt-service/org.projectx.bt.service.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[D-BUS Service]
-Name=org.projectx.bt
-Exec=/bin/sh -c 'export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$UID/dbus/user_bus_socket; exec /usr/bin/bt-service'
-User=guest
diff --git a/packaging/bluetooth-frwk-mobile.service b/packaging/bluetooth-frwk-mobile.service
index 09010da..ddcb51c 100644
--- a/packaging/bluetooth-frwk-mobile.service
+++ b/packaging/bluetooth-frwk-mobile.service
@@ -8,6 +8,8 @@ Type=dbus
 BusName=org.projectx.bt
 ExecStart=/usr/bin/bt-service
 KillMode=process
+User=system
+Group=system
 
 [Install]
 WantedBy=multi-user.target
diff --git a/packaging/bluetooth-frwk.spec b/packaging/bluetooth-frwk.spec
index 31ec7d5..531c3c9 100644
--- a/packaging/bluetooth-frwk.spec
+++ b/packaging/bluetooth-frwk.spec
@@ -4,7 +4,7 @@
 
 Name:       bluetooth-frwk
 Summary:    Bluetooth framework for BlueZ and Obexd. This package is Bluetooth framework based on BlueZ and Obexd stack.
-Version:    0.2.150
+Version:    0.2.151
 Release:    1
 Group:      Network & Connectivity/Bluetooth
 License:    Apache-2.0
@@ -56,6 +56,7 @@ BuildRequires:  cmake
 BuildRequires:  pkgconfig(libprivilege-control)
 BuildRequires:  pkgconfig(cynara-client)
 BuildRequires:  pkgconfig(cynara-creds-gdbus)
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 Requires(post): /usr/bin/vconftool
 Requires(post): /sbin/ldconfig
-- 
2.7.4