rpms/cups
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'f21'

Browse Source
This commit is contained in:
Tim Waugh 2014-10-22 10:05:37 +01:00
commit 1beae2847c
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cups-str4496.patch Normal file
View File

@ -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 */
}

4
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 2.0.0 Version: 2.0.0
Release: 8%{?dist} Release: 9%{?dist}
License: GPLv2 License: GPLv2
Url: http://www.cups.org/ Url: http://www.cups.org/
Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2 Source: http://www.cups.org/software/%{version}/cups-%{version}-source.tar.bz2
@ -614,7 +614,7 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Wed Oct 22 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-8 * Wed Oct 22 2014 Tim Waugh <twaugh@redhat.com> - 1:2.0.0-9
- Upstream fix for cupsd crash on restart when colord not available - Upstream fix for cupsd crash on restart when colord not available
- (STR #4496). - (STR #4496).