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

[Till Kamppeter]

Author: till-guest
Date: Sun Dec  9 23:59:35 2007
New Revision: 647

Log:
Fix of CUPS stopping broadcasting on a HUP signal when a fixed BrowseAddress is used.


Added:
   cupsys/trunk/debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.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	Sun Dec  9 23:59:35 2007
@@ -3,7 +3,10 @@
   [ Martin Pitt ]
   * debian/control: Bump Standards-Version to 3.7.3 (no changes necessary).
 
-  [ Till Kamppeter ] 
+  [ Till Kamppeter ]
+  * debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch:
+    CUPS stopped broadcasting on a HUP signal when using a fixed
+    BrowseAddress (CUPS STR #2618, Ubuntu LP: #173470).
   * debian/local/backends/dnssd: Updated dnssd to support Mac OS X servers
     which broadcast their print queues only via DNS-SD and require clients
     to create raw IPP queues pointing to the server's queues manually.

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Sun Dec  9 23:59:35 2007
@@ -13,3 +13,4 @@
 reactivate_recommended_driver.dpatch
 include_krb5_h_in_job_h.dpatch
 search_mime_files_in_usr_share.dpatch
+cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch

Added: cupsys/trunk/debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch	Sun Dec  9 23:59:35 2007
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.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.4~/scheduler/dirsvc.c cupsys-1.3.4/scheduler/dirsvc.c
+--- cupsys-1.3.4~/scheduler/dirsvc.c	2007-10-02 00:11:47.000000000 +0100
++++ cupsys-1.3.4/scheduler/dirsvc.c	2007-12-09 23:50:31.000000000 +0000
+@@ -198,7 +198,7 @@
+   * Announce the deletion...
+   */
+ 
+-  if ((BrowseLocalProtocols & BROWSE_CUPS))
++  if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0)
+   {
+     cups_ptype_t savedtype = p->type;	/* Saved printer type */
+ 
+@@ -862,7 +862,7 @@
+ 
+ 	p->browse_time = time(NULL);
+ 
+-	if (BrowseLocalProtocols & BROWSE_CUPS)
++	if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0)
+           send_cups_browse(p);
+ 
+ #ifdef HAVE_LIBSLP