rpms/cups
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use upstream fix for driverd issue (bug #742989).

Browse Source
This commit is contained in:
Tim Waugh 2011-10-11 12:38:55 +01:00
parent 6a13918bff
commit 042f3d8906
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cups-driverd-bug.patch
View File

@ -1,11 +0,0 @@
diff -up cups-1.5.0/scheduler/cups-driverd.cxx.driverd-bug cups-1.5.0/scheduler/cups-driverd.cxx
--- cups-1.5.0/scheduler/cups-driverd.cxx.driverd-bug 2011-10-04 16:12:08.067606926 +0100
+++ cups-1.5.0/scheduler/cups-driverd.cxx 2011-10-04 16:15:55.788633393 +0100
@@ -2359,6 +2359,7 @@ load_ppds_dat(char *filename, /* I -
cups_cachedir = CUPS_CACHEDIR;
snprintf(filename, filesize, "%s/ppds.dat", cups_cachedir);
+ return; // NOT WORKING
if ((fp = cupsFileOpen(filename, "r")) != NULL)
{
/*

14
cups-str3921.patch Normal file
View File

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

5
cups.spec
View File

@ -72,7 +72,7 @@ Patch34: cups-avahi-5-services.patch
Patch35: cups-icc.patch Patch35: cups-icc.patch
Patch36: cups-systemd-socket.patch Patch36: cups-systemd-socket.patch
Patch37: cups-CVE-2011-2896.patch Patch37: cups-CVE-2011-2896.patch
Patch38: cups-driverd-bug.patch Patch38: cups-str3921.patch
Patch100: cups-lspp.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 %patch37 -p1 -b .CVE-2011-2896
# Work around PPDs cache handling issue (bug #742989). # Work around PPDs cache handling issue (bug #742989).
%patch38 -p1 -b .driverd-bug %patch38 -p1 -b .str3921
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -647,6 +647,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Oct 11 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-16 * Tue Oct 11 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-16
- Use upstream fix for driverd issue (bug #742989).
- Array handling fixes for DNSSDPrinters. - Array handling fixes for DNSSDPrinters.
- Array handling fixes for Avahi poll implementation. - Array handling fixes for Avahi poll implementation.
- Increase client blocking timeout from 30s to 70s (bug #744715). - Increase client blocking timeout from 30s to 70s (bug #744715).