!14 remove geoip dependency from bind

From: @eaglegai
Reviewed-by: @zengwefeng
Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot 2020-11-19 09:20:13 +08:00 committed by Gitee
commit 0f9b975f73

View File

@ -8,8 +8,6 @@
%bcond_without GSSTSIG %bcond_without GSSTSIG
%bcond_without PKCS11 %bcond_without PKCS11
%bcond_without EXPORT_LIBS %bcond_without EXPORT_LIBS
%bcond_with GEOIP
%bcond_without GEOIP2
%bcond_with TSAN %bcond_with TSAN
%{?!bind_uid: %global bind_uid 25} %{?!bind_uid: %global bind_uid 25}
@ -21,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: 2 Release: 3
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
@ -93,13 +91,6 @@ BuildRequires: lmdb-devel
BuildRequires: json-c-devel BuildRequires: json-c-devel
%endif %endif
%if %{with GEOIP}
BuildRequires: GeoIP-devel
%endif
%if %{with GEOIP2}
BuildRequires: libmaxminddb-devel
%endif
%if %{with DNSTAP} %if %{with DNSTAP}
BuildRequires: fstrm-devel protobuf-c-devel BuildRequires: fstrm-devel protobuf-c-devel
%endif %endif
@ -483,12 +474,6 @@ export LIBDIR_SUFFIXi=
%if %{with DNSTAP} %if %{with DNSTAP}
--enable-dnstap \ --enable-dnstap \
%endif %endif
%if %{with GEOIP}
--with-geoip \
%endif
%if %{with GEOIP2}
--with-geoip2 \
%endif
%if %{with UNITTEST} %if %{with UNITTEST}
--with-cmocka \ --with-cmocka \
%endif %endif
@ -1185,6 +1170,12 @@ rm -rf ${RPM_BUILD_ROOT}
%changelog %changelog
* Wed Nov 18 2020 gaihuiying <gaihuiying1@huawei.com> - 9.11.21-3
- Type:requirement
- ID:NA
- SUG:NA
- DESC:remove geoip dependency from bind
* Tue Sep 22 2020 lunankun <lunankun@huawei.com> - 9.11.21-2 * Tue Sep 22 2020 lunankun <lunankun@huawei.com> - 9.11.21-2
- Type:CVE - Type:CVE
- ID:CVE-2020-8622CVE-2020-8623 CVE-2020-8624 - ID:CVE-2020-8622CVE-2020-8623 CVE-2020-8624