diff options
| -rw-r--r-- | bind-9.5-disable_dbus.patch | 12 | ||||
| -rw-r--r-- | bind.spec | 11 |
2 files changed, 6 insertions, 17 deletions
diff --git a/bind-9.5-disable_dbus.patch b/bind-9.5-disable_dbus.patch deleted file mode 100644 index 37d8621..0000000 --- a/bind-9.5-disable_dbus.patch +++ /dev/null @@ -1,12 +0,0 @@ -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(); @@ -8,7 +8,7 @@ %{?!LIBBIND: %define LIBBIND 1} %{?!efence: %define efence 0} %{?!test: %define test 0} -%{?!WITH_DBUS: %define WITH_DBUS 1} # + dynamic forwarder table management with D-BUS +%{?!WITH_DBUS: %define WITH_DBUS 0} # + dynamic forwarder table management with D-BUS %{?!bind_uid: %define bind_uid 25} %{?!bind_gid: %define bind_gid 25} %{?!selinux: %define selinux 1} @@ -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: 16.%{RELEASEVER}%{?dist} +Release: 16.1.%{RELEASEVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -81,7 +81,6 @@ 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 @@ -226,7 +225,6 @@ 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 @@ -408,7 +406,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.222 2007/10/23 17:52:49 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.223 2007/10/29 11:22:33 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: @@ -651,6 +649,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/bind-chroot-admin %changelog +* Mon Oct 29 2007 Adam Tkac <atkac redhat com> 32:9.5.0-16.1.a6 +- completely disable DBUS + * Tue Oct 23 2007 Adam Tkac <atkac redhat com> 32:9.5.0-16.a6 - disabled DBUS (dhcdbd doesn't exist & #339191) |