diff options
8 files changed, 147 insertions, 7 deletions
diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index 6db0c3d97..54f43e4cb 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -44,8 +44,13 @@ install: mv -f $(SBINDEST)/display_release_notes.pl $(BINDEST) mv -f $(SBINDEST)/localedrake $(BINDEST) # All the things handled by polkit - mv -f $(SBINDEST)/drak{auth,boot,clock,font,ups,xservices} $(LIBEXECDEST) + mv -f $(SBINDEST)/drak{auth,boot,clock,font,perm,sec,ups,xservices} $(LIBEXECDEST) mv -f $(SBINDEST)/logdrake $(LIBEXECDEST)/draklog + mv -f $(SBINDEST)/drakedm $(LIBEXECDEST)/drakdm + mv -f $(SBINDEST)/diskdrake $(LIBEXECDEST)/drakdisk + mv -f $(SBINDEST)/harddrake2 $(LIBEXECDEST)/drakhardware + mv -f $(SBINDEST)/scannerdrake $(LIBEXECDEST)/drakscanner + install -m 644 *.pm $(LIBDEST) for i in $(PMS_DIRS); do install -d $(LIBDEST)/$$i ; install -m 644 $$i/*.pm $(LIBDEST)/$$i/;done @@ -78,16 +83,17 @@ install: mv $(SBINDEST)/convert $(DATADIR)/harddrake mv $(SBINDEST)/service_harddrake $(DATADIR)/harddrake/ mv $(SBINDEST)/notify-x11-free-driver-switch $(DATADIR)/harddrake/ - mv $(SBINDEST)/diskdrake $(SBINDEST)/drakdisk - mv $(SBINDEST)/harddrake2 $(SBINDEST)/drakhardware + # Better public names mv $(BINDEST)/localedrake $(BINDEST)/draklocale - mv $(SBINDEST)/scannerdrake $(SBINDEST)/drakscanner - ln -s drakdisk $(SBINDEST)/diskdrake + # Compatibility names/links + # (ideally everything would be in /usr/bin...) + ln -s ../bin/drakdm $(SBINDEST)/drakedm + ln -s ../bin/drakdisk $(SBINDEST)/diskdrake + ln -s ../bin/drakhardware $(SBINDEST)/harddrake2 + ln -s ../bin/drakscanner $(SBINDEST)/scannerdrake ln -s drakclock $(BINDEST)/clock.pl - ln -s drakhardware $(SBINDEST)/harddrake2 ln -s draklocale $(BINDEST)/localedrake ln -s draklog $(BINDEST)/logdrake - ln -s drakscanner $(SBINDEST)/scannerdrake check: rm -f share/po/libDrakX.pot standalone/po/libDrakX-standalone.pot diff --git a/perl-install/NEWS b/perl-install/NEWS index 42496454f..3f812b561 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- wrap more standalone tools in polkit (mga#11125, mga#11418) + Version 15.67 - 10 October 2013 - recognize new kernel-3.11 drivers diff --git a/perl-install/standalone/polkit/org.mageia.drakdisk.policy.in b/perl-install/standalone/polkit/org.mageia.drakdisk.policy.in new file mode 100644 index 000000000..97f69f252 --- /dev/null +++ b/perl-install/standalone/polkit/org.mageia.drakdisk.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://www.mageia.org/</vendor_url> + + <action id="org.mageia.drakdisk.pkexec.run"> + <_description>Run Mageia Disk Layout Editor</_description> + <_message>Authentication is required to run Mageia Disk Layout Editor</_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/drakdisk</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> +</policyconfig> diff --git a/perl-install/standalone/polkit/org.mageia.drakdm.policy.in b/perl-install/standalone/polkit/org.mageia.drakdm.policy.in new file mode 100644 index 000000000..21f464c51 --- /dev/null +++ b/perl-install/standalone/polkit/org.mageia.drakdm.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://www.mageia.org/</vendor_url> + + <action id="org.mageia.drakdm.pkexec.run"> + <_description>Run Mageia Login Manager Configuration</_description> + <_message>Authentication is required to run Mageia Login Manager Configuration</_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/drakdm</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> +</policyconfig> diff --git a/perl-install/standalone/polkit/org.mageia.drakhardware.policy.in b/perl-install/standalone/polkit/org.mageia.drakhardware.policy.in new file mode 100644 index 000000000..778c96639 --- /dev/null +++ b/perl-install/standalone/polkit/org.mageia.drakhardware.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://www.mageia.org/</vendor_url> + + <action id="org.mageia.drakhardware.pkexec.run"> + <_description>Run Mageia Hardware Configuration</_description> + <_message>Authentication is required to run Mageia Hardware Configuration</_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/drakhardware</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> +</policyconfig> diff --git a/perl-install/standalone/polkit/org.mageia.drakperm.policy.in b/perl-install/standalone/polkit/org.mageia.drakperm.policy.in new file mode 100644 index 000000000..87940968a --- /dev/null +++ b/perl-install/standalone/polkit/org.mageia.drakperm.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://www.mageia.org/</vendor_url> + + <action id="org.mageia.drakperm.pkexec.run"> + <_description>Run Mageia Security Permissions Configuration</_description> + <_message>Authentication is required to run Mageia Security Permissions Configuration</_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/drakperm</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> +</policyconfig> diff --git a/perl-install/standalone/polkit/org.mageia.drakscanner.policy.in b/perl-install/standalone/polkit/org.mageia.drakscanner.policy.in new file mode 100644 index 000000000..50c1da552 --- /dev/null +++ b/perl-install/standalone/polkit/org.mageia.drakscanner.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://www.mageia.org/</vendor_url> + + <action id="org.mageia.drakscanner.pkexec.run"> + <_description>Run Mageia Scanner Configuration</_description> + <_message>Authentication is required to run Mageia Scanner Configuration</_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/drakscanner</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> +</policyconfig> diff --git a/perl-install/standalone/polkit/org.mageia.draksec.policy.in b/perl-install/standalone/polkit/org.mageia.draksec.policy.in new file mode 100644 index 000000000..fcec510fe --- /dev/null +++ b/perl-install/standalone/polkit/org.mageia.draksec.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://www.mageia.org/</vendor_url> + + <action id="org.mageia.draksec.pkexec.run"> + <_description>Run Mageia Application Security Configuration</_description> + <_message>Authentication is required to run Mageia Application Security Configuration</_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/draksec</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> +</policyconfig> |