[cups/f16] Use upstream fix for driverd issue (bug #742989).
Tim Waugh
twaugh at fedoraproject.org
Tue Oct 11 12:10:18 UTC 2011
commit 042f3d8906c38fe91891afe814223072eafc7784
Author: Tim Waugh <twaugh at redhat.com>
Date: Tue Oct 11 12:38:55 2011 +0100
Use upstream fix for driverd issue (bug #742989).
cups-driverd-bug.patch | 11 -----------
cups-str3921.patch | 14 ++++++++++++++
cups.spec | 5 +++--
3 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/cups-str3921.patch b/cups-str3921.patch
new file mode 100644
index 0000000..d370e38
--- /dev/null
+++ b/cups-str3921.patch
@@ -0,0 +1,14 @@
+diff -up cups-1.5.0/scheduler/cups-driverd.cxx.str3921 cups-1.5.0/scheduler/cups-driverd.cxx
+--- cups-1.5.0/scheduler/cups-driverd.cxx.str3921 2011-06-08 22:19:11.000000000 +0100
++++ cups-1.5.0/scheduler/cups-driverd.cxx 2011-10-11 12:07:34.979538544 +0100
+@@ -1411,9 +1411,7 @@ load_drv(const char *filename, /* I -
+ * Add a dummy entry for the file...
+ */
+
+- httpAssembleURIf(HTTP_URI_CODING_ALL, uri, sizeof(uri), "drv", "", "", 0,
+- "/%s", name);
+- add_ppd(name, uri, "", "", "", "", "", "", mtime, size, 0,
++ add_ppd(name, name, "", "", "", "", "", "", mtime, size, 0,
+ PPD_TYPE_DRV, "drv");
+ ChangedPPD = 1;
+
diff --git a/cups.spec b/cups.spec
index 4203e91..43b0224 100644
--- a/cups.spec
+++ b/cups.spec
@@ -72,7 +72,7 @@ Patch34: cups-avahi-5-services.patch
Patch35: cups-icc.patch
Patch36: cups-systemd-socket.patch
Patch37: cups-CVE-2011-2896.patch
-Patch38: cups-driverd-bug.patch
+Patch38: cups-str3921.patch
Patch100: cups-lspp.patch
@@ -298,7 +298,7 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
%patch37 -p1 -b .CVE-2011-2896
# Work around PPDs cache handling issue (bug #742989).
-%patch38 -p1 -b .driverd-bug
+%patch38 -p1 -b .str3921
%if %lspp
# LSPP support.
@@ -647,6 +647,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Oct 11 2011 Tim Waugh <twaugh at redhat.com> 1:1.5.0-16
+- Use upstream fix for driverd issue (bug #742989).
- Array handling fixes for DNSSDPrinters.
- Array handling fixes for Avahi poll implementation.
- Increase client blocking timeout from 30s to 70s (bug #744715).
More information about the scm-commits
mailing list