From c4dc311c9d82fb49bd2c01c55086163078d29fcd Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 4 Oct 2011 16:21:24 +0100
Subject: [PATCH] Work around PPDs cache handling issue (bug #742989).

---
 cups-driverd-bug.patch | 11 +++++++++++
 cups.spec              |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 cups-driverd-bug.patch

diff --git a/cups-driverd-bug.patch b/cups-driverd-bug.patch
new file mode 100644
index 0000000..cd7fbcb
--- /dev/null
+++ b/cups-driverd-bug.patch
@@ -0,0 +1,11 @@
+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)
+   {
+    /*
diff --git a/cups.spec b/cups.spec
index 9a250b9..b70f196 100644
--- a/cups.spec
+++ b/cups.spec
@@ -13,7 +13,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.5.0
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -72,6 +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
 
 Patch100: cups-lspp.patch
 
@@ -296,6 +297,9 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 # Avoid GIF reader loop (CVE-2011-2896, STR #3914, bug #727800).
 %patch37 -p1 -b .CVE-2011-2896
 
+# Work around PPDs cache handling issue (bug #742989).
+%patch38 -p1 -b .driverd-bug
+
 %if %lspp
 # LSPP support.
 %patch100 -p1 -b .lspp
@@ -642,6 +646,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ipptool.1.gz
 
 %changelog
+* Tue Oct  4 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-13
+- Work around PPDs cache handling issue (bug #742989).
+
 * Tue Oct  4 2011 Tim Waugh <twaugh@redhat.com> 1:1.5.0-12
 - More fixes for systemd socket activation:
   - relax permissions check for domain socket in libcups.