diff options
| author | Adam Tkac <atkac@fedoraproject.org> | 2008-06-18 11:34:31 +0000 |
|---|---|---|
| committer | Adam Tkac <atkac@fedoraproject.org> | 2008-06-18 11:34:31 +0000 |
| commit | 48eb786dbb8754fc99971b42341e6b11855860f2 (patch) | |
| tree | 05e230c0aec60ffbf9ff4f4ffcef54c59feb0e1b | |
| parent | 59216d3660b600a47908c16794295b22438b57ea (diff) | |
- parse inner acls correctly (#450995)bind-9_5_0-32_2_fc9
| -rw-r--r-- | bind.spec | 9 | ||||
| -rw-r--r-- | bind95-rh450995.patch | 11 |
2 files changed, 18 insertions, 2 deletions
@@ -16,7 +16,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.5.0 -Release: 32.1%{?dist} +Release: 32.2%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -57,6 +57,7 @@ Patch72: bind-9.5-dlz-64bit.patch Patch87: bind-9.5-parallel-build.patch Patch91: bind-9.5-recv-race.patch Patch92: bind-9.5-edns.patch +Patch93: bind95-rh450995.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -237,6 +238,7 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named %patch87 -p1 -b .parallel %patch91 -p1 -b .recv-race %patch92 -p1 -b .edns +%patch93 -p1 -b .rh450995 :; @@ -391,7 +393,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.263 2008/05/29 17:54:52 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.264 2008/06/18 11:34:31 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: @@ -642,6 +644,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/bind-chroot-admin %changelog +* Wed Jun 18 2008 Adam Tkac <atkac redhat com> 32:9.5.0-32.2 +- parse inner acls correctly (#450995) + * Thu May 29 2008 Adam Tkac <atkac redhat com> 32:9.5.0-32.1 - 9.5.0 final - bind-9.5-initialize.patch merged to upstream diff --git a/bind95-rh450995.patch b/bind95-rh450995.patch new file mode 100644 index 0000000..d8f7115 --- /dev/null +++ b/bind95-rh450995.patch @@ -0,0 +1,11 @@ +diff -up bind-9.5.0/lib/isccfg/aclconf.c.450995 bind-9.5.0/lib/isccfg/aclconf.c +--- bind-9.5.0/lib/isccfg/aclconf.c.450995 2008-06-18 12:29:05.000000000 +0200 ++++ bind-9.5.0/lib/isccfg/aclconf.c 2008-06-18 12:30:01.000000000 +0200 +@@ -287,6 +287,7 @@ nested_acl: + } else { + dns_acl_merge(dacl, inneracl, + ISC_TF(!neg)); ++ de += inneracl->length; /* elements added */ + dns_acl_detach(&inneracl); + continue; + } |