major version up : included below patches

- moved user daemon to system daemon
- applied SLP code (Push message format updated in Protoc-C)
- added uid as mum-id for registration/deregistration/notification
- added SMACK security label and modified service user and group
Change-Id: I29a93efac6aea14511c3e527b0f1fedb25040e40
Signed-off-by: Ickhee Woo <ickhee.woo@samsung.com>

diff --git a/aarch64/bin/push_tool b/aarch64/bin/push_tool
index a39f5aa..ef99eae 100755 (executable)
Binary files a/aarch64/bin/push_tool and b/aarch64/bin/push_tool differ

diff --git a/aarch64/bin/pushd b/aarch64/bin/pushd
index 4eda82e..75d1e80 100755 (executable)
Binary files a/aarch64/bin/pushd and b/aarch64/bin/pushd differ

diff --git a/aarch64/lib64/libpush.so.0.2.12 b/aarch64/lib64/libpush.so.0.2.12
index 87345cc..7726e9f 100644 (file)
Binary files a/aarch64/lib64/libpush.so.0.2.12 and b/aarch64/lib64/libpush.so.0.2.12 differ

diff --git a/arm/bin/push_tool b/arm/bin/push_tool
index 717f217..24372af 100755 (executable)
Binary files a/arm/bin/push_tool and b/arm/bin/push_tool differ

diff --git a/arm/bin/pushd b/arm/bin/pushd
index 7c19360..227d091 100755 (executable)
Binary files a/arm/bin/pushd and b/arm/bin/pushd differ

diff --git a/arm/lib/libpush.so.0.2.12 b/arm/lib/libpush.so.0.2.12
index 298fa5a..1156129 100644 (file)
Binary files a/arm/lib/libpush.so.0.2.12 and b/arm/lib/libpush.so.0.2.12 differ

diff --git a/arm_wearable/bin/push_tool b/arm_wearable/bin/push_tool
index 717f217..24372af 100755 (executable)
Binary files a/arm_wearable/bin/push_tool and b/arm_wearable/bin/push_tool differ

diff --git a/arm_wearable/bin/pushd b/arm_wearable/bin/pushd
index 61b684e..09d68a5 100755 (executable)
Binary files a/arm_wearable/bin/pushd and b/arm_wearable/bin/pushd differ

diff --git a/arm_wearable/lib/libpush.so.0.2.12 b/arm_wearable/lib/libpush.so.0.2.12
index cdc5b3e..52bc83a 100644 (file)
Binary files a/arm_wearable/lib/libpush.so.0.2.12 and b/arm_wearable/lib/libpush.so.0.2.12 differ

diff --git a/packaging/push.spec b/packaging/push.spec
index e796738..12b5e56 100644 (file)
--- a/packaging/push.spec
+++ b/packaging/push.spec
@@ -2,7 +2,7 @@
 
 Name:       push
 Summary:    Push services and client library
-Version:    0.4.39
+Version:    0.4.40
 Release:    1
 Group:      Application Framework/Service
 License:    Apache-2.0
@@ -62,9 +62,9 @@ Push service tool
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants
-install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir_user}/pushd.service
-ln -s ../pushd.service %{buildroot}%{_unitdir_user}/default.target.wants/pushd.service
+mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
+install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/pushd.service
+%install.service multi-user.target.wants pushd.service
 
 mkdir -p %{buildroot}/usr/share/license
 cp -f LICENSE %{buildroot}/usr/share/license/%{name}
