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

[Martin Pitt]

Author: mpitt
Date: Sat Sep  6 10:04:58 2008
New Revision: 849

Log:
Add quiesce-bonjour-warning.dpatch: Silence the "Apple Bonjour
compatibility layer of Avahi" warning, since it can cause SIGPIPE crashes
when being issued in a child process without stderr. (Closes: #497492)

Added:
   cupsys/trunk/debian/patches/quiesce-bonjour-warning.dpatch   (contents, props changed)
Modified:
   cupsys/trunk/   (props changed)
   cupsys/trunk/debian/changelog
   cupsys/trunk/debian/patches/00list

Modified: cupsys/trunk/debian/changelog
==============================================================================
--- cupsys/trunk/debian/changelog	(original)
+++ cupsys/trunk/debian/changelog	Sat Sep  6 10:04:58 2008
@@ -3,8 +3,11 @@
   * Remove debian/patches/dont_force_ssl.dpatch; gnome-cups-manager is ancient
     and removed from Debian, and newer GUIs like system-config-printer get
     along fine with the default setting.
+  * Add quiesce-bonjour-warning.dpatch: Silence the "Apple Bonjour
+    compatibility layer of Avahi" warning, since it can cause SIGPIPE crashes
+    when being issued in a child process without stderr. (Closes: #497492)
 
- -- Martin Pitt <mpitt at debian.org>  Sat, 06 Sep 2008 11:14:56 +0200
+ -- Martin Pitt <mpitt at debian.org>  Sat, 06 Sep 2008 11:59:53 +0200
 
 cups (1.3.8-7) experimental; urgency=low
 

Modified: cupsys/trunk/debian/patches/00list
==============================================================================
--- cupsys/trunk/debian/patches/00list	(original)
+++ cupsys/trunk/debian/patches/00list	Sat Sep  6 10:04:58 2008
@@ -15,6 +15,7 @@
 ppd-poll-with-client-conf.dpatch
 # no answer yet, po4a might not be appropriate
 manpage-translations.dpatch
+quiesce-bonjour-warning.dpatch
 
 # patches which should go upstream
 classes_crash.dpatch

Added: cupsys/trunk/debian/patches/quiesce-bonjour-warning.dpatch
==============================================================================
--- (empty file)
+++ cupsys/trunk/debian/patches/quiesce-bonjour-warning.dpatch	Sat Sep  6 10:04:58 2008
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## quiesce-bonjour-warning.dpatch by  <mpitt at debian.org>
+##
+## DP: Silence Avahi Bonjour compat warning, since this can cause SIGPIPE
+## DP: crashes if stderr is not available.
+## DP: http://bugs.debian.org/497492, http://www.cups.org/str.php?L2931
+
+ at DPATCH@
+diff -urNad trunk~/scheduler/printers.c trunk/scheduler/printers.c
+--- trunk~/scheduler/printers.c	2008-09-06 11:47:42.000000000 +0200
++++ trunk/scheduler/printers.c	2008-09-06 11:52:39.000000000 +0200
+@@ -2353,6 +2353,9 @@
+ 	}
+ 
+ #ifdef HAVE_DNSSD
++	/* silence Avahi Bonjour compat warning, since this can cause SIGPIPE
++	 * crashes if stderr is not available */
++	setenv("AVAHI_COMPAT_NOWARN", "1", 0);
+ 	cupsdSetString(&p->product, ppd->product);
+ #endif /* HAVE_DNSSD */
+