diff options
| -rw-r--r-- | .cvsignore | 2 | ||||
| -rw-r--r-- | bind-9.5-initialize.patch | 19 | ||||
| -rw-r--r-- | bind.spec | 16 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 10 insertions, 29 deletions
@@ -1,4 +1,4 @@ -bind-9.5.0rc1.tar.gz +bind-9.5.0.tar.gz config-2.tar bind-chroot.tar.bz2 libbind-man.tar.gz diff --git a/bind-9.5-initialize.patch b/bind-9.5-initialize.patch deleted file mode 100644 index 39101ff..0000000 --- a/bind-9.5-initialize.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up bind-9.5.0rc1/lib/isc/radix.c.init bind-9.5.0rc1/lib/isc/radix.c ---- bind-9.5.0rc1/lib/isc/radix.c.init 2008-05-22 17:11:59.000000000 +0200 -+++ bind-9.5.0rc1/lib/isc/radix.c 2008-05-22 17:12:43.000000000 +0200 -@@ -323,6 +323,7 @@ isc_radix_insert(isc_radix_tree_t *radix - if (node == NULL) - return (ISC_R_NOMEMORY); - node->bit = bitlen; -+ node->node_num[0] = node->node_num[1] = -1; - result = _ref_prefix(radix->mctx, &node->prefix, prefix); - if (result != ISC_R_SUCCESS) { - isc_mem_put(radix->mctx, node, -@@ -351,7 +352,6 @@ isc_radix_insert(isc_radix_tree_t *radix - } else { - node->node_num[ISC_IS6(family)] = - ++radix->num_added_node; -- node->node_num[!ISC_IS6(family)] = -1; - node->data[0] = NULL; - node->data[1] = NULL; - } @@ -2,8 +2,6 @@ # Red Hat BIND package .spec file # -%define RELEASEVER rc1 - %{?!SDB: %define SDB 1} %{?!LIBBIND: %define LIBBIND 1} %{?!efence: %define efence 0} @@ -20,13 +18,13 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: ISC Version: 9.5.0 -Release: 27.%{RELEASEVER}%{?dist} +Release: 27.1%{?dist} Epoch: 32 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Group: System Environment/Daemons # -Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}%{RELEASEVER}.tar.gz +Source: ftp://ftp.isc.org/isc/bind9/%{version}/bind-%{version}.tar.gz Source1: named.sysconfig Source2: named.init Source3: named.logrotate @@ -61,7 +59,6 @@ Patch71: bind-9.5-overflow.patch Patch72: bind-9.5-dlz-64bit.patch Patch80: bind-9.5-edns.patch Patch88: bind-9.5-recv-race.patch -Patch89: bind-9.5-initialize.patch # SDB patches Patch11: bind-9.3.2b2-sdbsrc.patch @@ -184,7 +181,7 @@ chroot(2) jail for the named(8) program from the BIND package. Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz> %prep -%setup -q -n %{name}-%{version}%{RELEASEVER} +%setup -q # Common patches %patch -p1 -b .varrun @@ -250,7 +247,6 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named %patch83 -p1 -b .libidn2 %patch85 -p1 -b .libidn3 %patch88 -p1 -b .recv-race -%patch89 -p1 -b .init :; @@ -407,7 +403,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.245 2008/05/22 15:27:32 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.246 2008/05/29 17:58:54 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: @@ -666,6 +662,10 @@ rm -rf ${RPM_BUILD_ROOT} %{_sbindir}/bind-chroot-admin %changelog +* Thu May 29 2008 Adam Tkac <atkac redhat com> 32:9.5.0-27.1 +- 9.5.0 final +- bind-9.5-initialize.patch merged to upstream + * Thu May 22 2008 Adam Tkac <atkac redhat com> 32:9.5.0-27.rc1 - 9.5.0rc1 release - initialize memory in ACL code correctly (#446848) @@ -1,4 +1,4 @@ -bf50ba674a8e2f9a762d423eba7dc01a bind-9.5.0rc1.tar.gz +066484717db1d1b1b4092ddcf5d0eb6e bind-9.5.0.tar.gz 9c3905b6aece5b4aa0deba6029437483 config-2.tar 4faa4395b955e5f8a3d50f308b9fabc8 bind-chroot.tar.bz2 13fef79f99fcefebb51d84b08805de51 libbind-man.tar.gz |