rpms/dbus/devel dbus-1.1.2-no-abort.patch, NONE, 1.1 dbus.spec, 1.128, 1.129

Bill Nottingham (notting) fedora-extras-commits at redhat.com
Fri Sep 14 19:35:11 UTC 2007


Author: notting

Update of /cvs/extras/rpms/dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30252

Modified Files:
	dbus.spec 
Added Files:
	dbus-1.1.2-no-abort.patch 
Log Message:
don't abort on selinux messages. (#283231)


dbus-1.1.2-no-abort.patch:

--- NEW FILE dbus-1.1.2-no-abort.patch ---
diff -up dbus-1.1.2/bus/bus.c.foo dbus-1.1.2/bus/bus.c
--- dbus-1.1.2/bus/bus.c.foo	2007-09-14 15:26:08.000000000 -0400
+++ dbus-1.1.2/bus/bus.c	2007-09-14 15:26:08.000000000 -0400
@@ -1206,7 +1206,7 @@ bus_context_check_security_policy (BusCo
 				    dest ? dest : DBUS_SERVICE_DBUS, error))
         {
 
-	  if (dbus_error_is_set (error) &&
+	  if (error != NULL && dbus_error_is_set (error) &&
 	      dbus_error_has_name (error, DBUS_ERROR_NO_MEMORY))
 	    {
 	      return FALSE;


Index: dbus.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- dbus.spec	14 Sep 2007 13:11:38 -0000	1.128
+++ dbus.spec	14 Sep 2007 19:34:38 -0000	1.129
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.1.2
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
 Source1: doxygen_to_devhelp.xsl
@@ -38,6 +38,7 @@
 # https://bugs.freedesktop.org/show_bug.cgi?id=11491
 Patch2: dbus-1.0.2-lsb.patch
 Patch3: dbus-1.1.2-audit-user.patch
+Patch4: dbus-1.1.2-no-abort.patch
 
 %description
 
@@ -81,6 +82,7 @@
 %patch1 -p1 -b .generate-xml-docs
 %patch2 -p1 -b .lsb
 %patch3 -p1 -b .audit-user
+%patch4 -p1 -b .abort
 
 autoreconf -f -i
 
@@ -200,6 +202,9 @@
 %{_datadir}/devhelp/books/dbus
 
 %changelog
+* Fri Sep 14 2007 Bill Nottingham <notting at redhat.com> - 1.1.2-6%{?dist}
+- fix daemon abort when SELinux denies passing on a message (#283231)
+
 * Fri Sep 14 2007 Dan Walsh <dwalsh at redhat.com> - 1.1.2-5%{?dist}
 - Reverse we_were_root check to setpcap if we were root.  Also only init
 audit if we were root.  So error dbus message will not show up when policy 




More information about the fedora-extras-commits mailing list