bind97-rh699951.patch is no longer needed (different fix is in 9.9.0)

Signed-off-by: Adam Tkac <atkac@redhat.com>

2 files changed, 4 insertions, 49 deletions

diff --git a/bind.spec b/bind.spec
index b842ee6..a367bf4 100644
--- a/bind.spec
+++ b/bind.spec
@@ -22,7 +22,7 @@ Summary:  The Berkeley Internet Name Domain (BIND) DNS (Domain Name System) serv
 Name:     bind
 License:  ISC
 Version:  9.9.0
-Release:  2%{?dist}
+Release:  3%{?dist}
 Epoch:    32
 Url:      http://www.isc.org/products/BIND/
 Buildroot:%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -66,7 +66,6 @@ Patch109:bind97-rh478718.patch
 Patch110:bind97-rh570851.patch
 Patch111:bind97-exportlib.patch
 Patch112:bind97-rh645544.patch
-Patch118:bind97-rh699951.patch
 Patch119:bind97-rh693982.patch
 Patch121:bind97-rh714049.patch
 Patch123:bind98-rh735103.patch
@@ -293,7 +292,6 @@ mkdir m4
 %patch110 -p1 -b .rh570851
 %patch111 -p1 -b .exportlib
 %patch112 -p1 -b .rh645544
-%patch118 -p1 -b .rh699951
 %patch119 -p1 -b .rh693982
 %patch121 -p1 -b .rh714049
 %patch123 -p1 -b .rh735103
@@ -773,6 +771,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %endif
 
 %changelog
+* Thu Apr 12 2012 Adam Tkac <atkac redhat com> 32:9.9.0-3
+- bind97-rh699951.patch is no longer needed (different fix is in 9.9.0)
+
 * Mon Mar 26 2012 Adam Tkac <atkac redhat com> 32:9.9.0-2
 - remove unneeded bind99-v6only.patch
 
diff --git a/bind97-rh699951.patch b/bind97-rh699951.patch
deleted file mode 100644
index 77a807f..0000000
--- a/bind97-rh699951.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- bind-9.8.0-P4/lib/dns/request.c.test	2011-08-04 19:13:34.300999355 +0200
-+++ bind-9.8.0-P4/lib/dns/request.c	2011-08-04 19:37:40.347002723 +0200
-@@ -97,6 +97,7 @@ struct dns_request {
- 					   synchronously canceled */
- #define DNS_REQUEST_F_TIMEDOUT 0x0008	/*%< canceled due to a timeout */
- #define DNS_REQUEST_F_TCP 0x0010	/*%< This request used TCP */
-+#define DNS_REQUEST_F_RESPONSE 0x0020	/*%< We got response */
- #define DNS_REQUEST_CANCELED(r) \
- 	(((r)->flags & DNS_REQUEST_F_CANCELED) != 0)
- #define DNS_REQUEST_CONNECTING(r) \
-@@ -105,6 +106,8 @@ struct dns_request {
- 	(((r)->flags & DNS_REQUEST_F_SENDING) != 0)
- #define DNS_REQUEST_TIMEDOUT(r) \
- 	(((r)->flags & DNS_REQUEST_F_TIMEDOUT) != 0)
-+#define DNS_REQUEST_RESPONSE(r) \
-+	(((r)->flags & DNS_REQUEST_F_RESPONSE) != 0)
- 
- 
- /***
-@@ -1312,9 +1315,15 @@ req_senddone(isc_task_t *task, isc_event
- 
- 	if (DNS_REQUEST_CANCELED(request)) {
- 		/*
--		 * Send delayed event.
-+		 * Response can arrive before we proccess
-+		 * req_senddone which means we received cancellation
-+		 * request from req_response(). If we successfully
-+		 * fetched response, send success. Otherwise
-+		 * indicate failure.
- 		 */
--		if (DNS_REQUEST_TIMEDOUT(request))
-+		if (DNS_REQUEST_RESPONSE(request))
-+			send_if_done(request, ISC_R_SUCCESS);
-+		else if (DNS_REQUEST_TIMEDOUT(request))
- 			send_if_done(request, ISC_R_TIMEDOUT);
- 		else
- 			send_if_done(request, ISC_R_CANCELED);
-@@ -1367,6 +1376,8 @@ req_response(isc_task_t *task, isc_event
- 	/*
- 	 * Send completion event.
- 	 */
-+	if (result == ISC_R_SUCCESS)
-+		request->flags |= DNS_REQUEST_F_RESPONSE;
- 	send_if_done(request, result);
- 	UNLOCK(&request->requestmgr->locks[request->hash]);
- }