Fix linking flags and permissions

Change-Id: I27a8fd557b4bd47e94b05ce031c3848097dc41e3

diff --git a/packaging/dumpsys.spec b/packaging/dumpsys.spec
index fbf8137..f67f522 100644 (file)
--- a/packaging/dumpsys.spec
+++ b/packaging/dumpsys.spec
@@ -89,7 +89,7 @@ ln -s ../dumpsys-service.service %{buildroot}/%{_unitdir}/basic.target.wants/dum
 %{_libdir}/libdumpsys.so.*
 %{_bindir}/dumpsys-service
 
-%defattr(0655,root,root)
+%defattr(0644,root,root)
 %{_unitdir}/basic.target.wants/dumpsys-service.service
 %{_unitdir}/dumpsys-service.service
 %{_libdir}/tmpfiles.d/dumpsys-run.conf

diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt
index 3bea7f4..c6850cf 100644 (file)
--- a/src/service/CMakeLists.txt
+++ b/src/service/CMakeLists.txt
@@ -25,7 +25,7 @@ SET(DUMPSYS_SERVICE dumpsys-service.c)
 
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR})
 ADD_EXECUTABLE(dumpsys-service ${DUMPSYS_SERVICE})
-TARGET_LINK_LIBRARIES(dumpsys-service PUBLIC ${dumpsys_service_pkgs_LIBRARIES})
+TARGET_LINK_LIBRARIES(dumpsys-service PUBLIC ${dumpsys_service_pkgs_LIBRARIES} -pie)
 
 INSTALL (TARGETS dumpsys-service DESTINATION ${CMAKE_INSTALL_BINDIR}
        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)

diff --git a/src/service/dumpsys-service.service b/src/service/dumpsys-service.service
index b6ea95a..2c0dddc 100644 (file)
--- a/src/service/dumpsys-service.service
+++ b/src/service/dumpsys-service.service
@@ -6,4 +6,6 @@ After=dbus.socket systemd-tmpfiles-setup.service
 [Service]
 Type=simple
 User=log
+Group=log
+SmackProcessLabel=System
 ExecStart=/usr/bin/dumpsys-service

diff --git a/tests/system/utils/CMakeLists.txt b/tests/system/utils/CMakeLists.txt
index 7165c59..e28646b 100644 (file)
--- a/tests/system/utils/CMakeLists.txt
+++ b/tests/system/utils/CMakeLists.txt
@@ -23,7 +23,7 @@ ADD_EXECUTABLE(test-app
               ${CMAKE_SOURCE_DIR}/src/client-api/dumpsys-system.c
               ${CMAKE_SOURCE_DIR}/src/client-api/dumpsys-user.c)
 
-TARGET_LINK_LIBRARIES(test-app PUBLIC ${dumpsys-system_pkgs_LIBRARIES})
+TARGET_LINK_LIBRARIES(test-app PUBLIC ${dumpsys-system_pkgs_LIBRARIES} -pie)
 
 LINK_DIRECTORIES(${CMAKE_BINARY_DIR})