From: Jinkun Jang <jinkun.jang@samsung.com>
Date: Fri, 15 Mar 2013 16:12:44 +0000 (+0900)
Subject: merge with master
X-Git-Tag: 2.1b_release~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=26415be107673648aec5097a0368f2fb4908211e;p=platform%2Fcore%2Fappfw%2Fsppc.git

merge with master
---

diff --git a/arm/bin/push_tool b/arm/bin/push_tool
index f51dc84..7836306 100755
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 22d8677..0230ad7 100755
Binary files a/arm/bin/pushd and b/arm/bin/pushd differ
diff --git a/arm/include/push.h b/arm/include/push.h
old mode 100644
new mode 100755
index 4f688d0..61e0b7c
--- a/arm/include/push.h
+++ b/arm/include/push.h
@@ -20,6 +20,8 @@
 #include <errno.h>
 #include <app.h>
 
+#define PUSH_APP_DATA_KEY  "http://tizen.org/appcontrol/data/push/appdata"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/arm/lib/libpush.so.0.2.12 b/arm/lib/libpush.so.0.2.12
index 6c1a243..3b1963b 100644
Binary files a/arm/lib/libpush.so.0.2.12 and b/arm/lib/libpush.so.0.2.12 differ
diff --git a/libpush.manifest b/libpush.manifest
index 97e8c31..f2b785f 100644
--- a/libpush.manifest
+++ b/libpush.manifest
@@ -2,4 +2,8 @@
 	<request>
 		<domain name="_"/>
 	</request>
+        <assign>
+                <filesystem path="/usr/lib/libpush.so.0.2.12" label="_"/>
+                <filesystem path="/usr/lib/libpush.so.0" label="_"/>
+        </assign>
 </manifest>
diff --git a/packaging/push.spec b/packaging/push.spec
index c6f49b4..5b2b92a 100755
--- a/packaging/push.spec
+++ b/packaging/push.spec
@@ -1,7 +1,7 @@
 Name:       push
 Summary:    Push services and client library.
-Version:    0.2.32
-Release:    1
+Version:    0.2.37
+Release:    2
 Group:      TO_BE_FILLED
 License:    TO_BE_FILLED
 Source0:    %{name}-%{version}.tar.gz
@@ -136,8 +136,13 @@ vconftool set -t string file/private/push-bin/dev_info ${_DEV_INFO} ${_GRP} -f
 vconftool set -t string file/private/push-bin/ip_pv ${_IP_PV} ${_GRP} -f
 vconftool set -t int    file/private/push-bin/port_pv ${_PORT_PV} ${_GRP} -f
 vconftool set -t int    file/private/push-bin/ping_int ${_PING_INT} ${_GRP} -f
+vconftool set -t string file/private/push-bin/devtk "" ${_GRP} -f
+vconftool set -t string file/private/push-bin/ip_pri "" ${_GRP} -f
+vconftool set -t int    file/private/push-bin/port_pri -1 ${_GRP} -f
+vconftool set -t string file/private/push-bin/ip_sec "" ${_GRP} -f
+vconftool set -t int    file/private/push-bin/port_sec -1 ${_GRP} -f
 
-vconftool unset file/private/push-bin/devtk
+#vconftool unset file/private/push-bin/devtk
 
 %post -n libpush
 /sbin/ldconfig
diff --git a/push-bin.manifest b/push-bin.manifest
index 730b11b..4a9e6f0 100644
--- a/push-bin.manifest
+++ b/push-bin.manifest
@@ -1,6 +1,13 @@
 <manifest>
 	<define> 
 		<domain name="push-service" policy="restricted" plist="push-bin,push-tool,libpush"/>
+		 <request>
+                        <smack request="system::use_internet" type="rw"/>
+                        <smack request="sys-assert::core" type="rwxat"/>
+		</request>
+		<permit>
+                        <smack permit="system::use_internet" type="w"/>
+		</permit>
 		<provide>
 			<label name="push-service::db"/>
 		</provide>
@@ -12,5 +19,7 @@
 		<filesystem path="/etc/init.d/pushd" label="_" exec_label="none"/>
 		<filesystem path="/etc/rc.d/rc3.d/S90pushd" label="_" exec_label="none"/>
 		<filesystem path="/etc/rc.d/rc5.d/S90pushd" label="_" exec_label="none"/>
+		<filesystem path="/usr/lib/systemd/user/pushd.service" label="_" exec_label="none" />
+		<filesystem path="/usr/lib/systemd/user/tizen-middleware.target.wants/pushd.service" label="_" exec_label="none" />
 	</assign>
 </manifest>
diff --git a/x86/bin/push_tool b/x86/bin/push_tool
index f224ae2..37d4a83 100755
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 7a635b9..36e4fd7 100755
Binary files a/x86/bin/pushd and b/x86/bin/pushd differ
diff --git a/x86/include/push.h b/x86/include/push.h
old mode 100644
new mode 100755
index 4f688d0..61e0b7c
--- a/x86/include/push.h
+++ b/x86/include/push.h
@@ -20,6 +20,8 @@
 #include <errno.h>
 #include <app.h>
 
+#define PUSH_APP_DATA_KEY  "http://tizen.org/appcontrol/data/push/appdata"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/x86/lib/libpush.so.0.2.12 b/x86/lib/libpush.so.0.2.12
index 5622ae5..1b8641b 100644
Binary files a/x86/lib/libpush.so.0.2.12 and b/x86/lib/libpush.so.0.2.12 differ