From 1c119b120f79d1af7e6d07ed30e9a6f9114361b7 Mon Sep 17 00:00:00 2001
From: jiangheng <jiangheng14@huawei.com>
Date: Fri, 2 Sep 2022 14:12:49 +0800
Subject: [PATCH] remove GeoIP dependency remove obsolete patch

---
 bind.spec                   | 26 ++++++++------------------
 bugfix-nslookup-norec.patch | 19 -------------------
 2 files changed, 8 insertions(+), 37 deletions(-)
 delete mode 100644 bugfix-nslookup-norec.patch

diff --git a/bind.spec b/bind.spec
index 65cb878..4dced61 100644
--- a/bind.spec
+++ b/bind.spec
@@ -8,8 +8,6 @@
 %bcond_without  GSSTSIG
 %bcond_without  PKCS11
 %bcond_without  EXPORT_LIBS
-%bcond_with     GEOIP
-%bcond_without  GEOIP2
 %bcond_with     TSAN
 
 %{?!bind_uid:   %global bind_uid  25}
@@ -21,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
@@ -93,13 +91,6 @@ BuildRequires:  lmdb-devel
 BuildRequires:  json-c-devel
 %endif
 
-%if %{with GEOIP}
-BuildRequires:  GeoIP-devel
-%endif
-%if %{with GEOIP2}
-BuildRequires:  libmaxminddb-devel
-%endif
-
 %if %{with DNSTAP}
 BuildRequires:  fstrm-devel protobuf-c-devel
 %endif
@@ -159,7 +150,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
@@ -368,7 +358,6 @@ are used for building ISC DHCP.
 %patch183 -p1 -b .rh1736762-5
 
 %patch184 -p1
-%patch185 -p1
 %patch186 -p1
 %patch187 -p1
 %patch188 -p1
@@ -494,12 +483,6 @@ export LIBDIR_SUFFIXi=
 %if %{with DNSTAP}
     --enable-dnstap \
 %endif
-%if %{with GEOIP}
-    --with-geoip \
-%endif
-%if %{with GEOIP2}
-    --with-geoip2 \
-%endif
 %if %{with UNITTEST}
     --with-cmocka \
 %endif
@@ -1177,6 +1160,13 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
+* Fri Sep 02 2022 jiangheng <jiangheng12@huawei.com> - 32:9.11.21-12
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:remove GeoIP dependency
+       remove obsolete patch
+
 * Wed Apr 20 2022 jiangheng <jiangheng12@huawei.com> - 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 a67899a..0000000
--- 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);
-- 
Gitee