diff --git a/cups-str3399.patch b/cups-str3399.patch index 161942d..05552e4 100644 --- a/cups-str3399.patch +++ b/cups-str3399.patch @@ -22,3 +22,27 @@ diff -up cups-1.4.2/scheduler/process.c.str3399 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)) diff --git a/cups.spec b/cups.spec index 91d33ed..066831f 100644 --- a/cups.spec +++ b/cups.spec @@ -8,7 +8,7 @@ Summary: Common Unix Printing System Name: cups Version: 1.4.2 -Release: 26%{?dist} +Release: 27%{?dist} License: GPLv2 Group: System Environment/Daemons Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2 @@ -560,6 +560,9 @@ rm -rf $RPM_BUILD_ROOT %{php_extdir}/phpcups.so %changelog +* Tue Mar 2 2010 Tim Waugh - 1:1.4.2-27 +- Don't treat SIGPIPE as an error (bug #569770). + * Wed Feb 24 2010 Jiri Popelka 1:1.4.2-26 - Fixed cupsGetNamedDest() so it falls back to the real default printer when a default from configuration file does not exist (bug #565569, STR #3503).