From ae1c65f3a344fa5c171db161affe66a814ba3822 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Tue, 24 Jan 2012 13:42:47 +0000 Subject: [PATCH] 1.3.8. - Avoid AttributeError in on_btnNPApply_clicked() (bug #772112). - Added debugging when jobviewer not found (bug #757520). - Applied patch from Till Kamppeter to use pycurl 'https' support for openprinting (CVE-2011-4405). - Always use a sequence as args for timedops.TimedSubprocess() (patch from Vincent Untz). - Added some firewall debugging for bug #755913. - Fixed typo (Ubuntu #844976). - Run probe_printer.py with an argument to run PrinterFinder by hand. - More debugging output in PrinterFinder. - Really fix SMB probing in PrinterFinder. - LpdServer class: spot when we can't connect, and give up (likewise in PrinterFinder). - Ignore ' All-in-one' suffix for printer model names when comparing them (bug #751610). - Handle HTTP errors from openprinting.org (seen in bug #743446). - Don't re-open PPD when already available, just to localize marker names. - Use the monitor's PPD cache in the properties dialog. - monitor: provide method for sharing the monitor's PPD cache. - cupshelpers: avoid re-opening PPD when not needed (not a leak). - Fixed file descriptor leak in PPDCache (Ubuntu #874445). - Fixed typo in check-device-ids.py when looking for ID-less matches. - Require newer pycups; drop compatibility code. - Do not connect to CUPS with an empty user name. - On asynchronous IPP connections make sure that the password dialog is repeated if a wrong password is entered (Ubuntu #653132). - Several fixes on credential caching for IPP authentication (Ubuntu bug 653132). - Don't penalise pxlmono now that bug #661814 is fixed in ghostscript-9.04. - Handle new CUPS 1.5 IPP error response IPP_AUTHENTICATION_CANCELED (Ubuntu #653132). --- .gitignore | 1 + sources | 2 +- system-config-printer-1.3.7.tar.xz.sig | Bin 280 -> 0 bytes system-config-printer-1.3.8.tar.xz.sig | Bin 0 -> 280 bytes system-config-printer-auth.patch | 55 ------------------------- system-config-printer-ids.patch | 12 ------ system-config-printer.spec | 50 +++++++++++++++++----- 7 files changed, 41 insertions(+), 79 deletions(-) delete mode 100644 system-config-printer-1.3.7.tar.xz.sig create mode 100644 system-config-printer-1.3.8.tar.xz.sig delete mode 100644 system-config-printer-auth.patch delete mode 100644 system-config-printer-ids.patch diff --git a/.gitignore b/.gitignore index d26ff18..ffac9a1 100644 --- a/.gitignore +++ b/.gitignore @@ -236,3 +236,4 @@ pycups-1.9.51.tar.bz2 /system-config-printer-1.3.5.tar.xz /system-config-printer-1.3.6.tar.xz /system-config-printer-1.3.7.tar.xz +/system-config-printer-1.3.8.tar.xz diff --git a/sources b/sources index e026a61..d55a65c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f579ba287403d8ae3028377c6641feed system-config-printer-1.3.7.tar.xz +ca04568dd7ff1ef7a381ad637d4e915b system-config-printer-1.3.8.tar.xz diff --git a/system-config-printer-1.3.7.tar.xz.sig b/system-config-printer-1.3.7.tar.xz.sig deleted file mode 100644 index 58c1efa9e8385aaef4d13e5fc57a9f30b1ed8d3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmV+z0q6dS0TlxU08WgLCGN$Ms`TEJECB-S?+5)J3NiK;L5hV=+t89ML}o#^aGVSE zNCV(&L&M4;^pCzUAA6h9JmGF%pR*z0RSQ{~-J$l1ddbUXcFY+tUC939>RqI}4T+SCK%xjBDbmprVdo-wn63Q*jz7lY3n9J zbG=o^S_DwBGjz2q-rCA|Q~cv!YqA>25x)G;;>M;UDXD;bqudlqd?zae_9=P`OuUEt e7Hcn>aXp4*tr4 diff --git a/system-config-printer-1.3.8.tar.xz.sig b/system-config-printer-1.3.8.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000..137dd84aac4fc366c9a7845e407cded0e41ac973 GIT binary patch literal 280 zcmV+z0q6dS0TlxU08bvWneN4rs`TEJECB*>dk6nh{{QBTpg8EuR-t(@xn}_$;deeI zY_RGYXk?N;wm3}tC7F`2sXjtF_^h^%3-v!XQ}60XEw>1}B~qL>MY^dr8m*Kuew7O< zHfKop3Q9TSu-eigm78_`YvgV^65&RMyd7BJRM{hOugxI6TcmpIAkI;*-2f>>BH z;)HQB_K^A8c?;KA(F`u(nUXRT5v37d9`%*hbUa1JF|~NOV^-n1@qjm5AY3HuaW(#D zw5rxj#=-o_k-U7~#<>`c;j#25!x6^F%y9)@uk?qHNW@k3kEf;c@m^v3SPrLH{}Sd< e(gHjsa_=Z;5$RKgi4k=Hi)pvTSGee77Ot&1O^s9l literal 0 HcmV?d00001 diff --git a/system-config-printer-auth.patch b/system-config-printer-auth.patch deleted file mode 100644 index a3e52e5..0000000 --- a/system-config-printer-auth.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -up system-config-printer-1.3.7/asyncipp.py.auth system-config-printer-1.3.7/asyncipp.py ---- system-config-printer-1.3.7/asyncipp.py.auth 2011-10-03 11:37:17.000000000 +0100 -+++ system-config-printer-1.3.7/asyncipp.py 2011-10-17 10:52:52.844802724 +0100 -@@ -379,8 +379,14 @@ class _IPPAuthOperation: - forbidden = False - if type (exc) == cups.IPPError: - (e, m) = exc.args -+ try: -+ ipp_auth_canceled = cups.IPP_AUTHENTICATION_CANCELED -+ except AttributeError: -+ # requires pycups 1.9.60 -+ ipp_auth_canceled = 4096 - if (e == cups.IPP_NOT_AUTHORIZED or -- e == cups.IPP_FORBIDDEN): -+ e == cups.IPP_FORBIDDEN or -+ e == ipp_auth_canceled): - forbidden = (e == cups.IPP_FORBIDDEN) - elif e == cups.IPP_SERVICE_UNAVAILABLE: - return self._reconnect_error (conn, exc) -diff -up system-config-printer-1.3.7/authconn.py.auth system-config-printer-1.3.7/authconn.py ---- system-config-printer-1.3.7/authconn.py.auth 2011-09-26 16:39:20.000000000 +0100 -+++ system-config-printer-1.3.7/authconn.py 2011-10-17 10:52:34.736129998 +0100 -@@ -1,6 +1,6 @@ - #!/usr/bin/python - --## Copyright (C) 2007, 2008, 2009, 2010 Red Hat, Inc. -+## Copyright (C) 2007, 2008, 2009, 2010, 2011 Red Hat, Inc. - ## Author: Tim Waugh - - ## This program is free software; you can redistribute it and/or modify -@@ -241,8 +241,15 @@ class Connection: - except cups.IPPError, (e, m): - if self._use_pk and m == 'pkcancel': - raise cups.IPPError (0, _("Operation canceled")) -+ try: -+ ipp_auth_canceled = cups.IPP_AUTHENTICATION_CANCELED -+ except AttributeError: -+ # requires pycups 1.9.60 -+ ipp_auth_canceled = 4096 -+ - if not self._cancel and (e == cups.IPP_NOT_AUTHORIZED or -- e == cups.IPP_FORBIDDEN): -+ e == cups.IPP_FORBIDDEN or -+ e == ipp_auth_canceled): - self._failed (e == cups.IPP_FORBIDDEN) - elif not self._cancel and e == cups.IPP_SERVICE_UNAVAILABLE: - if self._lock: -@@ -264,6 +271,7 @@ class Connection: - if self._cancel and not self._cannot_auth: - raise cups.IPPError (0, _("Operation canceled")) - -+ debugprint ("%s: %s" % (e, m)) - raise - except cups.HTTPError, (s,): - if not self._cancel: diff --git a/system-config-printer-ids.patch b/system-config-printer-ids.patch deleted file mode 100644 index 83d3859..0000000 --- a/system-config-printer-ids.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up system-config-printer-1.3.7/check-device-ids.py.ids system-config-printer-1.3.7/check-device-ids.py ---- system-config-printer-1.3.7/check-device-ids.py.ids 2011-09-26 16:39:20.000000000 +0100 -+++ system-config-printer-1.3.7/check-device-ids.py 2011-10-17 10:56:45.937590097 +0100 -@@ -301,7 +301,7 @@ for device, attrs in devices.iteritems ( - break - if mdls: - (s, bestmatches) = ppds._findBestMatchPPDs (mdls, mdl) -- if s == ppds.STATUS_SUCCESS: -+ if s == ppds.FIT_EXACT: - matches = matches.union (set (bestmatches)) - - missing = set (matches) - set (drivers) diff --git a/system-config-printer.spec b/system-config-printer.spec index c5e4fa5..50b0a92 100644 --- a/system-config-printer.spec +++ b/system-config-printer.spec @@ -1,14 +1,12 @@ Summary: A printer administration tool Name: system-config-printer -Version: 1.3.7 -Release: 4%{?dist} +Version: 1.3.8 +Release: 1%{?dist} License: GPLv2+ URL: http://cyberelk.net/tim/software/system-config-printer/ Group: System Environment/Base Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz Patch1: system-config-printer-no-applet-in-gnome.patch -Patch2: system-config-printer-auth.patch -Patch3: system-config-printer-ids.patch BuildRequires: cups-devel >= 1.2 BuildRequires: desktop-file-utils >= 0.2.92 BuildRequires: gettext-devel @@ -73,13 +71,6 @@ printers. # Don't start the applet in GNOME. %patch1 -p1 -b .no-applet-in-gnome -# Handle new CUPS 1.5 IPP error response IPP_AUTHENTICATION_CANCELED -# (Ubuntu #653132). -%patch2 -p1 -b .auth - -# Fixed typo in check-device-ids.py when looking for ID-less matches. -%patch3 -p1 -b .ids - %build %configure --with-udev-rules @@ -206,6 +197,43 @@ if [ $1 -ge 1 ] ; then fi %changelog +* Tue Jan 24 2012 Tim Waugh 1.3.8-1 +- 1.3.8: + - Avoid AttributeError in on_btnNPApply_clicked() (bug #772112). + - Added debugging when jobviewer not found (bug #757520). + - Applied patch from Till Kamppeter to use pycurl 'https' support + for openprinting (CVE-2011-4405). + - Always use a sequence as args for timedops.TimedSubprocess() + (patch from Vincent Untz). + - Added some firewall debugging for bug #755913. + - Fixed typo (Ubuntu #844976). + - Run probe_printer.py with an argument to run PrinterFinder by hand. + - More debugging output in PrinterFinder. + - Really fix SMB probing in PrinterFinder. + - LpdServer class: spot when we can't connect, and give up (likewise + in PrinterFinder). + - Ignore ' All-in-one' suffix for printer model names when comparing + them (bug #751610). + - Handle HTTP errors from openprinting.org (seen in bug #743446). + - Don't re-open PPD when already available, just to localize marker + names. + - Use the monitor's PPD cache in the properties dialog. + - monitor: provide method for sharing the monitor's PPD cache. + - cupshelpers: avoid re-opening PPD when not needed (not a leak). + - Fixed file descriptor leak in PPDCache (Ubuntu #874445). + - Fixed typo in check-device-ids.py when looking for ID-less + matches. + - Require newer pycups; drop compatibility code. + - Do not connect to CUPS with an empty user name. + - On asynchronous IPP connections make sure that the password dialog + is repeated if a wrong password is entered (Ubuntu #653132). + - Several fixes on credential caching for IPP authentication (Ubuntu + bug 653132). + - Don't penalise pxlmono now that bug #661814 is fixed in + ghostscript-9.04. + - Handle new CUPS 1.5 IPP error response IPP_AUTHENTICATION_CANCELED + (Ubuntu #653132). + * Sat Jan 14 2012 Fedora Release Engineering - 1.3.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild