!23 remove GeoIP and libdb dependency
From: @eaglegai Reviewed-by: @zengwefeng Signed-off-by: @zengwefeng
This commit is contained in:
openeuler-ci-bot
Gitee
commit
ff72424d98
51
bind.spec
51
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: 3
|
||||
Release: 4
|
||||
Epoch: 32
|
||||
Url: http://www.isc.org/products/BIND/
|
||||
Source0: https://ftp.isc.org/isc/bind9/9.11.21/bind-%{version}.tar.gz
|
||||
@ -63,10 +61,9 @@ Source35: named.root.key
|
||||
|
||||
BuildRequires: openssl-devel libtool autoconf pkgconfig libcap-devel python3-devel python3-ply docbook-style-xsl
|
||||
BuildRequires: libidn2-devel libxml2-devel make systemd selinux-policy findutils sed libxslt gdb
|
||||
BuildRequires: bind-libs bind-libs-lite bind-export-libs bind-pkcs11
|
||||
|
||||
%if %{with SDB}
|
||||
BuildRequires: openldap-devel libpq-devel sqlite-devel mariadb-connector-c-devel libdb-devel
|
||||
BuildRequires: openldap-devel libpq-devel sqlite-devel mariadb-connector-c-devel
|
||||
%endif
|
||||
|
||||
%if %{with UNITTEST}
|
||||
@ -93,13 +90,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
|
||||
@ -170,6 +160,7 @@ Patch191: CVE-2020-8622.patch
|
||||
Patch192: CVE-2020-8623.patch
|
||||
Patch193: CVE-2020-8624.patch
|
||||
Patch194: Fix_the_difference_at_the_macro_definition_using_clock_gettime_instead_of_gettimeofda.patch
|
||||
|
||||
# SDB patches
|
||||
Patch11: bind-9.3.2b2-sdbsrc.patch
|
||||
Patch12: bind-9.10-sdb.patch
|
||||
@ -467,7 +458,7 @@ export LIBDIR_SUFFIXi=
|
||||
%endif
|
||||
%if %{with SDB}
|
||||
--with-dlopen=yes --with-dlz-ldap=yes --with-dlz-postgres=yes \
|
||||
--with-dlz-mysql=yes --with-dlz-filesystem=yes --with-dlz-bdb=yes \
|
||||
--with-dlz-mysql=yes --with-dlz-filesystem=yes \
|
||||
%endif
|
||||
%if %{with GSSTSIG}
|
||||
--with-gssapi=yes --disable-isc-spnego \
|
||||
@ -483,12 +474,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
|
||||
@ -747,11 +732,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d
|
||||
install -m 644 %{SOURCE14} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/named.conf
|
||||
install -m 644 %{SOURCE22} ${RPM_BUILD_ROOT}%{_sysconfdir}/rwtab.d/named
|
||||
|
||||
cp -a %{_libdir}/%{_export_dir}/lib{dns,irs,isc,isccfg}-export.so.* %{buildroot}%{_libdir}/%{_export_dir}
|
||||
cp -a %{_libdir}/lib{dns,isc}-pkcs11.so.* %{buildroot}%{_libdir}
|
||||
cp -a %{_libdir}/lib{bind9,isccc,lwres,irs,isccfg}.so.160* %{buildroot}%{_libdir}
|
||||
cp -a %{_libdir}/lib{dns.so.1102*,isc.so.169*} %{buildroot}%{_libdir}
|
||||
|
||||
%pre
|
||||
if [ "$1" -eq 1 ]; then
|
||||
/usr/sbin/groupadd -g %{bind_gid} -f -r named >/dev/null 2>&1 || :;
|
||||
@ -941,26 +921,16 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%dir /run/named
|
||||
|
||||
%files libs
|
||||
%{_libdir}/libbind9.so.160*
|
||||
%{_libdir}/libisccc.so.160*
|
||||
%{_libdir}/liblwres.so.160*
|
||||
|
||||
%{_libdir}/libbind9.so.161*
|
||||
%{_libdir}/libisccc.so.161*
|
||||
%{_libdir}/liblwres.so.161*
|
||||
|
||||
%files libs-lite
|
||||
%{_libdir}/libdns.so.1102*
|
||||
%{_libdir}/libirs.so.160*
|
||||
%{_libdir}/libisc.so.169*
|
||||
%{_libdir}/libisccfg.so.160*
|
||||
|
||||
%{_libdir}/libdns.so.1110*
|
||||
%{_libdir}/libirs.so.161*
|
||||
%{_libdir}/libisc.so.1105*
|
||||
%{_libdir}/libisccfg.so.163*
|
||||
|
||||
|
||||
%files utils
|
||||
%{_bindir}/dig
|
||||
%{_bindir}/delv
|
||||
@ -1141,8 +1111,6 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%{_unitdir}/named-pkcs11.service
|
||||
%{_libexecdir}/setup-named-softhsm.sh
|
||||
%{_mandir}/man8/*pkcs11*.8*
|
||||
%{_libdir}/libdns-pkcs11.so.1102*
|
||||
%{_libdir}/libisc-pkcs11.so.169*
|
||||
|
||||
%files pkcs11-devel
|
||||
%{_libdir}/lib*-pkcs11.so
|
||||
@ -1161,11 +1129,6 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
%{_libdir}/%{_export_dir}/libisc-export.so.1105*
|
||||
%{_libdir}/%{_export_dir}/libisccfg-export.so.163*
|
||||
|
||||
%{_libdir}/%{_export_dir}/libdns-export.so.1102*
|
||||
%{_libdir}/%{_export_dir}/libirs-export.so.160*
|
||||
%{_libdir}/%{_export_dir}/libisc-export.so.169*
|
||||
%{_libdir}/%{_export_dir}/libisccfg-export.so.160*
|
||||
|
||||
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-export-%{_arch}.conf
|
||||
|
||||
%files export-devel
|
||||
@ -1185,6 +1148,12 @@ rm -rf ${RPM_BUILD_ROOT}
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jan 13 2021 gaihuiying <gaihuiying1@huawei.com> - 9.11.21-4
|
||||
- Type:requirement
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:remove GeoIP and libdb dependency
|
||||
|
||||
* Wed Dec 9 2020 hanzhijun <hanzhijun1@huawei.com> - 9.11.21-3
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user