diff --git a/cups-str4496.patch b/cups-str4496.patch new file mode 100644 index 0000000..5b8625d --- /dev/null +++ b/cups-str4496.patch @@ -0,0 +1,14 @@ +diff -up cups-1.7.5/scheduler/colorman.c.dbus-unref cups-1.7.5/scheduler/colorman.c +--- cups-1.7.5/scheduler/colorman.c.dbus-unref 2014-10-21 12:43:10.401299966 +0100 ++++ cups-1.7.5/scheduler/colorman.c 2014-10-21 12:43:12.870312593 +0100 +@@ -208,7 +208,9 @@ void + cupsdStopColor(void) + { + #if !defined(__APPLE__) && defined(HAVE_DBUS) +- dbus_connection_unref(colord_con); ++ if (colord_con) ++ dbus_connection_unref(colord_con); ++ + colord_con = NULL; + #endif /* !__APPLE__ && HAVE_DBUS */ + } diff --git a/cups.spec b/cups.spec index d5233ed..2b91e38 100644 --- a/cups.spec +++ b/cups.spec @@ -11,7 +11,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 1.7.5 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Url: http://www.cups.org/ Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 @@ -657,7 +657,7 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog -* Wed Oct 22 2014 Tim Waugh - 1:1.7.5-10 +* Wed Oct 22 2014 Tim Waugh - 1:1.7.5-11 - Upstream fix for cupsd crash on restart when colord not available - (STR #4496).