rpms/hplip/devel hplip-dbus.patch,NONE,1.1 hplip.spec,1.188,1.189

[Tim Waugh]

Author: twaugh

Update of /cvs/pkgs/rpms/hplip/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24699

Modified Files:
	hplip.spec 
Added Files:
	hplip-dbus.patch 
Log Message:
* Thu Dec 11 2008 Tim Waugh <twaugh at redhat.com> 2.8.7-5
- Prevent backend crash when D-Bus not running (bug #474362).


hplip-dbus.patch:

--- NEW FILE hplip-dbus.patch ---
diff -up hplip-2.8.7/prnt/backend/hp.c.dbus hplip-2.8.7/prnt/backend/hp.c
--- hplip-2.8.7/prnt/backend/hp.c.dbus	2008-12-11 10:44:30.000000000 +0000
+++ hplip-2.8.7/prnt/backend/hp.c	2008-12-11 10:46:15.000000000 +0000
@@ -489,6 +489,9 @@ static int device_event(const char *dev,
     DBusMessage * msg = NULL;
     int id = atoi(jobid);
 
+    if (dbus_conn == NULL)
+	return 0;
+
     msg = dbus_message_new_signal(DBUS_PATH, DBUS_INTERFACE, "Event");
 
     if (NULL == msg)


Index: hplip.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hplip/devel/hplip.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- hplip.spec	29 Nov 2008 16:47:51 -0000	1.188
+++ hplip.spec	11 Dec 2008 11:13:33 -0000	1.189
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 2.8.7
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and MIT
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -18,6 +18,7 @@
 Patch2: hplip-gzip-n.patch
 Patch3: hplip-quiet.patch
 Patch4: hplip-marker-supply.patch
+Patch5: hplip-dbus.patch
 Patch6: hplip-systray.patch
 Patch8: hplip-libsane.patch
 Patch12: hplip-no-root-config.patch
@@ -114,6 +115,9 @@
 # Low ink is a warning condition, not an error.
 %patch4 -p1 -b .marker-supply
 
+# Prevent backend crash when D-Bus not running (bug #474362).
+%patch5 -p1 -b .dbus
+
 # Make --qt4 the default for the systray applet, so that it appears
 # in the right place.
 %patch6 -p1 -b .systray
@@ -306,6 +310,9 @@
 exit 0
 
 %changelog
+* Thu Dec 11 2008 Tim Waugh <twaugh at redhat.com> 2.8.7-5
+- Prevent backend crash when D-Bus not running (bug #474362).
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.8.7-4
 - Rebuild for Python 2.6