Applied default manifest

Change-Id: If81ba68d2a0a5f3e8d200304858e375110c00071
Signed-off-by: Young-Ae Kang <youngae.kang@samsung.com>

diff --git a/lbs-server/config/lbs-server.conf b/lbs-server/config/lbs-server.conf
index 9bc13d9..2d71fcb 100644 (file)
--- a/lbs-server/config/lbs-server.conf
+++ b/lbs-server/config/lbs-server.conf
@@ -26,6 +26,11 @@
        -->
 
        <policy context="default">
+               <allow own="org.tizen.lbs.Providers.LbsServer"/>
+               <allow send_destination="org.tizen.lbs.Providers.LbsServer"/>
+               <allow receive_sender="org.tizen.lbs.Providers.LbsServer"/>
+
+               <!-- After confirming security team
                <check send_destination="org.tizen.lbs.Providers.LbsServer"
                        send_interface="org.tizen.lbs.Manager"
                        privilege="http://tizen.org/privilege/location" />
@@ -59,6 +64,7 @@
                <check receive_sender="org.tizen.lbs.Providers.LbsServer"
                        receive_interface="org.tizen.lbs.Batch"
                        privilege="http://tizen.org/privilege/location" />
+               -->
 
                <!-- This tag is for HW geofence
                <allow send_interface="org.tizen.lbs.Geofence"/>

diff --git a/packaging/lbs-server.manifest b/packaging/lbs-server.manifest
index 7440090..a76fdba 100644 (file)
--- a/packaging/lbs-server.manifest
+++ b/packaging/lbs-server.manifest
@@ -1,72 +1,5 @@
 <manifest>
-       <define>
-               <domain name="location_fw" policy="shared" />
-               <provide>
-                       <label name="location_fw::server" />
-                       <label name="location_fw::client" />
-                       <label name="location_fw::db" />
-                       <label name="location_fw::vconf" />
-                       <label name="location_fw::geofence" />
-               </provide>
-               <request>
-                       <smack request="sys-assert::core" type="rwxat"/>
-                       <smack request="connman" type="rw"/>
-                       <smack request="net-config" type="rw"/>
-                       <smack request="deviced::display" type="rw"/>
-                       <smack request="device::app_logging" type="w"/>
-                       <smack request="device::sys_logging" type="w"/>
-                       <smack request="system::use_internet" type="rwx"/>
-                       <smack request="system::vconf_setting" type="r" />
-                       <smack request="system::vconf" type="rx" />
-                       <smack request="system::media" type="rwx" />
-                       <smack request="telephony_framework::api_gps" type="rw" />
-                       <smack request="telephony_framework::api_sim" type="r" />
-                       <smack request="telephony_framework::properties" type="rw"/>
-                       <smack request="telephony_framework::api_ps_public" type="r" />
-                       <smack request="location_fw::client" type="rw" />
-                       <smack request="location_fw::vconf" type="rwx"/>
-                       <smack request="location_fw::server" type="r"/>
-                       <smack request="location_fw::geofence" type="rw"/>
-                       <smack request="tizen::vconf::public::r" type="rx"/>
-                       <smack request="tizen::vconf::public::r::platform::rw" type="rw"/>
-                       <smack request="tizen::vconf::platform::rw" type="rw"/>
-                       <smack request="tizen::vconf::location" type="rw"/>
-                       <smack request="tizen::vconf::location::enable" type="rw"/>
-               </request>
-               <permit>
-                       <smack permit="system::use_internet" type="rwx"/>
-                       <smack permit="sdbd" type="rx"/>
-               </permit>
-       </define>
-       <assign>
-               <filesystem path="/usr/share/dbus-1/system-services/org.tizen.lbs.Providers.LbsServer.service" label="_" />
-               <filesystem path="/usr/share/lbs/lbs-server.provider" label="location_fw::server" />
-               <filesystem path="/etc/rc.d/init.d/lbs-server" label="_" exec_label="none" />
-               <filesystem path="/etc/rc.d/rc5.d/S90lbs-server" label="_" exec_label="none" />
-               <filesystem path="/usr/bin/lbs-server" label="_" exec_label="location_fw" />
-               <!--This tag is for Tizen 2.4
-               <dbus name="org.tizen.lbs.Providers.LbsServer" own="location_fw" bus="system">
-                       <node name="/org/tizen/lbs/Providers/LbsServer">
-                               <interface name="org.tizen.lbs.Manager">
-                                       <annotation name="com.tizen.smack" value="location_fw::client"/>
-                               </interface>
-                               <interface name="org.tizen.lbs.Position">
-                                       <annotation name="com.tizen.smack" value="location_fw::client"/>
-                               </interface>
-                               <interface name="org.tizen.lbs.Nmea">
-                                       <annotation name="com.tizen.smack" value="location_fw::client"/>
-                               </interface>
-                               <interface name="org.tizen.lbs.Satellite">
-                                       <annotation name="com.tizen.smack" value="location_fw::client"/>
-                               </interface>
-                               <interface name="org.tizen.lbs.Batch">
-                                       <annotation name="com.tizen.smack" value="location_fw::client"/>
-                               </interface>
-                       </node>
-               </dbus>
-               -->
-       </assign>
        <request>
-               <domain name="location_fw" />
+               <domain name="_" />
        </request>
 </manifest>

diff --git a/packaging/lbs-server.service b/packaging/lbs-server.service
index bf61d50..e83b96b 100644 (file)
--- a/packaging/lbs-server.service
+++ b/packaging/lbs-server.service
@@ -4,12 +4,12 @@ After=tizen-runtime.target
 Requires=tizen-runtime.target
 
 [Service]
-Type=forking
-ExecStart=/etc/rc.d/rc5.d/S90lbs-server
+#Type=forking
+#ExecStart=/etc/rc.d/rc5.d/S90lbs-server
+ExecStart=/usr/bin/lbs-server
 MemoryLimit=10M
 User=system
 Group=system
-SmackProcessLabel=location_fw
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/lbs-server.spec b/packaging/lbs-server.spec
index 003570b..ee67ff1 100644 (file)
--- a/packaging/lbs-server.spec
+++ b/packaging/lbs-server.spec
@@ -101,11 +101,11 @@ rm -rf %{buildroot}
 %post
 
 %ifarch %arm
-       vconftool2 set -t int "db/location/replay/ReplayEnabled" "0" -s "tizen::vconf::platform::rw" -i -g 6514 -f
-       vconftool2 set -t int "db/location/replay/ReplayMode" "1" -s "tizen::vconf::platform::rw" -i -g 6514 -f
+       vconftool set -t int "db/location/replay/ReplayEnabled" "0" -s "tizen::vconf::platform::rw" -g 6514 -f
+       vconftool set -t int "db/location/replay/ReplayMode" "1" -s "tizen::vconf::platform::rw" -g 6514 -f
 %else
-       vconftool2 set -t int "db/location/replay/ReplayEnabled" "1" -s "tizen::vconf::platform::rw" -i -g 6514 -f
-       vconftool2 set -t int "db/location/replay/ReplayMode" "0" -s "tizen::vconf::platform::rw" -i -g 6514 -f
+       vconftool set -t int "db/location/replay/ReplayEnabled" "1" -s "tizen::vconf::platform::rw" -g 6514 -f
+       vconftool set -t int "db/location/replay/ReplayMode" "0" -s "tizen::vconf::platform::rw" -g 6514 -f
 %endif
 
 %post -n location-lbs-server