diff -Nru /tmp/UDaww4JJuN/cupsys-1.3.2/debian/changelog /tmp/hY1sIVMoYr/cupsys-1.3.2/debian/changelog --- /tmp/UDaww4JJuN/cupsys-1.3.2/debian/changelog 2007-12-12 16:00:54.000000000 +0000 +++ /tmp/hY1sIVMoYr/cupsys-1.3.2/debian/changelog 2007-12-12 16:00:55.000000000 +0000 @@ -1,3 +1,11 @@ +cupsys (1.3.2-1ubuntu7.3) gutsy-proposed; 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). + + -- Bruce Cowan Wed, 12 Dec 2007 15:52:35 +0000 + cupsys (1.3.2-1ubuntu7.2) gutsy-proposed; urgency=low * debian/local/apparmor-profile: diff -Nru /tmp/UDaww4JJuN/cupsys-1.3.2/debian/patches/00list /tmp/hY1sIVMoYr/cupsys-1.3.2/debian/patches/00list --- /tmp/UDaww4JJuN/cupsys-1.3.2/debian/patches/00list 2007-12-12 16:00:54.000000000 +0000 +++ /tmp/hY1sIVMoYr/cupsys-1.3.2/debian/patches/00list 2007-12-12 16:00:55.000000000 +0000 @@ -13,6 +13,7 @@ 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 ipptags-corruption-fix.dpatch diff -Nru /tmp/UDaww4JJuN/cupsys-1.3.2/debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch /tmp/hY1sIVMoYr/cupsys-1.3.2/debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch --- /tmp/UDaww4JJuN/cupsys-1.3.2/debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch 1970-01-01 01:00:00.000000000 +0100 +++ /tmp/hY1sIVMoYr/cupsys-1.3.2/debian/patches/cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch 2007-12-12 16:00:55.000000000 +0000 @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## cups-stops-broadcasting-on-HUP-with-explicit-BrowseAddress.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad cupsys-1.3.2~/scheduler/dirsvc.c cupsys-1.3.2/scheduler/dirsvc.c +--- cupsys-1.3.2~/scheduler/dirsvc.c 2007-09-18 18:51:32.000000000 +0100 ++++ cupsys-1.3.2/scheduler/dirsvc.c 2007-12-12 15:59:19.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 */ + +@@ -861,7 +861,7 @@ + + p->browse_time = time(NULL); + +- if (BrowseLocalProtocols & BROWSE_CUPS) ++ if ((BrowseLocalProtocols & BROWSE_CUPS) && BrowseSocket >= 0) + send_cups_browse(p); + + #ifdef HAVE_LIBSLP