From 79d57a17861f032563978178047a71af79c4476d Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Nov 16 2009 17:17:17 +0000
Subject: - Reset SIGPIPE handler for child processes (bug #537886, STR #3399).


---

diff --git a/cups-str3399.patch b/cups-str3399.patch
new file mode 100644
index 0000000..161942d
--- /dev/null
+++ b/cups-str3399.patch
@@ -0,0 +1,24 @@
+diff -up cups-1.4.2/CHANGES-1.4.txt.str3399 cups-1.4.2/CHANGES-1.4.txt
+diff -up cups-1.4.2/scheduler/process.c.str3399 cups-1.4.2/scheduler/process.c
+--- cups-1.4.2/scheduler/process.c.str3399	2009-05-16 04:04:48.000000000 +0100
++++ cups-1.4.2/scheduler/process.c	2009-11-16 17:15:26.104542409 +0000
+@@ -505,6 +505,7 @@ cupsdStartProcess(
+ #ifdef HAVE_SIGSET
+     sigset(SIGTERM, SIG_DFL);
+     sigset(SIGCHLD, SIG_DFL);
++    sigset(SIGPIPE, SIG_DFL);
+ #elif defined(HAVE_SIGACTION)
+     memset(&action, 0, sizeof(action));
+ 
+@@ -513,9 +514,11 @@ cupsdStartProcess(
+ 
+     sigaction(SIGTERM, &action, NULL);
+     sigaction(SIGCHLD, &action, NULL);
++    sigaction(SIGPIPE, &action, NULL);
+ #else
+     signal(SIGTERM, SIG_DFL);
+     signal(SIGCHLD, SIG_DFL);
++    signal(SIGPIPE, SIG_DFL);
+ #endif /* HAVE_SIGSET */
+ 
+     cupsdReleaseSignals();
diff --git a/cups.spec b/cups.spec
index 9e05fff..8da99ee 100644
--- a/cups.spec
+++ b/cups.spec
@@ -9,7 +9,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -53,6 +53,7 @@ Patch27: cups-str3285_v2.patch
 Patch28: cups-str3390.patch
 Patch29: cups-str3391.patch
 Patch30: cups-str3381.patch
+Patch31: cups-str3399.patch
 
 Patch100: cups-lspp.patch
 
@@ -216,6 +217,7 @@ module.
 %patch28 -p1 -b .str3390
 %patch29 -p1 -b .str3391
 %patch30 -p1 -b .str3381
+%patch31 -p1 -b .str3399
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -508,8 +510,11 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Nov 16 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.2-5
+- Reset SIGPIPE handler for child processes (bug #537886, STR #3399).
+
 * Mon Nov 16 2009 Tim Waugh <twaugh@redhat.com> 1:1.4.2-4
-- Upstream fix for GNU TLS error handling bug (STR #3381).
+- Upstream fix for GNU TLS error handling bug (bug #537883, STR #3381).
 
 * Wed Nov 11 2009 Jiri Popelka <jpopelka@redhat.com> 1:1.4.2-3
 - Fixed lspp-patch to avoid memory leak (bug #536741).