- updated to 9.4.2rc1

- patches merged to upstream
- bind-9.4-update.patch
- bind-9.4-_res_errno.patch

3 files changed, 9 insertions, 55 deletions

diff --git a/bind-9.4-_res_errno.patch b/bind-9.4-_res_errno.patch
deleted file mode 100644
index b325eb1..0000000
--- a/bind-9.4-_res_errno.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Written-by: Mark Andrews <Mark_Andrews isc org>
-Reviewed-by: Adam Tkac <atkac redhat com>
-
-diff -up bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno bind-9.5.0a6/lib/bind/resolv/res_data.c
---- bind-9.5.0a6/lib/bind/resolv/res_data.c._res_errno	2007-09-06 09:26:29.000000000 +0200
-+++ bind-9.5.0a6/lib/bind/resolv/res_data.c	2007-09-06 09:28:14.000000000 +0200
-@@ -40,7 +40,6 @@ static const char rcsid[] = "$Id: res_da
- #include <unistd.h>
- 
- #include "port_after.h"
--#undef _res
- 
- const char *_res_opcodes[] = {
- 	"QUERY",
-@@ -70,6 +69,7 @@ const char *_res_sectioncodes[] = {
- };
- #endif
- 
-+#undef _res
- #ifndef __BIND_NOSTATIC
- struct __res_state _res
- # if defined(__BIND_RES_TEXT)
-@@ -77,6 +77,10 @@ struct __res_state _res
- # endif
-         ;
- 
-+#if defined(DO_PTHREADS) || defined(__linux)
-+#define _res (*__res_state())
-+#endif
-+
- /* Proto. */
- 
- int  res_ourserver_p(const res_state, const struct sockaddr_in *);
diff --git a/bind-9.4-update.patch b/bind-9.4-update.patch
deleted file mode 100644
index 80eeef6..0000000
--- a/bind-9.4-update.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up bind-9.4.1-P1/lib/dns/message.c.update bind-9.4.1-P1/lib/dns/message.c
---- bind-9.4.1-P1/lib/dns/message.c.update	2007-08-14 10:53:25.000000000 +0200
-+++ bind-9.4.1-P1/lib/dns/message.c	2007-08-14 10:54:52.000000000 +0200
-@@ -1308,6 +1308,11 @@ getsection(isc_buffer_t *source, dns_mes
- 			rdata->type = rdtype;
- 			rdata->flags = DNS_RDATA_UPDATE;
- 			result = ISC_R_SUCCESS;
-+		} else if (rdclass == dns_rdataclass_none &&
-+			   msg->opcode == dns_opcode_update &&
-+			   sectionid == DNS_SECTION_UPDATE) {
-+			result = getrdata(source, msg, dctx, msg->rdclass,
-+					  rdtype, rdatalen, rdata);
- 		} else
- 			result = getrdata(source, msg, dctx, rdclass,
- 					  rdtype, rdatalen, rdata);
diff --git a/bind.spec b/bind.spec
index 10d19ad..709a4b3 100644
--- a/bind.spec
+++ b/bind.spec
@@ -2,7 +2,7 @@
 #               Red Hat BIND package .spec file
 #
 
-%define RELEASEVER b1
+%define RELEASEVER rc1
 
 %{?!SDB:        %define SDB         1}
 %{?!LIBBIND:    %define LIBBIND	    1}
@@ -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.3.1.%{RELEASEVER}%{?dist}
+Release: 	0.4.%{RELEASEVER}%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -70,9 +70,7 @@ Patch65:	bind-9.4.0-dig-idn.patch
 %endif
 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
-Patch73:	bind-9.4-_res_errno.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -296,8 +294,6 @@ popd
 %patch65 -p1 -b .idn
 %endif
 %patch66 -p1 -b .freeze
-%patch70 -p1 -b .update
-%patch73 -p1 -b .errno
 :;
 
 
@@ -459,7 +455,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.193 2007/09/18 13:06:58 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.194 2007/10/09 13:09: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:
@@ -783,6 +779,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Tue Oct 09 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.4.rc1
+- updated to 9.4.2rc1
+- patches merged to upstream
+  - bind-9.4-update.patch
+  - bind-9.4-_res_errno.patch
+
 * Mon Sep 17 2007 Adam Tkac <atkac redhat com> 31:9.4.2-0.3.1.b1
 - moved caching-nameserver chroot files to bind-chroot (#287321)