From bdfcb6c5408cd41ccd10a838df70917b131a6aa4 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 12 Oct 2013 13:31:36 +0100 Subject: polkit: Tidy up polkit support --- Makefile | 7 +++---- NEWS | 2 ++ po/Makefile | 2 +- polkit/Makefile | 24 ++++++++++++++++++++++++ polkit/org.mageia.drakkeyboard.policy.in | 22 ++++++++++++++++++++++ polkit/org.mageia.drakmouse.policy.in | 22 ++++++++++++++++++++++ polkit/org.mageia.drakx11.policy.in | 22 ++++++++++++++++++++++ polkit/policy/Makefile | 16 ---------------- polkit/policy/org.mageia.drakkeyboard.policy.in | 22 ---------------------- polkit/policy/org.mageia.drakmouse.policy.in | 22 ---------------------- polkit/policy/org.mageia.drakx11.policy.in | 22 ---------------------- polkit/wrappers/drakkeyboard | 2 -- polkit/wrappers/drakmouse | 2 -- polkit/wrappers/drakx11 | 2 -- 14 files changed, 96 insertions(+), 93 deletions(-) create mode 100644 polkit/Makefile create mode 100644 polkit/org.mageia.drakkeyboard.policy.in create mode 100644 polkit/org.mageia.drakmouse.policy.in create mode 100644 polkit/org.mageia.drakx11.policy.in delete mode 100644 polkit/policy/Makefile delete mode 100644 polkit/policy/org.mageia.drakkeyboard.policy.in delete mode 100644 polkit/policy/org.mageia.drakmouse.policy.in delete mode 100644 polkit/policy/org.mageia.drakx11.policy.in delete mode 100755 polkit/wrappers/drakkeyboard delete mode 100755 polkit/wrappers/drakmouse delete mode 100755 polkit/wrappers/drakx11 diff --git a/Makefile b/Makefile index c145ed2..41c39cf 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,8 @@ all: $(INLIBDEST_DIRS) install -d auto (find lib -name '*.pm'; find tools -type f) | xargs perl -pi -e 's/\s*use\s+(diagnostics|vars|strict).*//g' for i in po $(INLIBDEST_DIRS); do make -C $$i; done - make -C polkit/policy make -C po + make -C polkit check: @for p in `find lib -name *.pm`; do perl -cw -I$(libdir)/libDrakX $$p || exit 1; done @@ -42,7 +42,6 @@ install: install -m755 tools/keyboarddrake $(DESTDIR)$(libexecdir)/drakkeyboard install -m755 tools/mousedrake $(DESTDIR)$(libexecdir)/drakmouse install -m755 tools/XFdrake $(DESTDIR)$(libexecdir)/drakx11 - install polkit/wrappers/* $(DESTDIR)$(bindir) # Some compatibility name wrappers ln -s drakkeyboard $(DESTDIR)$(bindir)/keyboarddrake ln -s drakmouse $(DESTDIR)$(bindir)/mousedrake @@ -51,12 +50,12 @@ install: #install -m644 $(wildcard data/*.desktop) $(DESTDIR)$(desktopdir) #install -m644 $(wildcard data/icons/*.png) $(DESTDIR)$(iconsdir) install -m644 $(wildcard data/pixmaps/*.png) $(DESTDIR)$(pixmapsdir) - make -C polkit/policy install make -C po install + make -C polkit install clean: - make -C polkit/policy clean make -C po clean + make -C polkit clean dist: rm -rf ../$(NAME)-$(VERSION).tar* diff --git a/NEWS b/NEWS index 0feaf60..8ff06ae 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- tidy up polkit support + Version 0.111 - 1 October 2013 - make the polkit policy files translatable (mga#11125) - add a legacy compatibility symlink for XFdrake diff --git a/po/Makefile b/po/Makefile index 42db230..b6410c7 100644 --- a/po/Makefile +++ b/po/Makefile @@ -38,7 +38,7 @@ $(POTFILE): $(PL_FILES) POTFILES.in rm -f non-perl.pot ..$@ .$@ POTFILES.in: - (cd .. ; /bin/ls -1 polkit/policy/*.policy.in; ) > POTFILES.in + (cd .. ; /bin/ls -1 polkit/*.policy.in; ) > POTFILES.in update_n_merge: $(PGOAL).pot merge diff --git a/polkit/Makefile b/polkit/Makefile new file mode 100644 index 0000000..34e8106 --- /dev/null +++ b/polkit/Makefile @@ -0,0 +1,24 @@ +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)) + +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.drakkeyboard.policy.in b/polkit/org.mageia.drakkeyboard.policy.in new file mode 100644 index 0000000..7ebaf2a --- /dev/null +++ b/polkit/org.mageia.drakkeyboard.policy.in @@ -0,0 +1,22 @@ + + + + + Mageia + http://www.mageia.org/ + + + <_description>Run Mageia Keyboard Configuration + <_message>Authentication is required to run Mageia Keyboard Configuration + drakconf + + no + no + yes + + /usr/libexec/drakkeyboard + true + + diff --git a/polkit/org.mageia.drakmouse.policy.in b/polkit/org.mageia.drakmouse.policy.in new file mode 100644 index 0000000..dc9981e --- /dev/null +++ b/polkit/org.mageia.drakmouse.policy.in @@ -0,0 +1,22 @@ + + + + + Mageia + http://www.mageia.org/ + + + <_description>Run Mageia Mouse Configuration + <_message>Authentication is required to run Mageia Mouse Configuration + drakconf + + no + no + yes + + /usr/libexec/drakmouse + true + + diff --git a/polkit/org.mageia.drakx11.policy.in b/polkit/org.mageia.drakx11.policy.in new file mode 100644 index 0000000..5d1fad2 --- /dev/null +++ b/polkit/org.mageia.drakx11.policy.in @@ -0,0 +1,22 @@ + + + + + Mageia + http://www.mageia.org/ + + + <_description>Run Mageia Graphics Configuration + <_message>Authentication is required to run Mageia Graphics Configuration + drakconf + + no + no + auth_self_keep + + /usr/libexec/drakx11 + true + + diff --git a/polkit/policy/Makefile b/polkit/policy/Makefile deleted file mode 100644 index 1de7222..0000000 --- a/polkit/policy/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -POLKITPOLICYDEST = $(DESTDIR)/usr/share/polkit-1/actions - -POLICY_IN := $(wildcard *.policy.in) -POLICY = $(POLICY_IN:.policy.in=.policy) - -all: $(POLICY) - -clean: - rm -f $(POLICY) - -install: all - install -d $(POLKITPOLICYDEST) - install -m644 $(POLICY) $(POLKITPOLICYDEST) - -%.policy: %.policy.in - intltool-merge --utf8 ../../po $< $@ -x -u -c ../../po/.intltool-merge-cache diff --git a/polkit/policy/org.mageia.drakkeyboard.policy.in b/polkit/policy/org.mageia.drakkeyboard.policy.in deleted file mode 100644 index 7ebaf2a..0000000 --- a/polkit/policy/org.mageia.drakkeyboard.policy.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Mageia - http://www.mageia.org/ - - - <_description>Run Mageia Keyboard Configuration - <_message>Authentication is required to run Mageia Keyboard Configuration - drakconf - - no - no - yes - - /usr/libexec/drakkeyboard - true - - diff --git a/polkit/policy/org.mageia.drakmouse.policy.in b/polkit/policy/org.mageia.drakmouse.policy.in deleted file mode 100644 index dc9981e..0000000 --- a/polkit/policy/org.mageia.drakmouse.policy.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Mageia - http://www.mageia.org/ - - - <_description>Run Mageia Mouse Configuration - <_message>Authentication is required to run Mageia Mouse Configuration - drakconf - - no - no - yes - - /usr/libexec/drakmouse - true - - diff --git a/polkit/policy/org.mageia.drakx11.policy.in b/polkit/policy/org.mageia.drakx11.policy.in deleted file mode 100644 index 5d1fad2..0000000 --- a/polkit/policy/org.mageia.drakx11.policy.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - Mageia - http://www.mageia.org/ - - - <_description>Run Mageia Graphics Configuration - <_message>Authentication is required to run Mageia Graphics Configuration - drakconf - - no - no - auth_self_keep - - /usr/libexec/drakx11 - true - - diff --git a/polkit/wrappers/drakkeyboard b/polkit/wrappers/drakkeyboard deleted file mode 100755 index f46e0ce..0000000 --- a/polkit/wrappers/drakkeyboard +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/pkexec /usr/libexec/drakkeyboard $* diff --git a/polkit/wrappers/drakmouse b/polkit/wrappers/drakmouse deleted file mode 100755 index 6d66e3a..0000000 --- a/polkit/wrappers/drakmouse +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/pkexec /usr/libexec/drakmouse $* diff --git a/polkit/wrappers/drakx11 b/polkit/wrappers/drakx11 deleted file mode 100755 index 601654b..0000000 --- a/polkit/wrappers/drakx11 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/bin/pkexec /usr/libexec/drakx11 $* -- cgit v1.2.1