From 85fe558d2a5da20d20cc8c12ddf2ddfed3be3c16 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Oct 23 2007 17:51:39 +0000
Subject: - disabled DBUS (dhcdbd doesn't exist & #339191)


---

diff --git a/bind-9.5-disable_dbus.patch b/bind-9.5-disable_dbus.patch
new file mode 100644
index 0000000..37d8621
--- /dev/null
+++ b/bind-9.5-disable_dbus.patch
@@ -0,0 +1,12 @@
+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();
diff --git a/bind.spec b/bind.spec
index fe92171..65e31c3 100644
--- a/bind.spec
+++ b/bind.spec
@@ -21,7 +21,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 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 @@ Patch15: 	bind-9.5.0-dbus.patch
 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 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
 %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
@@ -406,7 +408,7 @@ for f in my.internal.zone.db slaves/my.slave.internal.zone.db slaves/my.ddns.int
   echo '@ in soa localhost. root 1 3H 15M 1W 1D
   ns localhost.' > sample/var/named/$f; 
 done
-/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.220 2007/10/18 17:45:07 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
+/usr/bin/tail -n '+'`/bin/egrep -n '\\$Id: bind.spec,v 1.221 2007/10/23 17:51:39 atkac Exp $/+1/' | bc` bin/rndc/rndc.conf | sed '/Sample rndc configuration file./{p;i\
  *\
  * NOTE: you only need to create this file if it is to\
  * differ from the following default contents:
@@ -649,6 +651,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_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