- disabled DBUS (dhcdbd doesn't exist & #339191)

This commit is contained in:
Adam Tkac 2007-10-23 17:55:46 +00:00
parent bbe5776b48
commit 3f1f99fa88
2 changed files with 18 additions and 1 deletions

View File

@ -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();

View File

@ -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
@ -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