rpms
/
system-config-printer
7
0
Fork 0
Code Issues Pull Requests Releases Activity

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).
This commit is contained in:
Tim Waugh 2012-01-24 13:42:47 +00:00
parent 96258decdb
commit ae1c65f3a3
7 changed files with 41 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -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

2
sources
View File

@ -1 +1 @@
f579ba287403d8ae3028377c6641feed system-config-printer-1.3.7.tar.xz
ca04568dd7ff1ef7a381ad637d4e915b system-config-printer-1.3.8.tar.xz

BIN
system-config-printer-1.3.7.tar.xz.sig
View File

Binary file not shown.

BIN
system-config-printer-1.3.8.tar.xz.sig Normal file
View File

Binary file not shown.

55
system-config-printer-auth.patch
View File

@ -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 <twaugh@redhat.com>
## 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:

12
system-config-printer-ids.patch
View File

@ -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)

50
system-config-printer.spec
View File

@ -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 <twaugh@redhat.com> 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 <rel-eng@lists.fedoraproject.org> - 1.3.7-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild