rpms/bind
7
0
Fork 1
Code Issues Pull Requests Releases Activity

- completely disable DBUS

Browse Source
This commit is contained in:
Adam Tkac 2007-10-29 11:35:57 +00:00
parent 8af0fe42da
commit 2add4cbf1d
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bind-9.5-disable_dbus.patch
View File

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

9
bind.spec
View File

@ -8,7 +8,7 @@
%{?!LIBBIND: %define LIBBIND 1} %{?!LIBBIND: %define LIBBIND 1}
%{?!efence: %define efence 0} %{?!efence: %define efence 0}
%{?!test: %define test 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_uid: %define bind_uid 25}
%{?!bind_gid: %define bind_gid 25} %{?!bind_gid: %define bind_gid 25}
%{?!selinux: %define selinux 1} %{?!selinux: %define selinux 1}
@ -21,7 +21,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
Name: bind Name: bind
License: ISC License: ISC
Version: 9.5.0 Version: 9.5.0
Release: 16.2.%{RELEASEVER}%{?dist} Release: 16.3.%{RELEASEVER}%{?dist}
Epoch: 32 Epoch: 32
Url: http://www.isc.org/products/BIND/ Url: http://www.isc.org/products/BIND/
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 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 Patch23: bind-9.5-dbus_archdep_libdir.patch
Patch81: bind-9.5-dbus-leak.patch Patch81: bind-9.5-dbus-leak.patch
Patch82: bind-9.5-dbus-va_end.patch Patch82: bind-9.5-dbus-va_end.patch
Patch83: bind-9.5-disable_dbus.patch
# IDN paches # IDN paches
Patch73: bind-9.5-libidn.patch 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 %patch23 -p1 -b .dbus_archdep_libdir
%patch81 -p1 -b .leak %patch81 -p1 -b .leak
%patch82 -p1 -b .va_end %patch82 -p1 -b .va_end
%patch83 -p1 -b .disable_dbus
%endif %endif
%if %{SDB} %if %{SDB}
%patch17 -p1 -b .fix_sdb_ldap %patch17 -p1 -b .fix_sdb_ldap
@ -651,6 +649,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sbindir}/bind-chroot-admin %{_sbindir}/bind-chroot-admin
%changelog %changelog
* Mon Oct 29 2007 Adam Tkac <atkac redhat com> 32:9.5.0-16.3.a6
- completely disable DBUS
* Fri Oct 26 2007 Adam Tkac <atkac redhat com> 32:9.5.0-16.2.a6 * Fri Oct 26 2007 Adam Tkac <atkac redhat com> 32:9.5.0-16.2.a6
- minor cleanup in bind-chroot-admin - minor cleanup in bind-chroot-admin