diff --git a/bind.spec b/bind.spec index 237c90bab7d10adc8371538244546b5e27fbefc7..304692651f03ee68e2f7da6940ceb15565f77041 100644 --- a/bind.spec +++ b/bind.spec @@ -4,7 +4,7 @@ %bcond_with DLZ %bcond_with SYSTEMTEST %bcond_without UNITTEST -%bcond_without SDB +%bcond_with SDB %bcond_without GSSTSIG %bcond_without PKCS11 %bcond_without EXPORT_LIBS @@ -21,7 +21,7 @@ Name: bind Summary: Domain Name System (DNS) Server (named) License: MPLv2.0 Version: 9.11.21 -Release: 6 +Release: 7 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 +63,10 @@ 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 +BuildRequires: chrpath %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} @@ -474,7 +474,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 \ @@ -509,7 +509,7 @@ export LIBDIR_SUFFIXi= popd %endif -make -j32 +%make_build cp -rv doc/* ../doc/ pushd bin/dig @@ -560,7 +560,8 @@ for lib in isc dns isccfg irs; do -i isc-export-config.sh done -make -j32 +%make_build + popd %unit_prepare_build export-libs @@ -754,10 +755,7 @@ 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} +chrpath -d %{buildroot}/%{_libdir}/bind9-export/*.so* %pre if [ "$1" -eq 1 ]; then @@ -948,20 +946,11 @@ 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* @@ -1032,9 +1021,6 @@ rm -rf ${RPM_BUILD_ROOT} %{_mandir}/man1/ldap2zone.1* %{_mandir}/man1/zonetodb.1* %{_mandir}/man1/zone2sqlite.1* -%{_mandir}/man1/isc-config.sh.1* -%{_mandir}/man1/bind9-config.1* -%{_mandir}/man3/lwres* %{_mandir}/man8/named-sdb.8* %endif #end SDB @@ -1062,6 +1048,9 @@ rm -rf ${RPM_BUILD_ROOT} %{_includedir}/bind9/isccfg %{_bindir}/isc-config.sh %{_bindir}/bind9-config +%{_mandir}/man1/isc-config.sh.1* +%{_mandir}/man1/bind9-config.1* +%{_mandir}/man3/lwres* %files chroot %config(noreplace) %{_sysconfdir}/named-chroot.files @@ -1148,8 +1137,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 @@ -1168,11 +1155,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 @@ -1192,6 +1174,12 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed May 26 2021 jiangheng - 9.11.21-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove unnecessary dependencies + * Wed May 26 2021 jiangheng - 9.11.21-6 - Type:CVE - ID:NA