- backported patch to #249701 from BIND's HEADbind-9_4_1-8_P1_fc7

2 files changed, 37 insertions, 11 deletions

diff --git a/bind-9.4-tsig-init.patch b/bind-9.4-tsig-init.patch
new file mode 100644
index 0000000..5959d61
--- /dev/null
+++ b/bind-9.4-tsig-init.patch
@@ -0,0 +1,21 @@
+diff -up bind-9.4.1-P1/bin/named/client.c.tsig-init bind-9.4.1-P1/bin/named/client.c
+--- bind-9.4.1-P1/bin/named/client.c.tsig-init	2007-06-26 04:58:54.000000000 +0200
++++ bind-9.4.1-P1/bin/named/client.c	2007-07-26 17:45:43.000000000 +0200
+@@ -1226,7 +1226,8 @@ ns_client_isself(dns_view_t *myview, dns
+ 		 dns_rdataclass_t rdclass, void *arg)
+ {
+ 	dns_view_t *view;
+-	dns_tsigkey_t *key;
++	dns_tsigkey_t *key = NULL;
++	dns_name_t *tsig = NULL;
+ 	isc_netaddr_t netsrc;
+ 	isc_netaddr_t netdst;
+ 
+@@ -1241,7 +1242,6 @@ ns_client_isself(dns_view_t *myview, dns
+ 	for (view = ISC_LIST_HEAD(ns_g_server->viewlist);
+ 	     view != NULL;
+ 	     view = ISC_LIST_NEXT(view, link)) {
+-		dns_name_t *tsig = NULL;
+ 
+ 		if (view->matchrecursiveonly)
+ 			continue;
diff --git a/bind.spec b/bind.spec
index 977b0e5..5019f1b 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.1
-Release: 	7.%{RELEASEVER}%{?dist}
+Release: 	8.%{RELEASEVER}%{?dist}
 Epoch:   	31
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +75,7 @@ Patch65:	bind-9.4.0-dig-idn.patch
 Patch66:	bind-9.4.0-zone-freeze.patch
 Patch67:	bind-9.4.0-dbus-race-condition.patch
 Patch68:	bind-9.4.1-ldap-api.patch
+Patch69:	bind-9.4-tsig-init.patch
 #
 Requires:	bind-libs = %{epoch}:%{version}-%{release}, glibc  >= 2.2, mktemp
 Requires(post): grep, chkconfig >= 1.3.26
@@ -235,6 +236,7 @@ BIND's idn implementation libraries
 %patch5 -p1 -b .nonexec
 %patch6 -p1 -b .nsl
 %patch10 -p1 -b .PIE
+%patch69 -p1 -b .tsig-init
 %if %{SDB}
 %patch11 -p1 -b .sdbsrc
 %patch61 -p1 -b .sdb-sqlite-src
@@ -463,7 +465,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.187 2007/07/24 09:15:37 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.188 2007/07/26 15:50:56 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:
@@ -787,38 +789,41 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
-* Tue Jul 24 2007 Adam Tkac <atkac redhat com> 31:9.4.1-7.P1.fc7
+* Wed Jul 26 2007 Adam Tkac <atkac redhat com> 31:9.4.1-8.P1
+- backported patch to #249701 from BIND's HEAD
+
+* Tue Jul 24 2007 Adam Tkac <atkac redhat com> 31:9.4.1-7.P1
 - updated to latest upstream (contains fixes for CVE-2007-2925 and
   CVE-2007-2926)
 
-* Wed Jun 21 2007 Adam Tkac <atkac redhat com> 31:9.4.1-6.1.fc7
+* Wed Jun 21 2007 Adam Tkac <atkac redhat com> 31:9.4.1-6.1
 - minor changes in caching-nameserver configuration
 
-* Mon Jun 18 2007 Adam Tkac <atkac redhat com> 31:9.4.1-6.fc7
+* Mon Jun 18 2007 Adam Tkac <atkac redhat com> 31:9.4.1-6
 - major changes in default caching-nameserver configuration (configuration
   could now honor RFCs, #243565)
 
-* Tue Jun 05 2007 Adam Tkac <atkac redhat com> 31:9.4.1-5.fc7
+* Tue Jun 05 2007 Adam Tkac <atkac redhat com> 31:9.4.1-5
 - added /var/named/dynamic directory. This directory is primary designed
   for dynamic DNS zones. In future releases named could write only into
   dynamic, data and slaves directories
 
-* Thu May 24 2007 Adam Tkac <atkac redhat com> 31:9.4.1-4.fc7
+* Thu May 24 2007 Adam Tkac <atkac redhat com> 31:9.4.1-4
 - start using deprecated ldap API
 - fix minor bug in bind-chroot-admin (#241103)
 
-* Tue May 15 2007 Adam Tkac <atkac redhat com> 31:9.4.1-3.fc7
+* Tue May 15 2007 Adam Tkac <atkac redhat com> 31:9.4.1-3
 - fixed bind-chroot-admin dynamic DNS handling (#239149)
 - rewrited ldap backend to latest API (#239802)
 - updated zone-freeze patch to latest upstream
 
-* Mon May 07 2007 Adam Tkac <atkac redhat com> 31:9.4.1-2.fc7
+* Mon May 07 2007 Adam Tkac <atkac redhat com> 31:9.4.1-2
 - test build on new build system
 
-* Wed May 02 2007 Adam Tkac <atkac redhat com> 31:9.4.1-1.fc7
+* Wed May 02 2007 Adam Tkac <atkac redhat com> 31:9.4.1-1
 - updated to 9.4.1 which contains fix to CVE-2007-2241
 
-* Fri Apr 27 2007 Adam Tkac <atkac redhat com> 31:9.4.0-8.fc7
+* Fri Apr 27 2007 Adam Tkac <atkac redhat com> 31:9.4.0-8
 - improved "zone freeze patch" - if multiple zone with same name exists
   no zone is freezed
 - minor cleanup in caching-nameserver's config file