rpms/bind/devel bind-9.5-disable_dbus.patch, NONE, 1.1 bind.spec, 1.220, 1.221

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24996

Modified Files:
	bind.spec 
Added Files:
	bind-9.5-disable_dbus.patch 
Log Message:
- disabled DBUS (dhcdbd doesn't exist & #339191)


bind-9.5-disable_dbus.patch:

--- NEW FILE bind-9.5-disable_dbus.patch ---
diff -up bind-9.5.0a6/bin/named/main.c.disable_dbus bind-9.5.0a6/bin/named/main.c
--- bind-9.5.0a6/bin/named/main.c.disable_dbus	2007-10-23 19:47:52.000000000 +0200
+++ bind-9.5.0a6/bin/named/main.c	2007-10-23 19:48:09.000000000 +0200
@@ -451,7 +451,7 @@ parse_command_line(int argc, char *argv[
 			printf("BIND %s\n", ns_g_version);
 			exit(0);
 		case 'D':
-		        ns_g_dbus = 1;
+		        /* ns_g_dbus = 1; */
 			break;
 		case '?':
 			usage();


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/devel/bind.spec,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- bind.spec	18 Oct 2007 17:45:07 -0000	1.220
+++ bind.spec	23 Oct 2007 17:55:46 -0000	1.221
@@ -21,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	15.1.%{RELEASEVER}%{?dist}
+Release: 	16.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,6 +81,7 @@
 Patch23: 	bind-9.5-dbus_archdep_libdir.patch
 Patch81:	bind-9.5-dbus-leak.patch
 Patch82:	bind-9.5-dbus-va_end.patch
+Patch83:	bind-9.5-disable_dbus.patch
 
 # IDN paches
 Patch73:	bind-9.5-libidn.patch
@@ -225,6 +226,7 @@
 %patch23 -p1 -b .dbus_archdep_libdir
 %patch81 -p1 -b .leak
 %patch82 -p1 -b .va_end
+%patch83 -p1 -b .disable_dbus
 %endif
 %if %{SDB}
 %patch17 -p1 -b .fix_sdb_ldap
@@ -649,6 +651,9 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Tue Oct 23 2007 Adam Tkac <atkac redhat com> 32:9.5.0-16.a6
+- disabled DBUS (dhcdbd doesn't exist & #339191)
+
 * Wed Oct 18 2007 Adam Tkac <atkac redhat com> 32:9.5.0-15.1.a6
 - fixed missing va_end () functions (#336601)
 - fixed memory leak when dbus initialization fails