- Updated pycups to 1.9.31.
This commit is contained in:
parent
2da96b6305
commit
53b98bcafb
@ -146,3 +146,4 @@ system-config-printer-0.7.76.tar.bz2
|
||||
system-config-printer-0.7.77.tar.bz2
|
||||
pycups-1.9.29.tar.bz2
|
||||
pycups-1.9.30.tar.bz2
|
||||
pycups-1.9.31.tar.bz2
|
||||
|
BIN
pycups-1.9.31.tar.bz2.sig
Normal file
BIN
pycups-1.9.31.tar.bz2.sig
Normal file
Binary file not shown.
@ -1,65 +0,0 @@
|
||||
diff -up pycups-1.9.30/cupsconnection.c.uninit pycups-1.9.30/cupsconnection.c
|
||||
--- pycups-1.9.30/cupsconnection.c.uninit 2007-11-19 16:41:14.000000000 +0000
|
||||
+++ pycups-1.9.30/cupsconnection.c 2007-11-21 11:18:20.000000000 +0000
|
||||
@@ -2334,7 +2334,7 @@ Connection_printTestPage (Connection *se
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- if (!file) {
|
||||
+ if (!fileobj) {
|
||||
if ((datadir = getenv ("CUPS_DATADIR")) == NULL)
|
||||
datadir = "/usr/share/cups";
|
||||
|
||||
@@ -2342,13 +2342,13 @@ Connection_printTestPage (Connection *se
|
||||
file = filename;
|
||||
}
|
||||
|
||||
- if (!title)
|
||||
+ if (!titleobj)
|
||||
title = "Test Page";
|
||||
|
||||
- if (!format)
|
||||
+ if (!formatobj)
|
||||
format = "application/postscript";
|
||||
|
||||
- if (!user)
|
||||
+ if (!userobj)
|
||||
user = "guest";
|
||||
|
||||
snprintf (uri, sizeof (uri), "ipp://localhost/printers/%s", printer);
|
||||
diff -U0 pycups-1.9.30/ChangeLog.uninit pycups-1.9.30/ChangeLog
|
||||
--- pycups-1.9.30/ChangeLog.uninit 2007-11-19 16:41:14.000000000 +0000
|
||||
+++ pycups-1.9.30/ChangeLog 2007-11-21 11:18:20.000000000 +0000
|
||||
@@ -0,0 +1,7 @@
|
||||
+2007-11-21 Tim Waugh <twaugh@redhat.com>
|
||||
+
|
||||
+ * cupsmodule.c (cups_require): Don't read uninitialised memory.
|
||||
+
|
||||
+ * cupsconnection.c (Connection_printTestPage): Don't use
|
||||
+ uninitialised variables (bug #390431).
|
||||
+
|
||||
diff -up pycups-1.9.30/cupsmodule.c.uninit pycups-1.9.30/cupsmodule.c
|
||||
--- pycups-1.9.30/cupsmodule.c.uninit 2007-09-12 14:12:11.000000000 +0100
|
||||
+++ pycups-1.9.30/cupsmodule.c 2007-11-21 11:18:20.000000000 +0000
|
||||
@@ -253,13 +253,18 @@ cups_require (PyObject *self, PyObject *
|
||||
nreq = strtoul (preq, &end, 0);
|
||||
while (preq != end)
|
||||
{
|
||||
- preq = end + 1;
|
||||
+ preq = end;
|
||||
+ if (*preq == '.')
|
||||
+ preq++;
|
||||
|
||||
nver = strtoul (pver, &end, 0);
|
||||
if (pver == end)
|
||||
goto fail;
|
||||
- else
|
||||
- pver = end + 1;
|
||||
+ else {
|
||||
+ pver = end;
|
||||
+ if (*pver == '.')
|
||||
+ pver++;
|
||||
+ }
|
||||
|
||||
if (nver < nreq)
|
||||
goto fail;
|
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
c7f16dfdff0bb57b6d89142c3573d950 system-config-printer-0.7.77.tar.bz2
|
||||
37f417f88c8a0eecf7f078ca1357fe0b pycups-1.9.30.tar.bz2
|
||||
febc7a53ef0fbedbef2d7d8e4b5c92f3 pycups-1.9.31.tar.bz2
|
||||
|
@ -1,4 +1,4 @@
|
||||
%define pycups_version 1.9.30
|
||||
%define pycups_version 1.9.31
|
||||
|
||||
Summary: A printer administration tool
|
||||
Name: system-config-printer
|
||||
@ -11,7 +11,6 @@ Source0: system-config-printer-%{version}.tar.bz2
|
||||
Source1: pycups-%{pycups_version}.tar.bz2
|
||||
Source2: system-config-printer.pam
|
||||
Source3: system-config-printer.console
|
||||
Patch0: pycups-uninit.patch
|
||||
|
||||
BuildRequires: cups-devel >= 1.2
|
||||
BuildRequires: python-devel >= 2.4
|
||||
@ -53,9 +52,6 @@ the configuration tool.
|
||||
|
||||
%prep
|
||||
%setup -q -a 1
|
||||
pushd pycups-%{pycups_version}
|
||||
%patch0 -p1 -b .uninit
|
||||
popd
|
||||
|
||||
%build
|
||||
%configure
|
||||
@ -126,6 +122,9 @@ rm -rf %buildroot
|
||||
exit 0
|
||||
|
||||
%changelog
|
||||
* Thu Nov 22 2007 Tim Waugh <twaugh@redhat.com>
|
||||
- Updated pycups to 1.9.31.
|
||||
|
||||
* Wed Nov 21 2007 Tim Waugh <twaugh@redhat.com>
|
||||
- Applied patch to pycups to avoid reading uninitialised
|
||||
memory (bug #390431).
|
||||
|
Loading…
Reference in New Issue
Block a user