1.Change access permission - User, Group

2.Remove temporary vconf script
3.Apply cynara

Change-Id: I1cc98e616e86bc5c322511cf88117821642d1042
Signed-off-by: kj7.sung <kj7.sung@samsung.com>

diff --git a/lbs-server/config/lbs-server.conf b/lbs-server/config/lbs-server.conf
index 2d71fcb0e06f282cbb2866f1f2ff90f78bdc98e5..59d0d06517f61c8eac48c922e40a74342ee776be 100644 (file)
--- a/lbs-server/config/lbs-server.conf
+++ b/lbs-server/config/lbs-server.conf
@@ -27,10 +27,9 @@
 
        <policy context="default">
                <allow own="org.tizen.lbs.Providers.LbsServer"/>
-               <allow send_destination="org.tizen.lbs.Providers.LbsServer"/>
+               <deny 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" />
@@ -64,7 +63,6 @@
                <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/lbs-server/org.tizen.lbs.Providers.LbsServer.service.in b/lbs-server/org.tizen.lbs.Providers.LbsServer.service.in
index 3548259687729424f39d3c5480e61eba8fcc2651..f964795371046efac8325970e54da48ea0796bcd 100644 (file)
--- a/lbs-server/org.tizen.lbs.Providers.LbsServer.service.in
+++ b/lbs-server/org.tizen.lbs.Providers.LbsServer.service.in
@@ -1,6 +1,5 @@
 [D-BUS Service]
 Name=org.tizen.lbs.Providers.LbsServer
 Exec=@BIN_DIR@/lbs-server
-#User=root
-User=system
-Group=system
\ No newline at end of file
+User=root
+Group=root

diff --git a/lbs-server/script/vconf-location.sh b/lbs-server/script/vconf-location.sh
deleted file mode 100644 (file)
index 36e8f94..0000000
--- a/lbs-server/script/vconf-location.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-/usr/bin/vconftool set -t int "db/location/setting/Usemylocation"  "1" -s "tizen::vconf::location::enable" -g 6514
-/usr/bin/vconftool set -t int "db/location/setting/GpsEnabled"  "1" -s "tizen::vconf::location::enable" -g 6514
-/usr/bin/vconftool set -t int "db/location/setting/NetworkEnabled"  "0" -s "tizen::vconf::location::enable" -g 6514
-/usr/bin/vconftool set -t int "db/location/setting/GpsPopup"  "1" -s "tizen::vconf::location::enable" -g 6514
-/usr/bin/vconftool set -t int "memory/location/position/state"  "0" -s "tizen::vconf::public::r::platform::rw" -i  -g 6514
-/usr/bin/vconftool set -t int "memory/location/gps/state"  "0" -s "tizen::vconf::public::r::platform::rw" -i  -g 6514
-/usr/bin/vconftool set -t int "memory/location/wps/state"  "0" -s "tizen::vconf::public::r::platform::rw" -i  -g 6514
-/usr/bin/vconftool set -t int "memory/location/last/gps/Timestamp"  "0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/gps/Latitude"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/gps/Longitude"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/gps/Altitude"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/gps/Speed"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/gps/Direction"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/gps/HorAccuracy"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/gps/VerAccuracy"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/wps/Timestamp"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/wps/Latitude"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/wps/Longitude"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/wps/Altitude"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/wps/Speed"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/wps/Direction"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t double "memory/location/last/wps/HorAccuracy"  "0.0" -s "tizen::vconf::location" -i  -g 6514
-/usr/bin/vconftool set -t int "db/location/last/gps/LocTimestamp"  "0" -s "tizen::vconf::location" -g 6514
-/usr/bin/vconftool set -t int "db/location/last/wps/LocTimestamp"  "0" -s "tizen::vconf::location" -g 6514
-/usr/bin/vconftool set -t string "db/location/last/gps/Location"  "0.0;0.0;0.0;0.0;0.0;0.0;0.0;" -s "tizen::vconf::location"  -g 6514
-/usr/bin/vconftool set -t string "db/location/last/wps/Location"  "0.0;0.0;0.0;0.0;0.0;0.0;" -s "tizen::vconf::location"  -g 6514
-/usr/bin/vconftool set -t int "db/location/nmea/LoggingEnabled"  "0" -s "tizen::vconf::platform::rw" -g 6514
-/usr/bin/vconftool set -t int "db/location/replay/ReplayEnabled"  "0" -s "tizen::vconf::platform::rw" -g 6514
-/usr/bin/vconftool set -t int "db/location/replay/ReplayMode"  "1" -s "tizen::vconf::platform::rw" -g 6514
-/usr/bin/vconftool set -t string "db/location/replay/FileName"  "nmea_replay.log" -s "tizen::vconf::platform::rw" -g 6514
-/usr/bin/vconftool set -t double "db/location/replay/ManualLatitude"  "0.0" -s "tizen::vconf::platform::rw" -g 6514
-/usr/bin/vconftool set -t double "db/location/replay/ManualLongitude"  "0.0" -s "tizen::vconf::platform::rw" -g 6514
-/usr/bin/vconftool set -t double "db/location/replay/ManualAltitude"  "0.0" -s "tizen::vconf::platform::rw"  -g 6514
-/usr/bin/vconftool set -t double "db/location/replay/ManualHAccuracy"  "0.0" -s "tizen::vconf::platform::rw"  -g 6514
-/usr/bin/vconftool set -t int "db/location/gps/Operation"  "1" -s "tizen::vconf::platform::rw"  -g 6514
-/usr/bin/vconftool set -t int "db/location/gps/OperationTest"  "0" -s "tizen::vconf::platform::rw"  -g 6514
-/usr/bin/vconftool set -t int "db/location/gps/Starting"  "0" -s "tizen::vconf::platform::rw"  -g 6514
-/usr/bin/vconftool set -t int "db/location/gps/Session"  "1" -s "tizen::vconf::platform::rw"  -g 6514
-/usr/bin/vconftool set -t double "db/location/gps/XtraDownloadTime"  "0.0" -s "tizen::vconf::platform::rw"  -g 6514
-/usr/bin/vconftool set -t string "db/location/supl/Server"  "" -s "tizen::vconf::platform::rw"  -g 6514
-/usr/bin/vconftool set -t string "db/location/supl/Port"  "7275" -s "tizen::vconf::platform::rw"  -g 6514
-/usr/bin/vconftool set -t int "db/location/supl/SslEnabled"  "1" -s "tizen::vconf::platform::rw"   -g 6514
-/usr/bin/vconftool set -t int "db/location/supl/FQDNType"  "0" -s "tizen::vconf::platform::rw"  -g 6514
-/usr/bin/vconftool set -t int "db/location/supl/Version"  "0" -s "tizen::vconf::platform::rw"  -g 6514

