[cups-pk-helper/f15] Make ppd-name parameter optional
mkasik
mkasik at fedoraproject.org
Fri Sep 2 11:08:10 UTC 2011
commit 11ef0bb361caa7b17c1b09d73251ef17eefb0f02
Author: Marek Kasik <mkasik at redhat.com>
Date: Fri Sep 2 12:07:21 2011 +0200
Make ppd-name parameter optional
Readd patch for allowing authentication for any and inactive users
Readd patch for check of result of polkit authorization check
Resolves: #724959
allow_authentication.patch | 66 +++++----
cups-pk-helper-invalid-job.patch | 115 --------------
cups-pk-helper-job-status.patch | 55 -------
cups-pk-helper-jobcancelpurge.patch | 113 -------------
cups-pk-helper-ppd-name.patch | 29 ----
cups-pk-helper.spec | 15 ++-
edit_job.patch | 26 ---
get_devices.patch | 299 -----------------------------------
polkit-1.patch | 260 ------------------------------
polkit_result.patch | 122 +--------------
10 files changed, 57 insertions(+), 1043 deletions(-)
---
diff --git a/allow_authentication.patch b/allow_authentication.patch
index 17be7e9..47e4473 100644
--- a/allow_authentication.patch
+++ b/allow_authentication.patch
@@ -1,8 +1,8 @@
---- cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in 2009-12-02 16:43:41.000000000 +0100
-+++ cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in 2009-12-03 14:13:47.000000000 +0100
-@@ -15,7 +15,8 @@
- <description>Set a printer as default printer</description>
- <message>Privileges are required to set a printer, or a class, as default printer.</message>
+--- cups-pk-helper-0.1.3/src/org.opensuse.cupspkhelper.mechanism.policy.in 2011-07-05 14:07:05.000000000 +0200
++++ cups-pk-helper-0.1.3/src/org.opensuse.cupspkhelper.mechanism.policy.in 2011-09-02 11:34:12.000000000 +0200
+@@ -12,7 +12,8 @@
+ <_description>Get/Set server settings</_description>
+ <_message>Privileges are required to get/set server settings.</_message>
<defaults>
- <allow_inactive>no</allow_inactive>
+ <allow_any>auth_admin</allow_any>
@@ -10,9 +10,9 @@
<allow_active>auth_admin_keep</allow_active>
</defaults>
</action>
-@@ -27,7 +28,8 @@
- <description>Enable/Disable a printer</description>
- <message>Privileges are required to enable/disable a printer, or a class.</message>
+@@ -21,7 +22,8 @@
+ <_description>Get list of available devices</_description>
+ <_message>Privileges are required to get list of available devices.</_message>
<defaults>
- <allow_inactive>no</allow_inactive>
+ <allow_any>auth_admin</allow_any>
@@ -20,9 +20,9 @@
<allow_active>auth_admin_keep</allow_active>
</defaults>
</action>
-@@ -36,7 +38,8 @@
- <description>Add/Remove/Edit a local printer</description>
- <message>Privileges are required to add/remove/edit a local printer.</message>
+@@ -33,7 +35,8 @@
+ <_description>Set a printer as default printer</_description>
+ <_message>Privileges are required to set a printer, or a class, as default printer.</_message>
<defaults>
- <allow_inactive>no</allow_inactive>
+ <allow_any>auth_admin</allow_any>
@@ -31,8 +31,8 @@
</defaults>
</action>
@@ -45,7 +48,8 @@
- <description>Add/Remove/Edit a remote printer</description>
- <message>Privileges are required to add/remove/edit a remote printer.</message>
+ <_description>Enable/Disable a printer</_description>
+ <_message>Privileges are required to enable/disable a printer, or a class.</_message>
<defaults>
- <allow_inactive>no</allow_inactive>
+ <allow_any>auth_admin</allow_any>
@@ -41,8 +41,8 @@
</defaults>
</action>
@@ -54,7 +58,8 @@
- <description>Add/Remove/Edit a class</description>
- <message>Privileges are required to add/remove/edit a class.</message>
+ <_description>Add/Remove/Edit a local printer</_description>
+ <_message>Privileges are required to add/remove/edit a local printer.</_message>
<defaults>
- <allow_inactive>no</allow_inactive>
+ <allow_any>auth_admin</allow_any>
@@ -51,8 +51,8 @@
</defaults>
</action>
@@ -63,7 +68,8 @@
- <description>Get/Set server settings</description>
- <message>Privileges are required to get/set server settings.</message>
+ <_description>Add/Remove/Edit a remote printer</_description>
+ <_message>Privileges are required to add/remove/edit a remote printer.</_message>
<defaults>
- <allow_inactive>no</allow_inactive>
+ <allow_any>auth_admin</allow_any>
@@ -61,28 +61,38 @@
</defaults>
</action>
@@ -72,7 +78,8 @@
- <description>Restart/Cancel/Edit a job</description>
- <message>Privileges are required to restart/cancel/edit a job.</message>
+ <_description>Add/Remove/Edit a class</_description>
+ <_message>Privileges are required to add/remove/edit a class.</_message>
<defaults>
- <allow_inactive>no</allow_inactive>
+ <allow_any>auth_admin</allow_any>
+ <allow_inactive>auth_admin</allow_inactive>
- <allow_active>yes</allow_active>
+ <allow_active>auth_admin_keep</allow_active>
</defaults>
</action>
@@ -81,7 +88,8 @@
- <description>Restart/Cancel/Edit a job owned by another user</description>
- <message>Privileges are required to restart/cancel/edit a job owned by another user.</message>
+ <_description>Restart/Cancel/Edit a job</_description>
+ <_message>Privileges are required to restart/cancel/edit a job.</_message>
<defaults>
- <allow_inactive>no</allow_inactive>
+ <allow_any>auth_admin</allow_any>
+ <allow_inactive>auth_admin</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
+ <allow_active>yes</allow_active>
</defaults>
</action>
@@ -90,7 +98,8 @@
- <description>Get devices</description>
- <message>Privileges are required to get devices.</message>
+ <_description>Restart/Cancel/Edit a job owned by another user</_description>
+ <_message>Privileges are required to restart/cancel/edit a job owned by another user.</_message>
+ <defaults>
+- <allow_inactive>no</allow_inactive>
++ <allow_any>auth_admin</allow_any>
++ <allow_inactive>auth_admin</allow_inactive>
+ <allow_active>auth_admin_keep</allow_active>
+ </defaults>
+ </action>
+@@ -99,7 +108,8 @@
+ <_description>Change printer settings</_description>
+ <_message>Privileges are required to change printer settings. This should only be needed from the Printers system settings panel.</_message>
<defaults>
- <allow_inactive>no</allow_inactive>
+ <allow_any>auth_admin</allow_any>
@@ -90,9 +100,9 @@
<allow_active>auth_admin_keep</allow_active>
</defaults>
</action>
-@@ -100,7 +109,8 @@
- <description>Add/Remove/Edit a printer</description>
- <message>Privileges are required to add/remove/edit a printer.</message>
+@@ -109,7 +119,8 @@
+ <_description>Add/Remove/Edit a printer</_description>
+ <_message>Privileges are required to add/remove/edit a printer.</_message>
<defaults>
- <allow_inactive>no</allow_inactive>
+ <allow_any>auth_admin</allow_any>
diff --git a/cups-pk-helper.spec b/cups-pk-helper.spec
index 6e44ede..f2bd2f0 100644
--- a/cups-pk-helper.spec
+++ b/cups-pk-helper.spec
@@ -1,6 +1,6 @@
Name: cups-pk-helper
Version: 0.1.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A helper that makes system-config-printer use PolicyKit
Group: System Environment/Base
@@ -9,6 +9,9 @@ URL: http://www.vuntz.net/download/cups-pk-helper/
Source0: http://cgit.freedesktop.org/cups-pk-helper/snapshot/cups-pk-helper-%{version}.tar.bz2
Patch0: cups-pk-helper-check-mechanism.patch
+Patch1: cups-pk-helper-add-printer-ppd-optional.patch
+Patch2: polkit_result.patch
+Patch3: allow_authentication.patch
BuildRequires: libtool >= 1.4.3
BuildRequires: cups-devel >= 1.2
@@ -38,6 +41,10 @@ interfaces available under control of PolicyKit.
%setup -q
%patch0 -p1 -b .check-mechanism
+%patch1 -p1 -b .ppd
+%patch2 -p1 -b .polkit-result
+%patch3 -p1 -b .allow_auth
+
%build
# grr, tarball without configure
@@ -64,6 +71,12 @@ make install DESTDIR=$RPM_BUILD_ROOT
%changelog
+* Fri Sep 2 2011 Marek Kasik <mkasik at redhat.com> - 0.1.3-2
+- Make ppd-name parameter optional
+- Readd patch for allowing authentication for any and inactive users
+- Readd patch for check of result of polkit authorization check
+- Resolves: #724959
+
* Fri Aug 5 2011 Marek Kasik <mkasik at redhat.com> - 0.1.3-1
- Update to 0.1.3
- Fix #724959
diff --git a/polkit_result.patch b/polkit_result.patch
index 901b22c..b2a0ac2 100644
--- a/polkit_result.patch
+++ b/polkit_result.patch
@@ -1,123 +1,11 @@
---- cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c.polkit-result 2009-08-17 14:55:52.000000000 +0200
-+++ cups-pk-helper-0.0.4/src/cups-pk-helper-mechanism.c 2009-08-17 14:55:52.000000000 +0200
-@@ -278,7 +278,7 @@ _check_polkit_for_action_internal (CphMe
- NULL);
- g_object_unref (pk_caller);
+--- cups-pk-helper-0.1.3/src/cups-pk-helper-mechanism.c 2011-09-02 11:30:26.000000000 +0200
++++ cups-pk-helper-0.1.3/src/cups-pk-helper-mechanism.c 2011-09-02 11:31:34.000000000 +0200
+@@ -291,7 +291,7 @@ _check_polkit_for_action_internal (CphMe
+ return FALSE;
+ }
- if (!polkit_authorization_result_get_is_authorized (pk_result)) {
+ if (pk_result == NULL || !polkit_authorization_result_get_is_authorized (pk_result)) {
g_set_error (error,
CPH_MECHANISM_ERROR,
CPH_MECHANISM_ERROR_NOT_PRIVILEGED,
---- cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in.polkit-result 2009-08-17 14:55:52.000000000 +0200
-+++ cups-pk-helper-0.0.4/src/org.opensuse.cupspkhelper.mechanism.policy.in 2009-08-17 14:55:52.000000000 +0200
-@@ -12,8 +12,8 @@
- operation: if some authorization is required, then the PolicyKit helper
- will fallback on printer-X-edit. -->
- <action id="org.opensuse.cupspkhelper.mechanism.printer-set-default">
-- <_description>Set a printer as default printer</_description>
-- <_message>Privileges are required to set a printer, or a class, as default printer.</_message>
-+ <description>Set a printer as default printer</description>
-+ <message>Privileges are required to set a printer, or a class, as default printer.</message>
- <defaults>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
-@@ -24,8 +24,8 @@
- operation: if some authorization is required, then the PolicyKit helper
- will fallback on printer-X-edit. -->
- <action id="org.opensuse.cupspkhelper.mechanism.printer-enable">
-- <_description>Enable/Disable a printer</_description>
-- <_message>Privileges are required to enable/disable a printer, or a class.</_message>
-+ <description>Enable/Disable a printer</description>
-+ <message>Privileges are required to enable/disable a printer, or a class.</message>
- <defaults>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
-@@ -33,8 +33,8 @@
- </action>
-
- <action id="org.opensuse.cupspkhelper.mechanism.printer-local-edit">
-- <_description>Add/Remove/Edit a local printer</_description>
-- <_message>Privileges are required to add/remove/edit a local printer.</_message>
-+ <description>Add/Remove/Edit a local printer</description>
-+ <message>Privileges are required to add/remove/edit a local printer.</message>
- <defaults>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
-@@ -42,8 +42,8 @@
- </action>
-
- <action id="org.opensuse.cupspkhelper.mechanism.printer-remote-edit">
-- <_description>Add/Remove/Edit a remote printer</_description>
-- <_message>Privileges are required to add/remove/edit a remote printer.</_message>
-+ <description>Add/Remove/Edit a remote printer</description>
-+ <message>Privileges are required to add/remove/edit a remote printer.</message>
- <defaults>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
-@@ -51,8 +51,8 @@
- </action>
-
- <action id="org.opensuse.cupspkhelper.mechanism.class-edit">
-- <_description>Add/Remove/Edit a class</_description>
-- <_message>Privileges are required to add/remove/edit a class.</_message>
-+ <description>Add/Remove/Edit a class</description>
-+ <message>Privileges are required to add/remove/edit a class.</message>
- <defaults>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
-@@ -60,8 +60,8 @@
- </action>
-
- <action id="org.opensuse.cupspkhelper.mechanism.server-settings">
-- <_description>Get/Set server settings</_description>
-- <_message>Privileges are required to get/set server settings.</_message>
-+ <description>Get/Set server settings</description>
-+ <message>Privileges are required to get/set server settings.</message>
- <defaults>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
-@@ -69,8 +69,8 @@
- </action>
-
- <action id="org.opensuse.cupspkhelper.mechanism.job-edit">
-- <_description>Restart/Cancel/Edit a job</_description>
-- <_message>Privileges are required to restart/cancel/edit a job.</_message>
-+ <description>Restart/Cancel/Edit a job</description>
-+ <message>Privileges are required to restart/cancel/edit a job.</message>
- <defaults>
- <allow_inactive>no</allow_inactive>
- <allow_active>yes</allow_active>
-@@ -78,8 +78,8 @@
- </action>
-
- <action id="org.opensuse.cupspkhelper.mechanism.job-not-owned-edit">
-- <_description>Restart/Cancel/Edit a job owned by another user</_description>
-- <_message>Privileges are required to restart/cancel/edit a job owned by another user.</_message>
-+ <description>Restart/Cancel/Edit a job owned by another user</description>
-+ <message>Privileges are required to restart/cancel/edit a job owned by another user.</message>
- <defaults>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
-@@ -87,8 +87,8 @@
- </action>
-
- <action id="org.opensuse.cupspkhelper.mechanism.devices-get">
-- <_description>Get devices</_description>
-- <_message>Privileges are required to get devices.</_message>
-+ <description>Get devices</description>
-+ <message>Privileges are required to get devices.</message>
- <defaults>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
-@@ -97,8 +97,8 @@
-
- <!-- Deprecated -->
- <action id="org.opensuse.cupspkhelper.mechanism.printeraddremove">
-- <_description>Add/Remove/Edit a printer</_description>
-- <_message>Privileges are required to add/remove/edit a printer.</_message>
-+ <description>Add/Remove/Edit a printer</description>
-+ <message>Privileges are required to add/remove/edit a printer.</message>
- <defaults>
- <allow_inactive>no</allow_inactive>
- <allow_active>auth_admin_keep</allow_active>
More information about the scm-commits
mailing list