[cups/f17] backport 2 upstream commits (r10638, r10642)

[Tim Waugh]

commit 11a862dc106757a7a23229f56afdeb890d597be7
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Thu Oct 11 10:51:52 2012 +0200

    backport 2 upstream commits (r10638, r10642)

 cups-r10638.patch |   24 ++++++++++++++++++++++++
 cups-r10642.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 cups.spec         |   12 ++++++++++--
 3 files changed, 74 insertions(+), 2 deletions(-)
---
diff --git a/cups-r10638.patch b/cups-r10638.patch
new file mode 100644
index 0000000..16f61bb
--- /dev/null
+++ b/cups-r10638.patch
@@ -0,0 +1,24 @@
+From b1c8da8900d3c854e108ce445bef9fce8522ca22 Mon Sep 17 00:00:00 2001
+From: mike <mike at 7a7537e8-13f0-0310-91df-b6672ffda945>
+Date: Tue, 2 Oct 2012 16:30:35 +0000
+Subject: [PATCH] The IPP backend did not send a cancel request to printers
+ when a job was canceled and the printer did not support
+ Create-Job.
+
+git-svn-id: http://svn.easysw.com/public/cups/trunk@10638 7a7537e8-13f0-0310-91df-b6672ffda945
+---
+diff --git a/backend/ipp.c b/backend/ipp.c
+index b509996..5eecc29 100644
+--- a/backend/ipp.c
++++ b/backend/ipp.c
+@@ -89,6 +89,7 @@ static int		child_pid = 0;	/* Child process ID */
+ #endif /* HAVE_GSSAPI && HAVE_XPC */
+ static const char * const jattrs[] =	/* Job attributes we want */
+ {
++  "job-id",
+   "job-impressions-completed",
+   "job-media-sheets-completed",
+   "job-name",
+-- 
+1.7.11.7
+
diff --git a/cups-r10642.patch b/cups-r10642.patch
new file mode 100644
index 0000000..684ae38
--- /dev/null
+++ b/cups-r10642.patch
@@ -0,0 +1,40 @@
+From c98bc4b769f85da3199485c85e8c98bb8c87ff04 Mon Sep 17 00:00:00 2001
+From: mike <mike at 7a7537e8-13f0-0310-91df-b6672ffda945>
+Date: Tue, 9 Oct 2012 03:01:31 +0000
+Subject: [PATCH] Work around broken 1284 device IDs that use a newline
+ instead of a semicolon.
+
+git-svn-id: http://svn.easysw.com/public/cups/trunk@10642 7a7537e8-13f0-0310-91df-b6672ffda945
+---
+diff --git a/backend/snmp.c b/backend/snmp.c
+index f672e37..fc40800 100644
+--- a/backend/snmp.c
++++ b/backend/snmp.c
+@@ -1025,6 +1025,11 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	    * Description is the IEEE-1284 device ID...
+ 	    */
+ 
++            char *ptr;			/* Pointer into device ID */
++
++            for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++)
++              if (*ptr == '\n')
++                *ptr = ';';		/* A lot of bad printers put a newline */
+ 	    if (!device->id)
+ 	      device->id = strdup((char *)packet.object_value.string.bytes);
+ 
+@@ -1066,8 +1071,11 @@ read_snmp_response(int fd)		/* I - SNMP socket file descriptor */
+ 	  */
+ 
+ 	  char	make_model[256];	/* Make and model */
++          char *ptr;			/* Pointer into device ID */
+ 
+-
++          for (ptr = (char *)packet.object_value.string.bytes; *ptr; ptr ++)
++            if (*ptr == '\n')
++              *ptr = ';';		/* A lot of bad printers put a newline */
+ 	  if (device->id)
+ 	    free(device->id);
+ 
+-- 
+1.7.11.7
+
diff --git a/cups.spec b/cups.spec
index 59b491e..9b2f839 100644
--- a/cups.spec
+++ b/cups.spec
@@ -12,7 +12,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.5.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -76,6 +76,8 @@ Patch40: cups-r10572.patch
 Patch41: cups-str4072.patch
 Patch42: cups-str4124.patch
 Patch43: cups-str4194.patch
+Patch44: cups-r10638.patch
+Patch45: cups-r10642.patch
 
 Patch100: cups-lspp.patch
 
@@ -314,6 +316,11 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 # The IPP backend could get stuck in an endless loop on certain network errors
 # (STR #4194)
 %patch43 -p1 -b .str4194
+# The IPP backend did not send a cancel request to printers when a job was
+# canceled and the printer did not support Create-Job.
+%patch44 -p1 -b .r10638
+# Work around broken 1284 device IDs that use a newline instead of a semicolon.
+%patch45 -p1 -b .r10642
 
 %if %lspp
 # LSPP support.
@@ -683,7 +690,8 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man1/ipptool.1.gz
 
 %changelog
-* Thu Oct 11 2012 Jiri Popelka <jpopelka at redhat.com>
+* Thu Oct 11 2012 Jiri Popelka <jpopelka at redhat.com> 1:1.5.4-7
+- backport 2 upstream commits (r10638, r10642)
 - backport fixes for STR #4191, STR #4194
 - backport fixes for STR #4072, STR #4124
 - backport 2 upstream commits (r10572, r10573)