diff options
| author | Adam Tkac <atkac@fedoraproject.org> | 2007-12-04 13:44:21 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@fedoraproject.org> | 2007-12-04 13:44:21 +0000 |
| commit | bb5d895564f52874a006adff83cd31c625b03470 (patch) | |
| tree | 9daa6d2ac27520259fb7661ad000b34fd4a904e7 | |
| parent | 27efb4347e88da39f6bb91db3ab031b8ac334ea8 (diff) | |
| download | bind-bb5d895564f52874a006adff83cd31c625b03470.tar.gz bind-bb5d895564f52874a006adff83cd31c625b03470.tar.xz bind-bb5d895564f52874a006adff83cd31c625b03470.zip | |
- bind-9.5-random_ports.patch was removed because upstream doesn't like it.bind-9_5_0-18_4_a7_fc9
query-source{,v6} options are sufficient (#391931)
- bind-chroot-admin called restorecon on /proc filesystem (#405281)
| -rw-r--r-- | bind-9.5-random_ports.patch | 19 | ||||
| -rw-r--r-- | bind-chroot-admin.in | 8 | ||||
| -rw-r--r-- | bind.spec | 9 |
3 files changed, 12 insertions, 24 deletions
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 66e71ce..3a431d4 100644 --- a/bind-chroot-admin.in +++ b/bind-chroot-admin.in @@ -264,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; @@ -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.3.%{RELEASEVER}%{?dist} +Release: 18.4.%{RELEASEVER}%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,7 +62,6 @@ Patch63: bind-9.4.0-dnssec-directory.patch Patch69: bind-9.5.0-generate-xml.patch Patch71: bind-9.5-overflow.patch Patch72: bind-9.5-dlz-64bit.patch -Patch83: bind-9.5-random_ports.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -255,7 +254,6 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named %patch72 -p1 -b .64bit %endif %patch73 -p1 -b .libidn -%patch83 -p1 -b .ports :; @@ -665,6 +663,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/bind-chroot-admin %changelog +* Mon Dec 03 2007 Adam Tkac <atkac redhat com> 32:9.5.0-18.4.a7 +- bind-9.5-random_ports.patch was removed because upstream doesn't + like it. query-source{,v6} options are sufficient (#391931) +- bind-chroot-admin called restorecon on /proc filesystem (#405281) + * Mon Nov 26 2007 Adam Tkac <atkac redhat com> 32:9.5.0-18.3.a7 - removed edns patch to keep compatibility with vanilla bind (#275091, comment #20) |