@@ -207,12 +207,15 @@ cp -a x86_64/share/push/*.cer %{buildroot}/usr/share/push/
 
 
 %post bin
-#mkdir -p /usr/dbspace
-#sqlite3 /usr/dbspace/.push.db "PRAGMA journal_mode = PERSIST; create table a(a); drop table a;" > /dev/null
-#chown system:system /usr/dbspace/.push.db
-#chown system:system /usr/dbspace/.push.db-journal
-#chmod 660 /usr/dbspace/.push.db
-#chmod 660 /usr/dbspace/.push.db-journal
+mkdir -p %{buildroot}%{TZ_SYS_DB}
+sqlite3 %{buildroot}%{TZ_SYS_DB}/.push.db "PRAGMA journal_mode = PERSIST; create table a(a); drop table a;" > /dev/null
+chown service_fw:service_fw %{TZ_SYS_DB}/.push.db
+chown service_fw:service_fw %{TZ_SYS_DB}/.push.db-journal
+chmod 660 %{TZ_SYS_DB}/.push.db
+chmod 660 %{TZ_SYS_DB}/.push.db-journal
+
+chsmack -a "*" %{TZ_SYS_DB}/.push.db
+chsmack -a "*" %{TZ_SYS_DB}/.push.db-journal
 
 %post -n libpush
 /sbin/ldconfig
@@ -221,7 +224,7 @@ cp -a x86_64/share/push/*.cer %{buildroot}/usr/share/push/
 
 %files -n libpush
 %manifest libpush.manifest
-%attr(644,system,system)%{_libdir}/libpush.so.*
+%attr(644,service_fw,service_fw)%{_libdir}/libpush.so.*
 
 %files -n libpush-devel
 %{_includedir}/*.h
@@ -231,17 +234,17 @@ cp -a x86_64/share/push/*.cer %{buildroot}/usr/share/push/
 %files bin
 %manifest push-bin.manifest
 %{_bindir}/pushd
-%attr(644,system,system)/usr/share/push/*.cer
-%attr(644,system,system)/usr/share/license/%{name}
+%attr(644,service_fw,service_fw)/usr/share/push/*.cer
+%attr(644,service_fw,service_fw)/usr/share/license/%{name}
 
 # This is a certificate file to access to logging server by HTTPS.
 %if %{_support_weblog}
-%attr(644,system,system)/usr/share/push/push_sslkey.pem
-%attr(644,system,system)/usr/share/push/prd-dl-key.pem
+%attr(644,service_fw,service_fw)/usr/share/push/push_sslkey.pem
+%attr(644,service_fw,service_fw)/usr/share/push/prd-dl-key.pem
 %endif
 
-%{_unitdir_user}/pushd.service
-%{_unitdir_user}/default.target.wants/pushd.service
+%{_unitdir}/pushd.service
+%{_unitdir}/multi-user.target.wants/pushd.service
 
 %files tool
 %manifest push-tool.manifest

diff --git a/packaging/pushd.service b/packaging/pushd.service
index d0bd7e1..49dd363 100755 (executable)
--- a/packaging/pushd.service
+++ b/packaging/pushd.service
@@ -4,11 +4,13 @@ After=dbus.service
 
 [Service]
 Type=simple
+SmackProcessLabel=System
 ExecStart=/usr/bin/pushd
 Restart=always
 RestartSec=1
 MemoryLimit=10M
+User=service_fw
+Group=service_fw
 
 [Install]
-WantedBy=default.target
-
+WantedBy=multi-user.target

diff --git a/x86/bin/push_tool b/x86/bin/push_tool
index 1098e00..cd6e630 100755 (executable)
Binary files a/x86/bin/push_tool and b/x86/bin/push_tool differ

diff --git a/x86/bin/pushd b/x86/bin/pushd
index b685ecc..458706d 100755 (executable)
Binary files a/x86/bin/pushd and b/x86/bin/pushd differ

diff --git a/x86/lib/libpush.so.0.2.12 b/x86/lib/libpush.so.0.2.12
index 290a87a..64303d4 100644 (file)
Binary files a/x86/lib/libpush.so.0.2.12 and b/x86/lib/libpush.so.0.2.12 differ

diff --git a/x86_64/bin/push_tool b/x86_64/bin/push_tool
index 7a7cdec..e5f1df9 100755 (executable)
Binary files a/x86_64/bin/push_tool and b/x86_64/bin/push_tool differ

diff --git a/x86_64/bin/pushd b/x86_64/bin/pushd
index 9e9f59a..9def900 100755 (executable)
Binary files a/x86_64/bin/pushd and b/x86_64/bin/pushd differ

diff --git a/x86_64/lib64/libpush.so.0.2.12 b/x86_64/lib64/libpush.so.0.2.12
index 2863872..aed0d8a 100644 (file)
Binary files a/x86_64/lib64/libpush.so.0.2.12 and b/x86_64/lib64/libpush.so.0.2.12 differ

diff --git a/x86_wearable/bin/push_tool b/x86_wearable/bin/push_tool
index 1098e00..cd6e630 100755 (executable)
Binary files a/x86_wearable/bin/push_tool and b/x86_wearable/bin/push_tool differ

diff --git a/x86_wearable/bin/pushd b/x86_wearable/bin/pushd
index 58da8ae..c746d05 100755 (executable)
Binary files a/x86_wearable/bin/pushd and b/x86_wearable/bin/pushd differ

diff --git a/x86_wearable/lib/libpush.so.0.2.12 b/x86_wearable/lib/libpush.so.0.2.12
index fc02eb4..06f958b 100644 (file)
Binary files a/x86_wearable/lib/libpush.so.0.2.12 and b/x86_wearable/lib/libpush.so.0.2.12 differ