diff --git a/packaging/lbs-server.service b/packaging/lbs-server.service
index e83b96bfcdffaa47e8ca4c76c015bcdb3fdfdb6c..5888e29cf40ebc3e850bdbbba6d32ba13281e767 100644 (file)
--- a/packaging/lbs-server.service
+++ b/packaging/lbs-server.service
@@ -1,15 +1,13 @@
 [Unit]
 Description=lbs server daemon
-After=tizen-runtime.target
-Requires=tizen-runtime.target
 
 [Service]
 #Type=forking
 #ExecStart=/etc/rc.d/rc5.d/S90lbs-server
 ExecStart=/usr/bin/lbs-server
 MemoryLimit=10M
-User=system
-Group=system
+User=root
+Group=root
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/lbs-server.spec b/packaging/lbs-server.spec
index 6e62343a4666b07f73da94fcf80d1a7c4e3cf03f..41b5bf3aaa3655e70ff0f58518ebe334c1f7b6ab 100644 (file)
--- a/packaging/lbs-server.spec
+++ b/packaging/lbs-server.spec
@@ -89,10 +89,6 @@ chmod 755 %{buildroot}/etc/rc.d/init.d/lbs-server
 mkdir -p %{buildroot}/etc/rc.d/rc5.d
 ln -sf ../init.d/lbs-server %{buildroot}/etc/rc.d/rc5.d/S90lbs-server
 
-mkdir -p %{buildroot}/opt/usr
-install -m 755 lbs-server/script/vconf-location.sh %{buildroot}/opt/usr
-
-
 %define GPS_DUMP_DIR /opt/etc/dump.d/module.d
 
 mkdir -p %{buildroot}/%{GPS_DUMP_DIR}
@@ -104,14 +100,13 @@ rm -rf %{buildroot}
 
 
 %post
-chmod a+x /opt/usr/vconf-location.sh
-. /opt/usr/vconf-location.sh
-rm /opt/usr/vconf-location.sh
-
 
 %ifarch %arm
        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 if %aarch64
+       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
        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
@@ -122,12 +117,13 @@ rm /opt/usr/vconf-location.sh
 #      cp -f /usr/lib/location/module/libgps.so /usr/lib/location/module/libwps0.so
 #%endif
 
+
 %postun -p /sbin/ldconfig
 
 %files
 %manifest lbs-server.manifest
 %license LICENSE
-%defattr(-,system,system,-)
+%defattr(-,root,root,-)
 %{_bindir}/lbs-server
 /usr/share/dbus-1/system-services/org.tizen.lbs.Providers.LbsServer.service
 %config %{_sysconfdir}/dbus-1/system.d/lbs-server.conf
@@ -136,7 +132,6 @@ rm /opt/usr/vconf-location.sh
 %{_unitdir}/lbs-server.service
 %{_unitdir}/multi-user.target.wants/lbs-server.service
 /opt/etc/dump.d/module.d/dump_gps.sh
-/opt/usr/vconf-location.sh
 
 %files -n location-lbs-server
 %manifest location-lbs-server.manifest