rpms/bind/devel bind95-rh457175.patch, NONE, 1.1 bind.spec, 1.276, 1.277

Adam Tkac (atkac) fedora-extras-commits at redhat.com
Mon Aug 4 12:04:33 UTC 2008


Author: atkac

Update of /cvs/pkgs/rpms/bind/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31301

Modified Files:
	bind.spec 
Added Files:
	bind95-rh457175.patch 
Log Message:
- add forgotten patch for #457175
- build with -O2


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/devel/bind.spec,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -r1.276 -r1.277
--- bind.spec	31 Jul 2008 15:09:35 -0000	1.276
+++ bind.spec	4 Aug 2008 12:04:03 -0000	1.277
@@ -19,7 +19,7 @@
 Name:     bind
 License:  ISC
 Version:  9.5.1
-Release:  0.3.%{PREVER}%{?dist}
+Release:  0.4.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -59,6 +59,7 @@
 Patch87: bind-9.5-parallel-build.patch
 Patch90: bind-9.5-edns.patch
 Patch91: bind95-rh450995.patch
+Patch92: bind95-rh457175.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -241,6 +242,7 @@
 %patch87 -p1 -b .parallel
 %patch90 -p1 -b .edns
 %patch91 -p1 -b .rh450995
+%patch92 -p1 -b .rh457175
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -252,7 +254,7 @@
 :;
 
 %build
-export CFLAGS="$CFLAGS $RPM_OPT_FLAGS -O0"
+export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
 export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 export STD_CDEFINES="$CPPFLAGS"
 
@@ -638,6 +640,10 @@
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Mon Aug 04 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.4.b1
+- add forgotten patch for #457175
+- build with -O2
+
 * Thu Jul 31 2008 Adam Tkac <atkac redhat com> 32:9.5.1-0.3.b1
 - static libraries are no longer supported
 - IP acls weren't merged correctly (#457175)




More information about the fedora-extras-commits mailing list