Merge remote-tracking branch 'origin/tizen_2.1_smack' into tizen_2.1submit/tizen_2.1/20130514.053900

4 files changed, 27 insertions, 24 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2df47f..95e3b4b 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,6 +99,8 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS})
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PKGNAME}.xml DESTINATION /usr/share/packages)
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR})
 
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PKGNAME}.rule DESTINATION /etc/smack/accesses.d)
+
 # i18n
 ADD_SUBDIRECTORY(po)
 ADD_SUBDIRECTORY(res)
diff --git a/org.tizen.pwlock.manifest b/org.tizen.pwlock.manifest
index 8ace480..049a7f9 100644
--- a/org.tizen.pwlock.manifest
+++ b/org.tizen.pwlock.manifest
@@ -1,26 +1,8 @@
 <manifest>
-    <define>
-        <domain name="org.tizen.pwlock"/>
-        <request>
-            <smack request="system::homedir" type="arwxt"/>
-            <smack request="system::vconf" type="arwxt"/>
-            <smack request="system::syslogd" type="w"/>
-            <smack request="system::use_internet" type="r"/>
-            <smack request="xorg" type="w"/>
-            <smack request="isf" type="r"/>
-            <smack request="device::app_logging" type="w"/>
-            <smack request="ail::db" type="rw"/>
-            <smack request="dbus" type="w"/>
-        </request>
-        <permit>
-            <smack permit="dbus" type="w"/>
-        </permit>
-    </define>
-    <request>
-        <domain name="org.tizen.pwlock"/>
-    </request>
-    <assign>
-        <filesystem path="/usr/share/applications/org.tizen.pwlock.desktop" label="_" />
-        <filesystem path="/usr/share/packages/org.tizen.pwlock.xml" label="_" />
-    </assign>
+	<define>
+		<domain name="org.tizen.pwlock" />
+	</define>
+	<request>
+		<domain name="org.tizen.pwlock" />
+	</request>
 </manifest>
diff --git a/org.tizen.pwlock.rule b/org.tizen.pwlock.rule
new file mode 100644
index 0000000..a457506
--- /dev/null
+++ b/org.tizen.pwlock.rule
@@ -0,0 +1,18 @@
+org.tizen.pwlock system::homedir rwxat
+org.tizen.pwlock system::vconf rwxat
+org.tizen.pwlock system::media rwxat
+org.tizen.pwlock system::share rwxat
+org.tizen.pwlock system::syslogd w
+org.tizen.pwlock sys-assert::core rwxat
+org.tizen.pwlock net-config r
+org.tizen.pwlock xorg rw
+org.tizen.pwlock isf r
+org.tizen.pwlock device::app_logging w
+org.tizen.pwlock ail::db rw
+org.tizen.pwlock dbus w
+org.tizen.pwlock pulseaudio rwxat
+org.tizen.pwlock stest-service w
+org.tizen.pwlock pkgmgr:db rw
+dbus org.tizen.pwlock w
+e17 org.tizen.pwlock w
+stest-service org.tizen.pwlock rx
diff --git a/packaging/org.tizen.pwlock.spec b/packaging/org.tizen.pwlock.spec
index a329cbe..272732f 100755
--- a/packaging/org.tizen.pwlock.spec
+++ b/packaging/org.tizen.pwlock.spec
@@ -53,6 +53,7 @@ vconftool $GOPTION set -t int memory/pwlock/state "0" -f -i
 
 %files
 %manifest org.tizen.pwlock.manifest 
+/etc/smack/accesses.d/org.tizen.pwlock.rule
 %defattr(-,root,root,-)
 %attr(4755,root,root) /usr/apps/org.tizen.pwlock/bin/pwlock
 /usr/apps/org.tizen.pwlock/bin/pwlock