rpms/dbus/devel dbus-0.32-selinux-init.patch, NONE, 1.1 dbus.spec, 1.37, 1.38

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Mar 31 19:45:49 UTC 2005


Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4930

Modified Files:
	dbus.spec 
Added Files:
	dbus-0.32-selinux-init.patch 
Log Message:
- add selinux-init patch to fix dbus from segfaulting when
  building on machines that don't have selinux enabled



dbus-0.32-selinux-init.patch:
 selinux.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE dbus-0.32-selinux-init.patch ---
--- dbus-0.32/bus/selinux.c.init	2005-03-31 14:42:45.677663000 -0500
+++ dbus-0.32/bus/selinux.c	2005-03-31 14:42:55.310021000 -0500
@@ -236,7 +236,7 @@
       return FALSE;
     }
 
-  selinux_enabled = r != 0;
+  selinux_enabled = (r == 1);
   return TRUE;
 #else
   return TRUE;


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- dbus.spec	31 Mar 2005 16:57:27 -0000	1.37
+++ dbus.spec	31 Mar 2005 19:45:47 -0000	1.38
@@ -12,7 +12,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 0.32
-Release: 1 
+Release: 2 
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -34,6 +34,7 @@
 
 Conflicts: cups < 1:1.1.20-4
 
+Patch1: dbus-0.32-selinux-init.patch
 Patch2: dbus-0.23-selinux-avc-audit.patch
 
 %description
@@ -110,6 +111,7 @@
 %prep
 %setup -q
 
+%patch1 -p1 -b .selinux-init
 #%patch2 -p1 -b .selinux-avc-audit
 
 %build
@@ -262,6 +264,10 @@
 %{_libdir}/python*/site-packages/dbus_bindings.so
 
 %changelog
+* Thu Mar 31 2005 John (J5) Palmieri <johnp at redhat.com> - 0.32-2
+- add selinux-init patch to fix dbus from segfaulting when
+  building on machines that don't have selinux enabled
+
 * Thu Mar 31 2005 John (J5) Palmieri <johnp at redhat.com> - 0.32-1
 - update to upstream version 0.32
 




More information about the fedora-cvs-commits mailing list