- 9.5.0b3 release

- dropped patches (upstream)
- bind-9.5.0-generate-xml.patch
- bind-9.5-transfer-segv.patch
- bind-9.5-mudflap.patch
- not buildable yet (due conflicts in libcap patch)

6 files changed, 11 insertions, 50 deletions

diff --git a/.cvsignore b/.cvsignore
index 4c96f52..a75ba58 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-bind-9.5.0b2.tar.gz
+bind-9.5.0b3.tar.gz
 bind-chroot.tar.bz2
 config-3.tar.bz2
 libbind-man.tar.gz
diff --git a/bind-9.5-mudflap.patch b/bind-9.5-mudflap.patch
deleted file mode 100644
index b2cbffd..0000000
--- a/bind-9.5-mudflap.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: make/rules.in
-===================================================================
-RCS file: /proj/cvs/prod/bind9/make/rules.in,v
-retrieving revision 1.62
-diff -u -r1.62 rules.in
---- make/rules.in       18 Jun 2007 23:47:57 -0000      1.62
-+++ make/rules.in       18 Feb 2008 14:46:16 -0000
-@@ -104,7 +104,7 @@
- BUILD_CC = @BUILD_CC@
- BUILD_CFLAGS = @BUILD_CFLAGS@
- BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
--BUILD_LDFAGS = @BUILD_LDFAGS@
-+BUILD_LDFLAGS = @BUILD_LDFLAGS@
- BUILD_LIBS = @BUILD_LIBS@
-
- .SUFFIXES:
diff --git a/bind-9.5-transfer-segv.patch b/bind-9.5-transfer-segv.patch
deleted file mode 100644
index 8ba5456..0000000
--- a/bind-9.5-transfer-segv.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up bind-9.5.0b1/lib/dns/rbtdb.c.segv bind-9.5.0b1/lib/dns/rbtdb.c
---- bind-9.5.0b1/lib/dns/rbtdb.c.segv	2008-02-11 14:52:12.000000000 +0100
-+++ bind-9.5.0b1/lib/dns/rbtdb.c	2008-02-11 14:55:58.000000000 +0100
-@@ -1633,7 +1633,8 @@ decrement_reference(dns_rbtdb_t *rbtdb, 
-                                       "decrement_reference: "
-                                       "dns_rbt_deletenode: %s",
-                                       isc_result_totext(result));
--        } else if (dns_rbtnode_refcurrent(node) == 0) {
-+        } else if (rbtdb->deadnodes != NULL &&
-+		   dns_rbtnode_refcurrent(node) == 0) {
-                 INSIST(!ISC_LINK_LINKED(node, deadlink));
-                 ISC_LIST_APPEND(rbtdb->deadnodes[bucket], node, deadlink);
-         }
diff --git a/bind-9.5.0-generate-xml.patch b/bind-9.5.0-generate-xml.patch
deleted file mode 100644
index 8a34e37..0000000
--- a/bind-9.5.0-generate-xml.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bind-9.5.0a5/bin/named/Makefile.in.xml	2007-06-19 11:49:35.000000000 +0200
-+++ bind-9.5.0a5/bin/named/Makefile.in	2007-06-19 11:49:48.000000000 +0200
-@@ -154,7 +154,7 @@ bind9.xsl.h: bind9.xsl convertxsl.pl
- 	${PERL} ${srcdir}/convertxsl.pl < ${srcdir}/bind9.xsl > bind9.xsl.h
- 
- depend: bind9.xsl.h
--server.@O@: bind9.xsl.h
-+server.o: bind9.xsl.h
- 
- installdirs:
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
diff --git a/bind.spec b/bind.spec
index c73cc25..19282b1 100644
--- a/bind.spec
+++ b/bind.spec
@@ -2,7 +2,7 @@
 #               Red Hat BIND package .spec file
 #
 
-%define RELEASEVER b2
+%define RELEASEVER b3
 
 %{?!SDB:        %define SDB         1}
 %{?!LIBBIND:    %define LIBBIND	    1}
@@ -54,12 +54,9 @@ Patch10: 	bind-9.5-PIE.patch
 Patch13: 	bind-9.3.1rc1-fix_libbind_includedir.patch
 Patch16: 	bind-9.3.2-redhat_doc.patch
 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
 Patch87:	bind-9.5-parallel-build.patch
-Patch88:	bind-9.5-transfer-segv.patch
-Patch89:	bind-9.5-mudflap.patch
 Patch90:	bind-9.5-libcap.patch
 
 # SDB patches
@@ -181,7 +178,6 @@ Based on the code from Jan "Yenya" Kasprzak <kas@fi.muni.cz>
 %patch1 -p1 -b .key
 %patch5 -p1 -b .nonexec
 %patch10 -p1 -b .PIE
-%patch69 -p1 -b .generate-xml
 %patch16 -p1 -b .redhat_doc
 %patch90 -p1 -b .libcap
 %if %{SDB}
@@ -240,8 +236,6 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %patch83 -p1 -b .libidn2
 %patch85 -p1 -b .libidn3
 %patch87 -p1 -b .parallel
-%patch88 -p1 -b .transfer-segv
-%patch89 -p0 -b .mudflap
 :;
 
 
@@ -396,7 +390,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.255 2008/04/02 12:43: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.256 2008/04/30 09:49:23 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:
@@ -647,6 +641,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Wed Apr 30 2008 Adam Tkac <atkac redhat com> 32:9.5.0-30.b3
+- 9.5.0b3 release
+- dropped patches (upstream)
+  - bind-9.5.0-generate-xml.patch
+  - bind-9.5-transfer-segv.patch
+  - bind-9.5-mudflap.patch
+
 * Wed Apr 02 2008 Adam Tkac <atkac redhat com> 32:9.5.0-29.3.b2
 - fixed named.conf.sample file (#437569)
 
diff --git a/sources b/sources
index 524e7f4..42af33a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-d64e5ac8b5d98508b450bf999c33e7df  bind-9.5.0b2.tar.gz
+9dbacfd7a957efd36e30736d579ed519  bind-9.5.0b3.tar.gz
 4faa4395b955e5f8a3d50f308b9fabc8  bind-chroot.tar.bz2
 d4bc7234a0d7b93328335ed9c076c6e9  config-3.tar.bz2
 13fef79f99fcefebb51d84b08805de51  libbind-man.tar.gz