Change smack manifest

Change-Id: I04e0d180e2c1f6052e96a7c4a17c914da37dc827

diff --git a/packaging/telephony-daemon.service b/packaging/telephony-daemon.service
index 043dce4..61af9ed 100644 (file)
--- a/packaging/telephony-daemon.service
+++ b/packaging/telephony-daemon.service
@@ -5,7 +5,6 @@ After=secure-storage.service
 [Service]
 User=system
 Group=system
-SmackProcessLabel=telephony_framework
 ExecStart=/usr/bin/telephony-daemon
 Restart=always
 RestartSec=0

diff --git a/packaging/telephony-daemon.spec b/packaging/telephony-daemon.spec
index 49313b5..3b77daf 100644 (file)
--- a/packaging/telephony-daemon.spec
+++ b/packaging/telephony-daemon.spec
@@ -1,6 +1,6 @@
 %define major 1
 %define minor 3
-%define patchlevel 33
+%define patchlevel 34
 
 Name:           telephony-daemon
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/telephony-daemon.manifest b/telephony-daemon.manifest
index 282062f..97e8c31 100755 (executable)
--- a/telephony-daemon.manifest
+++ b/telephony-daemon.manifest
@@ -1,80 +1,5 @@
 <manifest>
-       <define>
-               <domain name="telephony_framework" policy="restricted"/>
-               <provide>
-                       <label name="telephony_framework::db"/>
-                       <label name="telephony_framework::api_manager"/>
-                       <label name="telephony_framework::api_call"/>
-                       <label name="telephony_framework::api_gps"/>
-                       <label name="telephony_framework::api_modem"/>
-                       <label name="telephony_framework::api_network"/>
-                       <label name="telephony_framework::api_phonebook"/>
-                       <label name="telephony_framework::api_sap"/>
-                       <label name="telephony_framework::api_sat"/>
-                       <label name="telephony_framework::api_sim"/>
-                       <label name="telephony_framework::api_sms"/>
-                       <label name="telephony_framework::api_ss"/>
-                       <label name="telephony_framework::api_ps_public"/>
-                       <label name="telephony_framework::api_ps_profile"/>
-                       <label name="telephony_framework::api_ps_private"/>
-                       <label name="telephony_framework::api_private"/>
-                       <label name="telephony_framework::properties"/>
-               </provide>
-               <request>
-                       <smack request="telephony_framework::db" type="rwx"/>
-                       <smack request="telephony_framework::api_manager" type="rwx"/>
-                       <smack request="telephony_framework::api_call" type="rwx"/>
-                       <smack request="telephony_framework::api_gps" type="rwx"/>
-                       <smack request="telephony_framework::api_modem" type="rwx"/>
-                       <smack request="telephony_framework::api_network" type="rwx"/>
-                       <smack request="telephony_framework::api_phonebook" type="rwx"/>
-                       <smack request="telephony_framework::api_sap" type="rwx"/>
-                       <smack request="telephony_framework::api_sat" type="rwx"/>
-                       <smack request="telephony_framework::api_sim" type="rwx"/>
-                       <smack request="telephony_framework::api_sms" type="rwx"/>
-                       <smack request="telephony_framework::api_ss" type="rwx"/>
-                       <smack request="telephony_framework::api_ps_public" type="rwx"/>
-                       <smack request="telephony_framework::api_ps_profile" type="rwx"/>
-                       <smack request="telephony_framework::api_ps_private" type="rwx"/>
-                       <smack request="telephony_framework::api_private" type="rwx"/>
-                       <smack request="telephony_framework::properties" type="rwx"/>
-                       <smack request="dbus" type="rwx"/>
-                       <smack request="system::use_internet" type="rwx"/>
-                       <smack request="secure-storage::telephony_sim" type="rw"/>
-                       <smack request="security-server::api-privilege-by-pid" type="w"/>
-                       <smack request="deviced::display" type="rw"/>
-                       <smack request="alarm-server::alarm" type="rw"/>
-                       <smack request="device::sys_logging" type="rw"/>
-                       <smack request="device::app_logging" type="rw"/>
-                       <smack request="deviced" type="rwx"/>
-                       <smack request="pkgmgr::db" type="r"/>
-                       <smack request="tizen::vconf::network" type="rw"/>
-                       <smack request="tizen::vconf::setting::admin" type="rw"/>
-                       <smack request="tizen::vconf::telephony::admin" type="rw"/>
-                       <smack request="tizen::vconf::public::r" type="rw"/>
-                       <smack request="tizen::vconf::platform::r" type="rw"/>
-                       <smack request="tizen::vconf::platform::rw" type="rw"/>
-                       <smack request="tizen::vconf::display" type="rl"/>
-                       <smack request="tizen::vconf::public::r::platform::rw" type="rw"/>
-               </request>
-               <permit>
-                       <smack permit="dbus" type="rwx"/>
-                       <smack permit="system::use_internet" type="rwx"/>
-               </permit>
-       </define>
-       <assign>
-               <filesystem path="/usr/lib/systemd/system/telephony-daemon.service" label="_"/>
-               <filesystem path="/usr/lib/systemd/system/tizen-system.target.wants/telephony-daemon.service" label="_"/>
-               <filesystem path="db/telephony" label="telephony_framework::db"/>
-               <dbus name="org.tizen.telephony" own="telephony_framework" bus="system">
-                       <node name="/org/tizen/telephony">
-                               <interface name="org.freedesktop.DBus.Properties">
-                                       <annotation name="com.tizen.smack" value="telephony_framework::properties"/>
-                               </interface>
-                       </node>
-               </dbus>
-       </assign>
        <request>
-               <domain name="telephony_framework"/>
+               <domain name="_"/>
        </request>
 </manifest>