From 811ac7a07941f11e4e8acfcba9b75d50d009f798 Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sat, 12 Oct 2013 13:50:02 +0100
Subject: polkit: Tidy up polkit support

---
 polkit/Makefile                                    | 26 ++++++++++++++++++++++
 polkit/org.mageia.drakconf.policy.in               | 22 ++++++++++++++++++
 polkit/org.mageia.drakxconf.policy.in              | 22 ++++++++++++++++++
 .../policy/org.mageia.control-centre-gui.policy.in | 22 ------------------
 polkit/policy/org.mageia.control-centre.policy.in  | 22 ------------------
 polkit/wrappers/drakxconf                          |  2 --
 6 files changed, 70 insertions(+), 46 deletions(-)
 create mode 100644 polkit/Makefile
 create mode 100644 polkit/org.mageia.drakconf.policy.in
 create mode 100644 polkit/org.mageia.drakxconf.policy.in
 delete mode 100644 polkit/policy/org.mageia.control-centre-gui.policy.in
 delete mode 100644 polkit/policy/org.mageia.control-centre.policy.in
 delete mode 100755 polkit/wrappers/drakxconf

(limited to 'polkit')

diff --git a/polkit/Makefile b/polkit/Makefile
new file mode 100644
index 00000000..4c379cd8
--- /dev/null
+++ b/polkit/Makefile
@@ -0,0 +1,26 @@
+BINDIR = /usr/bin
+LIBEXECDIR = /usr/libexec
+BINDEST = $(DESTDIR)$(BINDIR)
+POLKITPOLICYDEST = $(DESTDIR)/usr/share/polkit-1/actions
+
+POLICY_IN := $(wildcard *.policy.in)
+POLICY = $(POLICY_IN:.policy.in=.policy)
+WRAPPERS = $(patsubst org.mageia.%.policy,%,$(POLICY))
+# Hack for custom wrapper for drakconf
+WRAPPERS = drakxconf
+
+all: $(WRAPPERS) $(POLICY)
+
+clean:
+	rm -f  $(WRAPPERS) $(POLICY)
+
+%: org.mageia.%.policy.in
+	@echo -e "#!/bin/sh\nexec $(BINDIR)/pkexec $(LIBEXECDIR)/$@ $$""*" > $@
+
+%.policy: %.policy.in
+	intltool-merge --utf8 ../po $< $@ -x -u -c ../po/.intltool-merge-cache
+
+install: all
+	install -d $(BINDEST) $(POLKITPOLICYDEST)
+	install -m755 $(WRAPPERS) $(BINDEST)
+	install -m644 $(POLICY) $(POLKITPOLICYDEST)
diff --git a/polkit/org.mageia.drakconf.policy.in b/polkit/org.mageia.drakconf.policy.in
new file mode 100644
index 00000000..1fc2a36a
--- /dev/null
+++ b/polkit/org.mageia.drakconf.policy.in
@@ -0,0 +1,22 @@
+<?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/policyconfig.dtd">
+<policyconfig>
+
+ <vendor>Mageia</vendor>
+ <vendor_url>http://mageia.org/control-centre-gui</vendor_url>
+
+ <action id="org.mageia.drakconf.pkexec.run">
+    <_description>Run Mageia Control Centre GUI</_description>
+    <_message>Authentication is required to run Mageia Control Centre GUI</_message>
+    <icon_name>drakconf</icon_name>
+    <defaults>
+     <allow_any>no</allow_any>
+     <allow_inactive>no</allow_inactive>
+     <allow_active>auth_admin_keep</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/drakconf</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+ </action>
+</policyconfig>
diff --git a/polkit/org.mageia.drakxconf.policy.in b/polkit/org.mageia.drakxconf.policy.in
new file mode 100644
index 00000000..c4f63791
--- /dev/null
+++ b/polkit/org.mageia.drakxconf.policy.in
@@ -0,0 +1,22 @@
+<?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/policyconfig.dtd">
+<policyconfig>
+
+ <vendor>Mageia</vendor>
+ <vendor_url>http://mageia.org/control-centre</vendor_url>
+
+ <action id="org.mageia.drakxconf.pkexec.run">
+    <_description>Run Mageia Control Centre</_description>
+    <_message>Authentication is required to run Mageia Control Centre</_message>
+    <icon_name>drakconf</icon_name>
+    <defaults>
+     <allow_any>no</allow_any>
+     <allow_inactive>no</allow_inactive>
+     <allow_active>auth_admin_keep</allow_active>
+    </defaults>
+    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/drakxconf</annotate>
+    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
+ </action>
+</policyconfig>
diff --git a/polkit/policy/org.mageia.control-centre-gui.policy.in b/polkit/policy/org.mageia.control-centre-gui.policy.in
deleted file mode 100644
index 958ca7a6..00000000
--- a/polkit/policy/org.mageia.control-centre-gui.policy.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/policyconfig.dtd">
-<policyconfig>
-
- <vendor>Mageia Control Centre GUI</vendor>
- <vendor_url>http://mageia.org/control-centre-gui</vendor_url>
-
- <action id="org.mageia.control-centre-gui.pkexec.run">
-    <_description>Run Mageia Control Centre GUI</_description>
-    <_message>Authentication is required to run Mageia Control Centre GUI</_message>
-    <icon_name>drakconf</icon_name>
-    <defaults>
-     <allow_any>no</allow_any>
-     <allow_inactive>no</allow_inactive>
-     <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/drakconf</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
- </action>
-</policyconfig>
diff --git a/polkit/policy/org.mageia.control-centre.policy.in b/polkit/policy/org.mageia.control-centre.policy.in
deleted file mode 100644
index 4772b0fc..00000000
--- a/polkit/policy/org.mageia.control-centre.policy.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/policyconfig.dtd">
-<policyconfig>
-
- <vendor>Mageia Control Centre</vendor>
- <vendor_url>http://mageia.org/control-centre</vendor_url>
-
- <action id="org.mageia.control-centre.pkexec.run">
-    <_description>Run Mageia Control Centre</_description>
-    <_message>Authentication is required to run Mageia Control Centre</_message>
-    <icon_name>drakconf</icon_name>
-    <defaults>
-     <allow_any>no</allow_any>
-     <allow_inactive>no</allow_inactive>
-     <allow_active>auth_admin_keep</allow_active>
-    </defaults>
-    <annotate key="org.freedesktop.policykit.exec.path">/usr/libexec/drakxconf</annotate>
-    <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate>
- </action>
-</policyconfig>
diff --git a/polkit/wrappers/drakxconf b/polkit/wrappers/drakxconf
deleted file mode 100755
index db38e46a..00000000
--- a/polkit/wrappers/drakxconf
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/bin/pkexec /usr/libexec/drakxconf
-- 
cgit v1.2.1