rpms/dbus/FC-6 dbus-1.0.0-dont-die-on-error.patch, NONE, 1.1 dbus.spec, 1.106, 1.107

[fedora-cvs-commits at redhat.com]

Author: rstrode

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

Modified Files:
	dbus.spec 
Added Files:
	dbus-1.0.0-dont-die-on-error.patch 
Log Message:
- don't die when reloading config, if config file gains new
  options that aren't understood (bug 218207)


dbus-1.0.0-dont-die-on-error.patch:
 main.c |    1 -
 1 files changed, 1 deletion(-)

--- NEW FILE dbus-1.0.0-dont-die-on-error.patch ---
--- dbus-1.0.0/bus/main.c.dont-die-on-error	2006-12-13 22:38:02.000000000 -0500
+++ dbus-1.0.0/bus/main.c	2006-12-13 22:38:05.000000000 -0500
@@ -163,7 +163,6 @@
       _dbus_warn ("Unable to reload configuration: %s\n",
 		  error.message);
       dbus_error_free (&error);
-      exit (1);
     }
   return TRUE;
 }


Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/dbus.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- dbus.spec	1 Dec 2006 18:24:46 -0000	1.106
+++ dbus.spec	14 Dec 2006 16:37:44 -0000	1.107
@@ -8,7 +8,7 @@
 Summary: D-BUS message bus
 Name: dbus
 Version: 1.0.1 
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://www.freedesktop.org/software/dbus/
 Source0: %{name}-%{version}.tar.gz
 License: AFL/GPL
@@ -28,12 +28,14 @@
 Requires: libxml2-python
 
 Conflicts: cups < 1:1.1.20-4
+Conflicts: selinux-policy-targeted < 2.4.6-7.fc6
 
 Patch2: dbus-0.61-selinux-avc-audit.patch
 Patch3: dbus-0.60-start-early.patch
 Patch4: dbus-0.92-audit-system.patch
 Patch6: dbus-1.0.0-no_fatal_checks.patch
 Patch7: dbus-1.0.1-pthread-holder-fix.patch
+Patch8: dbus-1.0.0-dont-die-on-error.patch
 
 %description
 
@@ -69,6 +71,7 @@
 %patch4 -p1 -b .audit_system
 %patch6 -p1 -b .no_fatal_checks
 %patch7 -p1 -b .pthread-holder-fix
+%patch8 -p1 -b .dont-die-on-error
 
 autoreconf -f -i
 
@@ -173,6 +176,10 @@
 %{_includedir}/*
 
 %changelog
+* Thu Dec 14 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-3
+- don't die when reloading config, if config file gains new
+  options that aren't understood (bug 218207)
+
 * Fri Dec 01 2006 John (J5) Palmieri <johnp at redhat.com> - 1.0.1-2
 - Make sure we own the /var/lib/dbus directory so that it is created on install