[Pkg-cups-devel] r648 - in cupsys/branches/cups-1.2-ubuntu/debian: . patches

[Till Kamppeter]

Author: till-guest
Date: Mon Dec 10 00:09:19 2007
New Revision: 648

Log:
CUPS stopped broadcasting on a HUP signal when using a fixed BrowseAddress.


Added:
   cupsys/branches/cups-1.2-ubuntu/debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.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	Mon Dec 10 00:09:19 2007
@@ -1,3 +1,11 @@
+cupsys (1.3.4-2ubuntu3) UNRELEASED; urgency=low
+
+  * 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, LP: #173470).
+
+ -- Till Kamppeter <till.kamppeter at gmail.com>  Mon, 10 Dec 2007  0:01:06 +0000
+
 cupsys (1.3.4-2ubuntu2) hardy; urgency=low
 
   [ Martin Pitt ]

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	Mon Dec 10 00:09:19 2007
@@ -13,5 +13,6 @@
 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
 ubuntu-disable-browsing.dpatch
 ubuntu-default-error-policy-retry-job.dpatch

Added: cupsys/branches/cups-1.2-ubuntu/debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch
==============================================================================
--- (empty file)
+++ cupsys/branches/cups-1.2-ubuntu/debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch	Mon Dec 10 00:09:19 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