build: setup all data (polkit, icon, dbus...) in the same `data' directory

Also fixed dist when not using polkit, the icon was no longer included in the
tarball.

6 files changed, 319 insertions, 0 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 00000000..bca0a7be
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,60 @@
+
+# DBus Service file
+dbusservicedir = $(DBUS_SYS_DIR)
+dbusservice_DATA = org.freedesktop.ModemManager.conf
+dbusservice_file_polkit = org.freedesktop.ModemManager.conf.polkit
+dbusservice_file_nopolkit = org.freedesktop.ModemManager.conf.nopolkit
+
+if WITH_POLKIT
+org.freedesktop.ModemManager.conf: $(top_srcdir)/data/$(dbusservice_file_polkit)
+	cp -f $(top_srcdir)/data/$(dbusservice_file_polkit) $(dbusservice_DATA)
+else
+org.freedesktop.ModemManager.conf:  $(top_srcdir)/data/$(dbusservice_file_nopolkit)
+	cp -f $(top_srcdir)/data/$(dbusservice_file_nopolkit) $(dbusservice_DATA)
+endif
+
+
+# DBus Activation file
+edit = @sed \
+       -e 's|@sbindir[@]|$(sbindir)|g' \
+       -e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+       -e 's|@localstatedir[@]|$(localstatedir)|g' \
+       -e 's|@libexecdir[@]|$(libexecdir)|g'
+dbusactivationdir = $(datadir)/dbus-1/system-services
+dbusactivation_in_files = org.freedesktop.ModemManager.service.in
+dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
+%service: %service.in
+	$(edit) $< >$@
+
+
+# DBus Introspection files
+XMLS = $(wildcard $(top_srcdir)/introspection/*.xml)
+xmldir = $(datadir)/dbus-1/interfaces
+xml_DATA = $(filter-out $(top_srcdir)/introspection/all.xml, $(XMLS))
+
+
+# Icon
+icondir=${datadir}/icons/hicolor/22x22/apps
+icon_DATA = modem-manager.png
+
+
+# Polkit
+dist_polkit_policy_in_files = org.freedesktop.modem-manager.policy.in
+if WITH_POLKIT
+polkit_policydir = $(datadir)/polkit-1/actions
+dist_polkit_policy_DATA = $(dist_polkit_policy_in_files:.policy.in=.policy)
+@INTLTOOL_POLICY_RULE@
+endif
+
+
+DISTCLEANFILES = \
+	$(dbusactivation_DATA) \
+	$(dbusservice_DATA)
+
+EXTRA_DIST = \
+	$(dbusactivation_in_files) \
+	$(dbusservice_file_polkit) \
+	$(dbusservice_file_nopolkit) \
+	$(icon_DATA) \
+	$(dist_polkit_policy_in_files)
+
diff --git a/data/modem-manager.png b/data/modem-manager.png
new file mode 100644
index 00000000..386abd54
--- /dev/null
+++ b/data/modem-manager.png
diff --git a/data/org.freedesktop.ModemManager.conf.nopolkit b/data/org.freedesktop.ModemManager.conf.nopolkit
new file mode 100644
index 00000000..2f331613
--- /dev/null
+++ b/data/org.freedesktop.ModemManager.conf.nopolkit
@@ -0,0 +1,17 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <!-- This config allows anyone to control ModemManager -->
+
+  <policy context="default">
+    <allow send_destination="org.freedesktop.ModemManager"/>
+  </policy>
+
+  <policy user="root">
+    <allow own="org.freedesktop.ModemManager"/>
+  </policy>
+
+  <limit name="max_replies_per_connection">512</limit>
+</busconfig>
+
diff --git a/data/org.freedesktop.ModemManager.conf.polkit b/data/org.freedesktop.ModemManager.conf.polkit
new file mode 100644
index 00000000..25490e33
--- /dev/null
+++ b/data/org.freedesktop.ModemManager.conf.polkit
@@ -0,0 +1,154 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <policy context="default">
+    <deny send_destination="org.freedesktop.ModemManager"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.DBus.Introspectable"/>
+
+    <!-- Methods listed here are explicitly allowed or PolicyKit protected.
+         The rest are restricted to root for security.
+      -->
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager"
+           send_member="EnumerateDevices"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.DBus.Properties"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem"
+           send_member="GetInfo"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Cdma"
+           send_member="GetSignalQuality"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Cdma"
+           send_member="GetServingSystem"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Cdma"
+           send_member="GetRegistrationState"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Cdma"
+           send_member="GetEsn"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Network"
+           send_member="GetSignalQuality"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Network"
+           send_member="GetBand"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Network"
+           send_member="GetNetworkMode"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Network"
+           send_member="GetRegistrationInfo"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Network"
+           send_member="Scan"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Card"
+           send_member="GetImei"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Card"
+           send_member="GetImsi"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Card"
+           send_member="SendPuk"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Card"
+           send_member="SendPin"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Card"
+           send_member="EnablePin"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Card"
+           send_member="ChangePin"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Contacts"
+           send_member="Add"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Contacts"
+           send_member="Delete"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Contacts"
+           send_member="Get"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Contacts"
+           send_member="List"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Contacts"
+           send_member="Find"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.Contacts"
+           send_member="GetCount"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.SMS"
+           send_member="Delete"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.SMS"
+           send_member="Get"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.SMS"
+           send_member="List"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.SMS"
+           send_member="Save"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.SMS"
+           send_member="Send"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.SMS"
+           send_member="SendFromStorage"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.SMS"
+           send_member="SetIndication"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.SMS"
+           send_member="GetSmsc"/>
+
+    <allow send_destination="org.freedesktop.ModemManager"
+           send_interface="org.freedesktop.ModemManager.Modem.Gsm.SMS"
+           send_member="SetSmsc"/>
+  </policy>
+
+  <policy user="root">
+    <allow own="org.freedesktop.ModemManager"/>
+    <allow send_destination="org.freedesktop.ModemManager"/>
+  </policy>
+
+  <limit name="max_replies_per_connection">512</limit>
+</busconfig>
+
diff --git a/data/org.freedesktop.ModemManager.service.in b/data/org.freedesktop.ModemManager.service.in
new file mode 100644
index 00000000..2b73ccea
--- /dev/null
+++ b/data/org.freedesktop.ModemManager.service.in
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.freedesktop.ModemManager
+Exec=@sbindir@/modem-manager
+User=root
diff --git a/data/org.freedesktop.modem-manager.policy.in b/data/org.freedesktop.modem-manager.policy.in
new file mode 100644
index 00000000..aab65bfb
--- /dev/null
+++ b/data/org.freedesktop.modem-manager.policy.in
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
+ "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/PolicyKit/1.0/policyconfig.dtd">
+
+<policyconfig>
+
+  <vendor>ModemManager</vendor>
+  <vendor_url>http://www.freedesktop.org/wiki/ModemManager</vendor_url>
+  <icon_name>modem-manager</icon_name>
+
+  <action id="org.freedesktop.ModemManager.Control">
+    <_description>Control the Modem Manager daemon</_description>
+    <_message>System policy prevents controlling the Modem Manager.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.freedesktop.ModemManager.Device.Control">
+    <_description>Unlock and control a mobile broadband device</_description>
+    <_message>System policy prevents unlocking or controlling the mobile broadband device.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_self_keep</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.freedesktop.ModemManager.Device.Info">
+    <_description>Request mobile broadband device identifying information</_description>
+    <_message>System policy prevents requesting identifying information from the mobile broadband device.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.freedesktop.ModemManager.Contacts">
+    <_description>Add, modify, and delete mobile broadband contacts</_description>
+    <_message>System policy prevents adding, modifying, or deleting this device's contacts.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_self_keep</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.freedesktop.ModemManager.SMS">
+    <_description>Send, save, modify, and delete text messages</_description>
+    <_message>System policy prevents sending or maniuplating this device's text messages.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_self_keep</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.freedesktop.ModemManager.Location">
+    <_description>Enable and view geographic location and positioning information</_description>
+    <_message>System policy prevents enabling or viewing geographic location information.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_self_keep</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.freedesktop.ModemManager.USSD">
+    <_description>Query and utilize network information and services</_description>
+    <_message>System policy prevents querying or utilizing network information and services.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>yes</allow_active>
+    </defaults>
+  </action>
+
+  <action id="org.freedesktop.ModemManager.Firmware">
+    <_description>Query and manage firmware on a mobile broadband device</_description>
+    <_message>System policy prevents querying or managing this device's firmware.</_message>
+    <defaults>
+      <allow_inactive>no</allow_inactive>
+      <allow_active>auth_admin</allow_active>
+    </defaults>
+  </action>
+
+</policyconfig>