rpms/cups/F-12 cups-str3399.patch,NONE,1.1 cups.spec,1.536,1.537

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/cups/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6709

Modified Files:
	cups.spec 
Added Files:
	cups-str3399.patch 
Log Message:
* Mon Nov 16 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-5
- Reset SIGPIPE handler for child processes (bug #537886, STR #3399).


cups-str3399.patch:
 process.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE cups-str3399.patch ---
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();


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-12/cups.spec,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -p -r1.536 -r1.537
--- cups.spec	16 Nov 2009 11:18:15 -0000	1.536
+++ cups.spec	16 Nov 2009 17:18:44 -0000	1.537
@@ -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
@@ -55,6 +55,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
 Epoch: 1
@@ -214,6 +215,7 @@ module. 
 %patch28 -p1 -b .str3390
 %patch29 -p1 -b .str3391
 %patch30 -p1 -b .str3381
+%patch31 -p1 -b .str3399
 
 %if %lspp
 %patch100 -p1 -b .lspp
@@ -511,8 +513,11 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Mon Nov 16 2009 Tim Waugh <twaugh at redhat.com> 1:1.4.2-5
+- Reset SIGPIPE handler for child processes (bug #537886, STR #3399).
+
 * Mon Nov 16 2009 Tim Waugh <twaugh at 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 at redhat.com> 1:1.4.2-3
 - Fixed lspp-patch to avoid memory leak (bug #536741).