diff --git a/bind-9.4-2119_revert.patch b/bind-9.4-2119_revert.patch new file mode 100644 index 0000000..57e0f25 --- /dev/null +++ b/bind-9.4-2119_revert.patch @@ -0,0 +1,56 @@ +diff -up bind-9.4.2b1/lib/bind/resolv/res_init.c.recurs bind-9.4.2b1/lib/bind/resolv/res_init.c +--- bind-9.4.2b1/lib/bind/resolv/res_init.c.recurs 2007-08-31 09:01:10.000000000 +0200 ++++ bind-9.4.2b1/lib/bind/resolv/res_init.c 2007-08-31 09:13:41.000000000 +0200 +@@ -166,9 +166,7 @@ __res_vinit(res_state statp, int preinit + #endif + int dots; + union res_sockaddr_union u[2]; +- int maxns = MAXNS; + +- RES_SET_H_ERRNO(statp, 0); + if (statp->_u._ext.ext != NULL) + res_ndestroy(statp); + +@@ -218,22 +216,8 @@ __res_vinit(res_state statp, int preinit + statp->_u._ext.ext->nsaddrs[0].sin = statp->nsaddr; + strcpy(statp->_u._ext.ext->nsuffix, "ip6.arpa"); + strcpy(statp->_u._ext.ext->nsuffix2, "ip6.int"); +- } else { +- /* +- * Historically res_init() rarely, if at all, failed. +- * Examples and applications exist which do not check +- * our return code. Furthermore several applications +- * simply call us to get the systems domainname. So +- * rather then immediately fail here we store the +- * failure, which is returned later, in h_errno. And +- * prevent the collection of 'nameserver' information +- * by setting maxns to 0. Thus applications that fail +- * to check our return code wont be able to make +- * queries anyhow. +- */ +- RES_SET_H_ERRNO(statp, NETDB_INTERNAL); +- maxns = 0; +- } ++ } else ++ return (-1); + #ifdef RESOLVSORT + statp->nsort = 0; + #endif +@@ -362,7 +346,7 @@ __res_vinit(res_state statp, int preinit + continue; + } + /* read nameservers to query */ +- if (MATCH(buf, "nameserver") && nserv < maxns) { ++ if (MATCH(buf, "nameserver") && nserv < MAXNS) { + struct addrinfo hints, *ai; + char sbuf[NI_MAXSERV]; + const size_t minsiz = +@@ -498,7 +482,7 @@ __res_vinit(res_state statp, int preinit + if ((cp = getenv("RES_OPTIONS")) != NULL) + res_setoptions(statp, cp, "env"); + statp->options |= RES_INIT; +- return (statp->res_h_errno); ++ return (0); + } + + static void diff --git a/bind.spec b/bind.spec index 4d737f1..779ef68 100644 --- a/bind.spec +++ b/bind.spec @@ -20,7 +20,7 @@ Summary: The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv Name: bind License: BSD-like Version: 9.4.2 -Release: 0.1.%{RELEASEVER}%{?dist} +Release: 0.2.%{RELEASEVER}%{?dist} Epoch: 31 Url: http://www.isc.org/products/BIND/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -73,6 +73,7 @@ Patch66: bind-9.4.0-zone-freeze.patch Patch68: bind-9.4.1-ldap-api.patch Patch70: bind-9.4-update.patch Patch71: bind-9.4-dbus.patch +Patch72: bind-9.4-2119_revert.patch # Requires: bind-libs = %{epoch}:%{version}-%{release}, glibc >= 2.2, mktemp Requires(post): grep, chkconfig >= 1.3.26 @@ -298,6 +299,7 @@ popd %endif %patch66 -p1 -b .freeze %patch70 -p1 -b .update +%patch72 -p1 -b .2119_revert :; @@ -459,7 +461,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.190 2007/08/22 10:56: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.191 2007/09/03 07:54:59 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: @@ -783,6 +785,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Aug 31 2007 Adam Tkac 31:9.4.2-0.2.b1 +- temporary revert ISC 2119 change which conflicts with our + "libbind-errno" patch (#254501) + * Tue Aug 21 2007 Adam Tkac 31:9.4.2-0.1.b1 - updated to 9.4.2b1 - dropped patches