From 2fa9c7ab790d2c64aaba7a0d7134902784335e14 Mon Sep 17 00:00:00 2001 From: Adam Tkac Date: Dec 03 2007 14:42:57 +0000 Subject: - removed bind-9.5-random_ports.patch because upstream doesn't like it. query-source{,-v6} is sufficient - bind-chroot-admin called restorecon on /proc filesystem (#405281) --- diff --git a/bind-9.5-random_ports.patch b/bind-9.5-random_ports.patch deleted file mode 100644 index bb83a55..0000000 --- a/bind-9.5-random_ports.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up bind-9.5.0a7/lib/dns/resolver.c.ports bind-9.5.0a7/lib/dns/resolver.c ---- bind-9.5.0a7/lib/dns/resolver.c.ports 2007-11-20 15:33:38.000000000 +0100 -+++ bind-9.5.0a7/lib/dns/resolver.c 2007-11-20 15:34:27.000000000 +0100 -@@ -7382,7 +7382,6 @@ disppooltimer_update(isc_task_t *task, i - - attrs_base = 0; - attrs_base |= DNS_DISPATCHATTR_UDP; -- attrs_base |= DNS_DISPATCHATTR_RANDOMPORT; - - attrmask = 0; - attrmask |= DNS_DISPATCHATTR_UDP; -@@ -7480,7 +7479,6 @@ dns_resolver_createdispatchpool(dns_reso - - attrs_base = 0; - attrs_base |= DNS_DISPATCHATTR_UDP; -- attrs_base |= DNS_DISPATCHATTR_RANDOMPORT; - - attrmask = 0; - attrmask |= DNS_DISPATCHATTR_UDP; diff --git a/bind-chroot-admin.in b/bind-chroot-admin.in index 8138269..3a431d4 100644 --- a/bind-chroot-admin.in +++ b/bind-chroot-admin.in @@ -230,7 +230,7 @@ function sync_files() done pfx=${BIND_CHROOT_PREFIX} else # chroot is disabled - /usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/named{/*,/data/*,/slaves/*,/dynamic/*}} -maxdepth 0 | + /usr/bin/find /var/named/chroot/{etc/{named.*,rndc.*},var/{named{/*,/data/*,/slaves/*,/dynamic/*},log/named.log}} -maxdepth 0 | while read f; do if [ ! -d "$f" ]; then @@ -238,8 +238,6 @@ function sync_files() [ ! -e $changed ] && touch $changed; fi; done - [ -L /var/log/named.log ] && rm -f /var/log/named.log - [ -e ${BIND_CHROOT_PREFIX}/var/log/named.log ] && mv -f ${BIND_CHROOT_PREFIX}/var/log/named.log /var/log/named.log fi; if [ ! -e ${pfx}/etc/rndc.key ]; then echo 'key "rndckey" { @@ -266,11 +264,15 @@ function sync_files() chmod 770 ${pfx}/var/named/{data/*/.,slaves/*/.,dynamic/*/.} >/dev/null 2>&1; if [ -e $changed ]; then if selinux_enabled && [ -x /sbin/restorecon ]; then - /sbin/restorecon -R ${BIND_CHROOT_PREFIX} >/dev/null 2>&1; + /sbin/restorecon -R ${BIND_CHROOT_PREFIX}/{dev,etc,var} >/dev/null 2>&1; /sbin/restorecon /etc/named.* >/dev/null 2>&1; /sbin/restorecon /etc/rndc.key >/dev/null 2>&1; /sbin/restorecon /etc/rndc.conf >/dev/null 2>&1; - /sbin/restorecon -R /var/named >/dev/null 2>&1; + for all in `ls /var/named`; do + if [ "x$all" != "xchroot" ]; then + restorecon -R /var/named/"$all" > /dev/null 2>&1; + fi + done fi; /sbin/service named try-restart rm -f $changed; diff --git a/bind.spec b/bind.spec index 23a8128..f61c5c8 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: 18.2.%{RELEASEVER}%{?dist} +Release: 18.3.%{RELEASEVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -63,7 +63,6 @@ Patch69: bind-9.5.0-generate-xml.patch Patch71: bind-9.5-overflow.patch Patch72: bind-9.5-dlz-64bit.patch Patch80: bind-9.5-edns.patch -Patch83: bind-9.5-random_ports.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -257,7 +256,6 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named %endif %patch73 -p1 -b .libidn %patch80 -p1 -b .edns -%patch83 -p1 -b .ports :; @@ -414,7 +412,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.229 2007/11/21 11:50:12 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.230 2007/12/03 14:42:57 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: @@ -665,6 +663,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/bind-chroot-admin %changelog +* Mon Dec 03 2007 Adam Tkac 32:9.5.0-18.3.a7 +- removed bind-9.5-random_ports.patch because upstream doesn't + like it. query-source{,-v6} is sufficient +- bind-chroot-admin called restorecon on /proc filesystem (#405281) + * Tue Nov 20 2007 Adam Tkac 32:9.5.0-18.2.a7 - use system port selector instead ISC's (#391931)