diff --git a/Bv9ARM.pdf b/Bv9ARM.pdf new file mode 100644 index 0000000000000000000000000000000000000000..5fbf90ca8c4f162e38285d8c0f44969574fb3910 Binary files /dev/null and b/Bv9ARM.pdf differ diff --git a/bind-9.18.6.tar.xz b/bind-9.18.10.tar.xz similarity index 41% rename from bind-9.18.6.tar.xz rename to bind-9.18.10.tar.xz index 5c82c4bdffa2d3d79ed50e2aa7d9c6a2cbdc8260..776012d7a8d4cceeecd8973b69ca6078b42a79e8 100644 Binary files a/bind-9.18.6.tar.xz and b/bind-9.18.10.tar.xz differ diff --git a/bind-9.18.10.tar.xz.asc b/bind-9.18.10.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..c54e4009acb2eb055598b5be85a821d56f9cf1c2 --- /dev/null +++ b/bind-9.18.10.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEcGtsKGIOdvkdEfffUQpkKgbFLOwFAmOZ4M0ACgkQUQpkKgbF +LOwUrA//Yet847AmjM2VsXH7bD4dv/GSsJ6P1CgIqfl2g/U1IpKjARW4kvvBIhNA +W7nio8T8fL8grZKdBtBhN8VdPnmi9j+XxTaXdESXb3eBRHcxgjOkk5cM9DW2sTIn +9oyZwaDJOPjZhxdt0s/w2oZvXU1G4PGde82QrIPs6APn3MAD7v/5Js+BUMF9iMkz +eoWGkfV8VHReUqW4670pwkPZ1XuWfjegg01eXdk+hcHbTsWaN8fvgl/PZFsQ4uvM +Y2NqfGG1y1wtnuN4Hbq6Z/CcKsz2axWDyEJctT7durAQWk39OiFU4DFAtOe35imG +mXAgKjDZGF5SvW/qinDpBlkM7O0OJ3PWqBOiNooMUBoYmPDXjd7VSgh9WFyXvxLx +bW6njldrCyzTOB+UsLMMGBxxO6JkC/8nMetA255XXBT0d4f+bLWhoHonkPONVHrT +2NZeZpbrPP6lnxsLHA83Zt2Xao4ipSHwmQMELfw66zQDYbjrEI0pLhYynB9KTIt0 +mmynw3Ydp8/Kkl5An1ut61INKiUkxqzQ931AVes45gXTER2viwOLK0OVtibdyxG0 +laHezMzfSr44FrFaR3XIzOsyNSsvuA8D02M3crIC1nrROdRveaA+J6l6BshgUip9 +PQP0+mSI/WacgRR4QYYgEBaqG+2kgk4fF3aGwnHkKPj8zu58Skk= +=CJ18 +-----END PGP SIGNATURE----- diff --git a/bind-9.18.6.tar.xz.asc b/bind-9.18.6.tar.xz.asc deleted file mode 100644 index 33204c18a690a8633b407bd63afec31046d456c4..0000000000000000000000000000000000000000 --- a/bind-9.18.6.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABAgAdFiEE4l6wzxzoBJ1H8dmmM+EOShg6jkYFAmL0AksACgkQM+EOShg6 -jkaHQg//dwZKPXWGUi6GEnV6007Xa3t22BuO8+DOQGYKVcBV4BESi0rKx+prFKT6 -UU6nsGirLq/+P8zKqndqW6fi/UciXMnPMxBxziSP8LmCyVhoyHCVAx7mYjqsVUog -tK4DY6n963mHgsdKzS7NCLh8BbmQNrCR2vtklYkxGbrbwOa93/ojDH49srXKuWpR -UwFn2P4CVgHsSYh7UopqOKZ2tZXmiuqyPhszjbW9YyLEELb0LeblZ1nvRHkSnZXc -NXunBVqCRXMFNpba6aOI/K016s7QRgWvXEiMfDN1JRBFN39s2VbAX5fa1pS84WC9 -ICUK9JoF7ZAdr+ua19Ez/S7r+juYgUhgqmcv4lp9VhhqdkhywcBpBSavKOvKrS0s -lW66GjGUVb6G0ohci2ko/RHEUqNhSnEgteB5iFB2wxy6RSqfhVkLfZgeFNT/6uzo -4327cVLDdSRe5DRt8EfrTwEmI4x5xMa5H/jaMKUVFHxj4Y3ee1j333naO3Ki3UhH -wgT5YQ6SXpRWSgAk+J5z+L30qGGwn5f7tDmrzD0VOgsBObrFn4CcHrWpWWEDtR1h -EJ4jUYA21m4dbnt5fygeCnZ3UoL3t5S6sgPdR31SWvfKHUs4jYlepFwyfcpZaS9V -r/5rnAvHm3fRqYN/jS02hCjjO6vwlLTTzgtxvwyhDoI1WMmeh0I= -=oozj ------END PGP SIGNATURE----- diff --git a/bind.spec b/bind.spec index c604a5ebd714d2f5b033790e2038cf3a3139041f..dcb8d530ccb802d996221dcb42c7df0705139de8 100644 --- a/bind.spec +++ b/bind.spec @@ -10,7 +10,7 @@ %bcond_without DNSTAP %bcond_without LMDB %bcond_without DOC -%bcond_without DOCPDF +%bcond_with DOCPDF %bcond_with TSAN %{?!bind_uid: %global bind_uid 25} @@ -30,7 +30,7 @@ Name: bind License: MPLv2.0 -Version: 9.18.6 +Version: 9.18.10 Release: %{anolis_release}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ @@ -41,6 +41,7 @@ Source1: named.sysconfig Source2: https://downloads.isc.org/isc/bind9/%{version}/bind-%{version}.tar.xz.asc Source3: named.logrotate Source4: https://downloads.isc.org/isc/pgpkeys/codesign2021.txt +Source5: https://downloads.isc.org/isc/bind9/%{version}/doc/arm/Bv9ARM.pdf Source16: named.conf # Refresh by command: dig @a.root-servers.net. +tcp +norec # or from URL @@ -84,6 +85,7 @@ BuildRequires: python3-devel BuildRequires: python3-ply BuildRequires: findutils sed BuildRequires: libnghttp2-devel +BuildRequires: jemalloc-devel BuildRequires: gnupg2 BuildRequires: libuv-devel @@ -278,8 +280,7 @@ in HTML and PDF format. %endif %prep -%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE0}' -%setup -q +%autosetup -p1 %build @@ -485,9 +486,6 @@ install -m 644 %{SOURCE49} ${RPM_BUILD_ROOT}%{_sysconfdir}/named-chroot.files # Install isc/errno2result.h header install -m 644 lib/isc/errno2result.h ${RPM_BUILD_ROOT}%{_includedir}/bind9/isc -# Remove libtool .la files: -find ${RPM_BUILD_ROOT}/%{_libdir} -name '*.la' -exec '/bin/rm' '-f' '{}' ';'; - # 9.18.0 installs even manual pages for tools not generated %if %{without DNSTAP} rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/dnstap-read.1* || true @@ -497,8 +495,7 @@ rm -f ${RPM_BUILD_ROOT}%{_mandir}/man8/named-nzd2nzf.8* || true %endif pushd ${RPM_BUILD_ROOT}%{_mandir}/man8 -ln -s ddns-confgen.8.gz tsig-keygen.8.gz -ln -s named-checkzone.8.gz named-compilezone.8.gz +ln -s named-checkzone.8 named-compilezone.8 popd %if %{with DOC} @@ -520,6 +517,8 @@ done %endif %if %{with DOCPDF} cp -a build/doc/arm/_build/latex/Bv9ARM.pdf ${RPM_BUILD_ROOT}%{_pkgdocdir} +%else +cp %{SOURCE5} ${RPM_BUILD_ROOT}%{_pkgdocdir} %endif # Ghost config files: @@ -682,8 +681,8 @@ fi; %{_mandir}/man8/rndc.8* %{_mandir}/man8/named.8* %{_mandir}/man8/rndc-confgen.8* -%{_mandir}/man8/filter-a.8.gz -%{_mandir}/man8/filter-aaaa.8.gz +%{_mandir}/man8/filter-a.8.* +%{_mandir}/man8/filter-aaaa.8.* %doc CHANGES named.conf.default %doc sample/ @@ -723,7 +722,6 @@ fi; %{_libdir}/bind/*.so %files license -%{!?_licensedir:%global license %%doc} %license COPYRIGHT %files utils @@ -842,11 +840,13 @@ fi; %doc %{_pkgdocdir}/Bv9ARM.html %doc %{_pkgdocdir}/html %endif -%if %{with DOCPDF} %doc %{_pkgdocdir}/Bv9ARM.pdf -%endif %changelog +* Thu Dec 29 2022 Funda Wang - 32:9.18.10-1 +- New version 9.18.10 +- Do not build doc pdf as it imports too many build requires + * Mon Aug 29 2022 Chunmei Xu - 32:9.18.6-1 - update to 9.18.6