rpms/bind/F-8 bind95-rh457175.patch,NONE,1.1 bind.spec,1.248,1.249

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/bind/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv941

Modified Files:
	bind.spec 
Added Files:
	bind95-rh457175.patch 
Log Message:
- IP acls weren't merged correctly (#457175)


bind95-rh457175.patch:

--- NEW FILE bind95-rh457175.patch ---
diff -up bind-9.5.0-P1/lib/dns/iptable.c.rh457175 bind-9.5.0-P1/lib/dns/iptable.c
--- bind-9.5.0-P1/lib/dns/iptable.c.rh457175	2008-01-21 22:02:24.000000000 +0100
+++ bind-9.5.0-P1/lib/dns/iptable.c	2008-07-31 16:10:46.000000000 +0200
@@ -117,16 +117,17 @@ dns_iptable_merge(dns_iptable_t *tab, dn
 			if (node->data[0] &&
 			    *(isc_boolean_t *) node->data[0] == ISC_TRUE)
 				new_node->data[0] = &dns_iptable_neg;
-			else
-				new_node->data[0] = node->data[0];
 
 			if (node->data[1] &&
 			    *(isc_boolean_t *) node->data[1] == ISC_TRUE)
 				new_node->data[1] = &dns_iptable_neg;
-			else
-				new_node->data[1] = node->data[0];
 		}
 
+		if (new_node->data[0] == NULL)
+			new_node->data[0] = node->data[0];
+		if (new_node->data[1] == NULL)
+			new_node->data[1] = node->data[1];
+
 		if (node->node_num[0] > max_node)
 			max_node = node->node_num[0];
 		if (node->node_num[1] > max_node)


Index: bind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bind/F-8/bind.spec,v
retrieving revision 1.248
retrieving revision 1.249
diff -u -r1.248 -r1.249
--- bind.spec	8 Jul 2008 22:14:21 -0000	1.248
+++ bind.spec	31 Jul 2008 14:40:05 -0000	1.249
@@ -3,6 +3,7 @@
 #
 
 %define PATCHVER P1
+%define _default_patch_fuzz 2
 
 %{?!SDB:        %define SDB         1}
 %{?!LIBBIND:    %define LIBBIND	    1}
@@ -20,7 +21,7 @@
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	28.%{PATCHVER}%{?dist}
+Release: 	28.1.%{PATCHVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -62,6 +63,7 @@
 Patch80:	bind-9.5-edns.patch
 Patch88:	bind-9.5-recv-race.patch
 Patch89:	bind95-rh450995.patch
+Patch90:	bind95-rh457175.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -187,7 +189,7 @@
 %setup -q -n %{name}-%{version}-%{PATCHVER}
 
 # Common patches
-%patch -p1 -b .varrun
+%patch0 -p1 -b .varrun
 %patch1 -p1 -b .key
 %patch5 -p1 -b .nonexec
 %patch6 -p1 -b .nsl
@@ -251,6 +253,7 @@
 %patch85 -p1 -b .libidn3
 %patch88 -p1 -b .recv-race
 %patch89 -p1 -b .rh450995
+%patch90 -p1 -b .rh457175
 :;
 
 
@@ -280,6 +283,7 @@
 	--enable-threads \
 	--enable-ipv6 \
 	--with-pic \
+	--disable-static \
 %if %{LIBBIND}
 	--enable-libbind \
 %endif
@@ -666,6 +670,9 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Thu Jul 31 2008 Adam Tkac <atkac redhat com> 32:9.5.0-28.1.P1
+- IP acls weren't merged correctly (#457175)
+
 * Tue Jul 08 2008 Adam Tkac <atkac redhat com> 32:9.5.0-28.P1
 - 9.5.0-P1 release (CVE-2008-1447)