[Pkg-cups-devel] r725 - in cupsys/trunk/debian: . patches

[Till Kamppeter]

Author: till-guest
Date: Thu Mar 20 15:08:50 2008
New Revision: 725

Log:
Fix CUPS STRs #2731, #2763


Added:
   cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch   (contents, props changed)
Modified:
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Thu Mar 20 15:08:50 2008
@@ -1,5 +1,8 @@
 cupsys (1.3.6-3) UNRELEASED; urgency=low
 
+  * debian/patches/ppd-poll-with-client-conf.dpatch: If there is a client.conf
+    pointing to a remote server, clients were not able to poll the PPD options
+    from printers on that server (CUPS STRs #2731, #2763)
   * debian/local/apparmor-profile: Allow cups-pdf to read files in ~/PDF/, so
     that it can overwrite files. (LP: #161222)
 

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Thu Mar 20 15:08:50 2008
@@ -17,3 +17,4 @@
 testsuite-exit-code.dpatch
 ubuntu-disable-browsing.dpatch
 ubuntu-default-error-policy-retry-job.dpatch
+ppd-poll-with-client-conf.dpatch

Added: cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/ppd-poll-with-client-conf.dpatch	Thu Mar 20 15:08:50 2008
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## ppd-poll-with-client-conf.dpatch by  <till.kamppeter at gmail.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad cupsys-1.3.6~/cups/util.c cupsys-1.3.6/cups/util.c
+--- cupsys-1.3.6~/cups/util.c	2008-01-17 00:42:35.000000000 +0100
++++ cupsys-1.3.6/cups/util.c	2008-03-20 13:07:07.000000000 +0100
+@@ -810,7 +810,7 @@
+ 
+   if (!strcasecmp(http_hostname, hostname) && port == http_port)
+     http2 = http;
+-  else if ((http2 = httpConnectEncrypt(hostname, port,
++  else if ((http2 = httpConnectEncrypt(http_hostname, http_port,
+                                        cupsEncryption())) == NULL)
+   {
+     DEBUG_puts("Unable to connect to server!");