packages/bind
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove obsolete patch

Browse Source
This commit is contained in:
jiangheng 2022-09-02 14:52:31 +08:00
parent 36203bf651
commit 02d1ddc05e
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bind.spec
View File

@ -19,7 +19,7 @@ Name: bind
Summary: Domain Name System (DNS) Server (named) Summary: Domain Name System (DNS) Server (named)
License: MPLv2.0 License: MPLv2.0
Version: 9.11.21 Version: 9.11.21
Release: 11 Release: 12
Epoch: 32 Epoch: 32
Url: http://www.isc.org/products/BIND/ Url: http://www.isc.org/products/BIND/
Source0: https://ftp.isc.org/isc/bind9/9.11.21/bind-%{version}.tar.gz 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 Patch183: bind-9.11-rh1736762-5.patch
Patch184: feature-bind99-euler-range-port.patch Patch184: feature-bind99-euler-range-port.patch
Patch185: bugfix-nslookup-norec.patch
Patch186: bugfix-named-log-time.patch Patch186: bugfix-named-log-time.patch
Patch187: dnssec-checkds-s.patch Patch187: dnssec-checkds-s.patch
Patch188: do-not-treat-a-referral-with-a-non-empty-ANSWER-sect.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 %patch183 -p1 -b .rh1736762-5
%patch184 -p1 %patch184 -p1
%patch185 -p1
%patch186 -p1 %patch186 -p1
%patch187 -p1 %patch187 -p1
%patch188 -p1 %patch188 -p1
@ -1158,6 +1156,12 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog %changelog
* Fri Sep 02 2022 jiangheng <jiangheng12@huawei.com> - 32:9.11.21-12
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:remove obsolete patch
* Wed Apr 20 2022 jiangheng <jiangheng12@huawei.com> - 9.11.21-11 * Wed Apr 20 2022 jiangheng <jiangheng12@huawei.com> - 9.11.21-11
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA

19
bugfix-nslookup-norec.patch
View File

@ -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);