[Pkg-cups-devel] r727 - in cupsys/branches/cups-1.2-ubuntu/debian: . patches
Till Kamppeter
till-guest at alioth.debian.org
Thu Mar 20 15:44:40 UTC 2008
Author: till-guest
Date: Thu Mar 20 15:44:39 2008
New Revision: 727
Log:
Fix CUPS STRs #2731, #2763.
Added:
cupsys/branches/cups-1.2-ubuntu/debian/patches/ppd-poll-with-client-conf.dpatch (contents, props changed)
Modified:
cupsys/branches/cups-1.2-ubuntu/debian/changelog
cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
Modified: cupsys/branches/cups-1.2-ubuntu/debian/changelog
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/changelog (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/changelog Thu Mar 20 15:44:39 2008
@@ -1,3 +1,11 @@
+cupsys (1.3.6-2ubuntu3) hardy; 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)
+
+ -- Till Kamppeter <till.kamppeter at gmail.com> Thu, 20 Mar 2008 17:01:06 +0100
+
cupsys (1.3.6-2ubuntu2) hardy; urgency=low
* debian/cupsys.postinst: Fix 'revert to single file' transitional code to
Modified: cupsys/branches/cups-1.2-ubuntu/debian/patches/00list
==============================================================================
--- cupsys/branches/cups-1.2-ubuntu/debian/patches/00list (original)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/00list Thu Mar 20 15:44:39 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/branches/cups-1.2-ubuntu/debian/patches/ppd-poll-with-client-conf.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/ppd-poll-with-client-conf.dpatch Thu Mar 20 15:44:39 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!");
More information about the Pkg-cups-devel
mailing list