diff --git a/bind.spec b/bind.spec index 9885e4886f2297d619b4f3fe437b0c87a5f8d768..db59371599b50085a6664aaa50b307ce30cec174 100644 --- a/bind.spec +++ b/bind.spec @@ -19,7 +19,7 @@ Name: bind Summary: Domain Name System (DNS) Server (named) License: MPLv2.0 Version: 9.11.21 -Release: 11 +Release: 12 Epoch: 32 Url: http://www.isc.org/products/BIND/ Source0: https://ftp.isc.org/isc/bind9/9.11.21/bind-%{version}.tar.gz @@ -149,7 +149,6 @@ Patch178: bind-9.11-serve-stale-dbfix.patch Patch183: bind-9.11-rh1736762-5.patch Patch184: feature-bind99-euler-range-port.patch -Patch185: bugfix-nslookup-norec.patch Patch186: bugfix-named-log-time.patch Patch187: dnssec-checkds-s.patch Patch188: do-not-treat-a-referral-with-a-non-empty-ANSWER-sect.patch @@ -358,7 +357,6 @@ are used for building ISC DHCP. %patch183 -p1 -b .rh1736762-5 %patch184 -p1 -%patch185 -p1 %patch186 -p1 %patch187 -p1 %patch188 -p1 @@ -1158,6 +1156,12 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Sep 02 2022 jiangheng - 32:9.11.21-12 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove obsolete patch + * Wed Apr 20 2022 jiangheng - 9.11.21-11 - Type:bugfix - ID:NA diff --git a/bugfix-nslookup-norec.patch b/bugfix-nslookup-norec.patch deleted file mode 100644 index a67899ad2437e7a87b92e7af96ae3656c9b0a89a..0000000000000000000000000000000000000000 --- a/bugfix-nslookup-norec.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c ---- a/bin/dig/dighost.c.orig 2011-03-11 07:46:58.000000000 +0100 -+++ b/bin/dig/dighost.c 2011-10-28 14:31:29.806591603 +0200 -@@ -3291,8 +3291,13 @@ - } else { - if (!l->ns_search_only) { - fputs(l->cmdline, stdout); -- printf(";; connection timed out; no servers could be " -- "reached\n"); -+ if (!next_origin(ISC_LIST_HEAD(l->q))) { -+ printf(";; connection timed out; no servers could be " -+ "reached\n"); -+ } else { -+ printf(";; connection timed out; trying next " -+ "origin\n"); -+ } - } - cancel_lookup(l); - check_next_lookup(l);