rpms/cups/F-13 cups-str3399.patch,1.1,1.2 cups.spec,1.584,1.585

[Tim Waugh]

Author: twaugh

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

Modified Files:
	cups-str3399.patch cups.spec 
Log Message:
* Tue Mar  2 2010 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-33
- Don't treat SIGPIPE as an error (bug #569770).


cups-str3399.patch:
 main.c    |    8 +++++++-
 process.c |    3 +++
 2 files changed, 10 insertions(+), 1 deletion(-)

Index: cups-str3399.patch
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-13/cups-str3399.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cups-str3399.patch	16 Nov 2009 17:17:17 -0000	1.1
+++ cups-str3399.patch	2 Mar 2010 11:34:08 -0000	1.2
@@ -22,3 +22,27 @@ diff -up cups-1.4.2/scheduler/process.c.
  #endif /* HAVE_SIGSET */
  
      cupsdReleaseSignals();
+--- cups-1.4.2/scheduler/main.c.str3399	2010-03-02 11:04:28.968100478 +0000
++++ cups-1.4.2/scheduler/main.c	2010-03-02 11:04:47.442226409 +0000
+@@ -1733,7 +1733,7 @@ process_children(void)
+ 	  job->backend = -pid;
+ 
+ 	if (status && status != SIGTERM && status != SIGKILL &&
+-	    job->status >= 0)
++	    status != SIGPIPE && job->status >= 0)
+ 	{
+ 	 /*
+ 	  * An error occurred; save the exit status so we know to stop
+@@ -1829,6 +1829,12 @@ process_children(void)
+                       "PID %d (%s) was terminated normally with signal %d.",
+                       pid, name, status);
+     }
++    else if (status == SIGPIPE)
++    {
++      cupsdLogMessage(CUPSD_LOG_DEBUG,
++                      "PID %d (%s) did not catch or ignore signal %d.",
++                      pid, name, status);
++    }
+     else if (status)
+     {
+       if (WIFEXITED(status))


Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-13/cups.spec,v
retrieving revision 1.584
retrieving revision 1.585
diff -u -p -r1.584 -r1.585
--- cups.spec	24 Feb 2010 11:10:34 -0000	1.584
+++ cups.spec	2 Mar 2010 11:34:08 -0000	1.585
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.2
-Release: 32%{?dist}
+Release: 33%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -556,6 +556,9 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Mar  2 2010 Tim Waugh <twaugh at redhat.com> - 1:1.4.2-33
+- Don't treat SIGPIPE as an error (bug #569770).
+
 * Wed Feb 24 2010 Jiri Popelka <jpopelka at redhat.com> 1:1.4.2-32
 - Fixed cupsGetNamedDest() so it falls back to the real default
   printer when a default from configuration file does not exist (bug #565569, STR #3503).