From 6f0c67cc195880e0c21128881e27a54f8fda2550 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@fedoraproject.org>
Date: Nov 21 2007 11:50:12 +0000
Subject: - use system port selector instead ISC's (#391931)


---

diff --git a/bind-9.5-random_ports.patch b/bind-9.5-random_ports.patch
new file mode 100644
index 0000000..bb83a55
--- /dev/null
+++ b/bind-9.5-random_ports.patch
@@ -0,0 +1,19 @@
+diff -up bind-9.5.0a7/lib/dns/resolver.c.ports bind-9.5.0a7/lib/dns/resolver.c
+--- bind-9.5.0a7/lib/dns/resolver.c.ports	2007-11-20 15:33:38.000000000 +0100
++++ bind-9.5.0a7/lib/dns/resolver.c	2007-11-20 15:34:27.000000000 +0100
+@@ -7382,7 +7382,6 @@ disppooltimer_update(isc_task_t *task, i
+ 
+         attrs_base = 0;
+         attrs_base |= DNS_DISPATCHATTR_UDP;
+-        attrs_base |= DNS_DISPATCHATTR_RANDOMPORT;
+ 
+         attrmask = 0;
+         attrmask |= DNS_DISPATCHATTR_UDP;
+@@ -7480,7 +7479,6 @@ dns_resolver_createdispatchpool(dns_reso
+ 
+         attrs_base = 0;
+         attrs_base |= DNS_DISPATCHATTR_UDP;
+-        attrs_base |= DNS_DISPATCHATTR_RANDOMPORT;
+ 
+         attrmask = 0;
+         attrmask |= DNS_DISPATCHATTR_UDP;
diff --git a/bind.spec b/bind.spec
index 4e91a75..23a8128 100644
--- a/bind.spec
+++ b/bind.spec
@@ -21,7 +21,7 @@ Summary: 	The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name: 		bind
 License: 	ISC
 Version: 	9.5.0
-Release: 	18.%{RELEASEVER}%{?dist}
+Release: 	18.2.%{RELEASEVER}%{?dist}
 Epoch:   	32
 Url: 		http://www.isc.org/products/BIND/
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,6 +63,7 @@ Patch69:	bind-9.5.0-generate-xml.patch
 Patch71:	bind-9.5-overflow.patch
 Patch72:	bind-9.5-dlz-64bit.patch
 Patch80:	bind-9.5-edns.patch
+Patch83:	bind-9.5-random_ports.patch
 
 # SDB patches
 Patch11: 	bind-9.3.2b2-sdbsrc.patch
@@ -256,6 +257,7 @@ cp -fp contrib/dbus/{dbus_mgr.h,dbus_service.h} bin/named/include/named
 %endif
 %patch73 -p1 -b .libidn
 %patch80 -p1 -b .edns
+%patch83 -p1 -b .ports
 :;
 
 
@@ -412,7 +414,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.228 2007/11/19 14:25:07 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.229 2007/11/21 11:50:12 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:
@@ -663,6 +665,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/bind-chroot-admin
 
 %changelog
+* Tue Nov 20 2007 Adam Tkac <atkac redhat com> 32:9.5.0-18.2.a7
+- use system port selector instead ISC's (#391931)
+
 * Mon Nov 19 2007 Adam Tkac <atkac redhat com> 32:9.5.0-18.a7
 - removed statement from initscript which passes -D to named