From ad959e0a40d7c2c6308299d7e95695fbffa8d6b6 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Sep 18 2012 09:31:41 +0000
Subject: Don't use the IPP Create-Job operation, widely implemented unreliably (bug #854989).


Resolves: rhbz#854989

---

diff --git a/cups-ipp-no-create-job.patch b/cups-ipp-no-create-job.patch
new file mode 100644
index 0000000..2e902d2
--- /dev/null
+++ b/cups-ipp-no-create-job.patch
@@ -0,0 +1,25 @@
+diff -up cups-1.5.4/backend/ipp.c.no-create-job cups-1.5.4/backend/ipp.c
+--- cups-1.5.4/backend/ipp.c.no-create-job	2012-09-18 10:27:00.674951341 +0100
++++ cups-1.5.4/backend/ipp.c	2012-09-18 10:28:37.360322089 +0100
+@@ -1127,21 +1127,10 @@ main(int  argc,				/* I - Number of comm
+       {
+         if (operations_sup->values[i].integer == IPP_VALIDATE_JOB)
+ 	  validate_job = 1;
+-        else if (operations_sup->values[i].integer == IPP_CREATE_JOB)
+-	  create_job = 1;
+-        else if (operations_sup->values[i].integer == IPP_SEND_DOCUMENT)
+-	  send_document = 1;
+         else if (operations_sup->values[i].integer == IPP_GET_JOB_ATTRIBUTES)
+ 	  get_job_attrs = 1;
+       }
+ 
+-      if (!send_document)
+-      {
+-        fputs("DEBUG: Printer supports Create-Job but not Send-Document.\n",
+-              stderr);
+-        create_job = 0;
+-      }
+-
+       if (!validate_job)
+ 	update_reasons(NULL, "+cups-ipp-conformance-failure-report,"
+                              "cups-ipp-missing-validate-job");
diff --git a/cups.spec b/cups.spec
index bcf4e0d..32a4a86 100644
--- a/cups.spec
+++ b/cups.spec
@@ -12,7 +12,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.5.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -70,6 +70,7 @@ Patch34: cups-avahi-5-services.patch
 
 Patch35: cups-icc.patch
 Patch36: cups-systemd-socket.patch
+Patch37: cups-ipp-no-create-job.patch
 
 Patch100: cups-lspp.patch
 
@@ -293,6 +294,10 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 # Poettering).
 %patch36 -p1 -b .systemd-socket
 
+# Don't use the IPP Create-Job operation, widely implemented
+# unreliably (bug #854989).
+%patch37 -p1 -b .ipp-no-create-job
+
 %if %lspp
 # LSPP support.
 %patch100 -p1 -b .lspp
@@ -661,6 +666,10 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man1/ipptool.1.gz
 
 %changelog
+* Tue Sep 18 2012 Tim Waugh <twaugh@redhat.com> 1:1.5.2-3
+- Don't use the IPP Create-Job operation, widely implemented
+  unreliably (bug #854989).
+
 * Thu Aug 23 2012 Jiri Popelka <jpopelka@redhat.com> 1:1.5.4-2
 - quirk handler for port reset done by new USB backend (bug #847923, STR #4155)