diff options
author | Sung-jae Park <nicesj.park@samsung.com> | 2013-01-04 09:57:52 +0900 |
---|---|---|
committer | Sung-jae Park <nicesj.park@samsung.com> | 2013-01-04 10:50:28 +0900 |
commit | 73dcdc56b0384aa8e0e4471e40ecd83f203d8eb0 (patch) | |
tree | 2e5fd283b39e348e17a0da07a4d606389d785cd4 | |
parent | 082a10bc29b9df0d77a78df256f9cdef42f7bdf7 (diff) | |
download | data-provider-master-73dcdc56b0384aa8e0e4471e40ecd83f203d8eb0.tar.gz data-provider-master-73dcdc56b0384aa8e0e4471e40ecd83f203d8eb0.tar.bz2 data-provider-master-73dcdc56b0384aa8e0e4471e40ecd83f203d8eb0.zip |
Change the systemd init script
Add SETUID for the executable image file.
Update spec file for rpmlint
Remove unnecessary environment variables
Change-Id: If6f88d4aff672cf48c98642615d164116da33911
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | data/data-provider-master.service | 23 | ||||
-rw-r--r-- | packaging/org.tizen.data-provider-master.spec | 50 |
3 files changed, 28 insertions, 47 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2688b73..9d2066d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,7 +90,7 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/abi.ini DESTINATION /usr/share/data-provi INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/conf.ini DESTINATION /usr/share/data-provider-master PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/resolution.ini DESTINATION /usr/share/data-provider-master PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "org.tizen.${PROJECT_NAME}") -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID) # INCLUDE FOR BUILD & INSTALL .PO FILES ADD_SUBDIRECTORY(res) diff --git a/data/data-provider-master.service b/data/data-provider-master.service index 0c154a6..c4859e6 100644 --- a/data/data-provider-master.service +++ b/data/data-provider-master.service @@ -14,34 +14,15 @@ # limitations under the License. # - -# Developer's NOTE: (Not related with the license) -# This description is not revised by the system team. -# So I cannot guarantees these are OK or not. - [Unit] Description=Data Provider daemon After=xorg.target -[Kill] -KillSignal=SIGTERM - -[Exec] +[Service] Environment=BUFMGR_LOCK_TYPE="once" Environment=BUFMGR_MAP_CACHE="true" -Environment=PROVIDER_DEBUG_PROVIDER="false" -Environment=PROVIDER_METHOD="pixmap" -Environment=PROVIDER_COM_CORE_THREAD="true" -StandardInput=/dev/null -StandardOutput=/dev/null -StandardError=/dev/null - -[Service] -Type=forking -ExecStartPre= +Type=simple ExecStart=/usr/bin/data-provider-master -ExecStop=kill -TERM `cat /tmp/.master.pid` -PIDFile=/tmp/.master.pid RestartSec=1 [Install] diff --git a/packaging/org.tizen.data-provider-master.spec b/packaging/org.tizen.data-provider-master.spec index 0e4642e..1498d4a 100644 --- a/packaging/org.tizen.data-provider-master.spec +++ b/packaging/org.tizen.data-provider-master.spec @@ -1,11 +1,11 @@ Name: org.tizen.data-provider-master Summary: Master data provider -Version: 0.13.28 +Version: 0.13.29 Release: 1 Group: main/app License: Flora License Source0: %{name}-%{version}.tar.gz -BuildRequires: cmake, gettext-tools +BuildRequires: cmake, gettext-tools, smack, coreutils BuildRequires: pkgconfig(ail) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(aul) @@ -46,20 +46,20 @@ CFLAGS="${CFLAGS} -Wall -Winline -Werror" LDFLAGS="${LDFLAGS}" make %{?jobs:-j%j %install rm -rf %{buildroot} %make_install -mkdir -p %{buildroot}/usr/share/license +mkdir -p %{buildroot}/%{_datarootdir}/license %pre # Executing the stop script for stopping the service of installed provider (old version) -if [ -x /etc/rc.d/init.d/data-provider-master ]; then - /etc/rc.d/init.d/data-provider-master stop +if [ -x %{_sysconfdir}/rc.d/init.d/data-provider-master ]; then + %{_sysconfdir}/rc.d/init.d/data-provider-master stop fi %post mkdir -p /opt/usr/share/live_magazine chown 5000:5000 /opt/usr/share/live_magazine -if [ -f /usr/lib/rpm-plugins/msm.so ]; then +if [ -f %{_libdir}/rpm-plugins/msm.so ]; then echo "Update smack for CONTENT SHARING FOLDER" chsmack -a "_" /opt/usr/share/live_magazine chsmack -t /opt/usr/share/live_magazine @@ -80,7 +80,7 @@ if [ ! -f "/opt/dbspace/livebox.db" ]; then touch /opt/dbspace/.livebox.db chown 0:5000 /opt/dbspace/.livebox.db chmod 640 /opt/dbspace/.livebox.db - if [ -f /usr/lib/rpm-plugins/msm.so ]; then + if [ -f %{_libdir}/rpm-plugins/msm.so ]; then echo "Update smack for DB" chsmack -a "data-provider-master::db" /opt/dbspace/.livebox.db fi @@ -91,37 +91,37 @@ if [ ! -f "/opt/dbspace/livebox.db-journal" ]; then touch /opt/dbspace/.livebox.db-journal chown 0:5000 /opt/dbspace/.livebox.db-journal chmod 640 /opt/dbspace/.livebox.db-journal - if [ -f /usr/lib/rpm-plugins/msm.so ]; then + if [ -f %{_libdir}/rpm-plugins/msm.so ]; then echo "Update smack for DB(journal)" chsmack -a "data-provider-master::db" /opt/dbspace/.livebox.db-journal fi fi -mkdir -p /etc/rc.d/rc3.d -ln -sf /etc/rc.d/init.d/data-provider-master /etc/rc.d/rc3.d/S99data-provider-master -if [ -f /usr/lib/rpm-plugins/msm.so ]; then +mkdir -p %{_sysconfdir}/rc.d/rc3.d +ln -sf %{_sysconfdir}/rc.d/init.d/data-provider-master %{_sysconfdir}/rc.d/rc3.d/S99data-provider-master +if [ -f %{_libdir}/rpm-plugins/msm.so ]; then echo "Update smack for INITD - booting script" - chsmack -a "_" /etc/rc.d/rc3.d/S99data-provider-master - chsmack -e "_" /etc/rc.d/rc3.d/S99data-provider-master + chsmack -a "_" %{_sysconfdir}/rc.d/rc3.d/S99data-provider-master + chsmack -e "_" %{_sysconfdir}/rc.d/rc3.d/S99data-provider-master fi -mkdir -p /usr/lib/systemd/user/tizen-middleware.target.wants -ln -sf /usr/lib/systemd/user/data-provider-master.service /usr/lib/systemd/user/tizen-middleware.target.wants/data-provider-master.service -if [ -f /usr/lib/rpm-plugins/msm.so ]; then +mkdir -p %{_libdir}/systemd/user/tizen-middleware.target.wants +ln -sf %{_libdir}/systemd/user/data-provider-master.service %{_libdir}/systemd/user/tizen-middleware.target.wants/data-provider-master.service +if [ -f %{_libdir}/rpm-plugins/msm.so ]; then echo "Update smack for SYSTEMD - service file" - chsmack -a "_" /usr/lib/systemd/user/tizen-middleware.target.wants/data-provider-master.service + chsmack -a "_" %{_libdir}/systemd/user/tizen-middleware.target.wants/data-provider-master.service fi echo "Successfully installed. Please start a daemon again manually" -echo "/etc/init.d/data-provider-master start" +echo "%{_sysconfdir}/init.d/data-provider-master start" %files -n org.tizen.data-provider-master %manifest org.tizen.data-provider-master.manifest %defattr(-,root,root,-) -/etc/rc.d/init.d/data-provider-master -/usr/bin/data-provider-master -/usr/bin/liveinfo -/usr/etc/package-manager/parserlib/* -/usr/share/data-provider-master/* -/usr/lib/systemd/user/data-provider-master.service -/usr/share/license/* +%{_sysconfdir}/rc.d/init.d/data-provider-master +%{_bindir}/data-provider-master +%{_bindir}/liveinfo +%{_prefix}/etc/package-manager/parserlib/* +%{_datarootdir}/data-provider-master/* +%{_libdir}/systemd/user/data-provider-master.service +%{_datarootdir}/license/* |