- make statistics http server working, patch backported from 9.6 HEADbind-9_6_0-0_2_b1_fc11

2 files changed, 18 insertions, 1 deletions

diff --git a/bind-96-libxml2.patch b/bind-96-libxml2.patch
new file mode 100644
index 0000000..1292e6a
--- /dev/null
+++ b/bind-96-libxml2.patch
@@ -0,0 +1,12 @@
+diff -up bind-9.6.0b1/configure.in.libxml2 bind-9.6.0b1/configure.in
+--- bind-9.6.0b1/configure.in.libxml2	2008-11-11 16:04:27.000000000 +0100
++++ bind-9.6.0b1/configure.in	2008-11-11 16:04:46.000000000 +0100
+@@ -1002,7 +1002,7 @@ case "$use_libxml2" in
+ 		;;
+ 	auto|yes)
+ 		case X`(xml2-config --version) 2>/dev/null` in
+-		X2.6.*)
++		X2.[[67]].*)
+ 			libxml2_libs=`xml2-config --libs`
+ 			libxml2_cflags=`xml2-config --cflags`
+ 			;;
diff --git a/bind.spec b/bind.spec
index 02c4c4a..50e21e7 100644
--- a/bind.spec
+++ b/bind.spec
@@ -18,7 +18,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.6.0
-Release:  0.1.%{PREVER}%{?dist}
+Release:  0.2.%{PREVER}%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +61,7 @@ Patch96: bind-95-rh469440.patch
 %if %{LIBBIND}
 Patch97: bind-96-temporary-libbind.patch
 %endif
+Patch98: bind-96-libxml2.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -228,6 +229,7 @@ cp -fp contrib/sdb/sqlite/zone2sqlite.c bin/sdb_tools
 %patch94 -p1 -b .rh461409
 %patch95 -p1 -b .includes
 %patch96 -p1 -b .rh469440
+%patch98 -p1 -b .libxml2
 
 # Sparc and s390 arches need to use -fPIE
 %ifarch sparcv9 sparc64 s390 s390x
@@ -587,6 +589,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %ghost %{chroot_prefix}/etc/localtime
 
 %changelog
+* Tue Nov 11 2008 Adam Tkac <atkac redhat com> 32:9.6.0-0.2.b1
+- make statistics http server working, patch backported from 9.6 HEAD
+
 * Mon Nov 10 2008 Adam Tkac <atkac redhat com> 32:9.6.0-0.1.b1
 - 9.6.0b1 release
 - don't build ODBC and Berkeley DB DLZ drivers