diff --git a/bind-9.18.0-1.alios7.src.rpm b/bind-9.18.0-1.alios7.src.rpm deleted file mode 100644 index 0010f3157e02be2d8bbadf9ec857b0500db88b47..0000000000000000000000000000000000000000 Binary files a/bind-9.18.0-1.alios7.src.rpm and /dev/null differ diff --git a/bind-9.18.0.tar.xz.asc b/bind-9.18.0.tar.xz.asc deleted file mode 100644 index 969ab06149bd94fe1ec33bdb49438b2dd8971528..0000000000000000000000000000000000000000 --- a/bind-9.18.0.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Comment: GPGTools - https://gpgtools.org - -iQIzBAABAgAdFiEEqtu6UHTxQC97adVrxbTukxqfnf0FAmHv4uYACgkQxbTukxqf -nf2CVxAA2RhW34umY+4RAjM7dqwmeOMprXtw69BFiK8UlMfwjLR+5YvEye3jDnGg -YhQ29O+jRzFixcv+1JPsieZ8zERAUTDtiD2YVn7UrPgosRU6ARgJk89qySWan28k -glIcbv9RT08qJCnjBoYIPIIyg7dECvCau684c/4tEv4fHSfO1T1P8+yOqA99Tgpy -dXnbPSoP/A7WtZpim/FiZ6e35UPE33rF9yY9BcMsgD4OxNLrjXWq9fcKMutkcfAX -D9Ou9TPRbz9ZshnxMr0Z6DN2U1HqzkbkH1vqGSfRJLpXbQTiUgkpDNUQWiT8puMO -U8Hvyu8F79cD/6XT15Vc/UcU4TfNbx7Esc4PbahlGrmNB6uz4PiXEvn3kJj2pWrv -GNIaPe5wutd7fd47N7Tuo6MtIftnh08PbEoDsKIPaLWn/KMeabgId8DciChClPe2 -/zM5S8o2PMVT/jL52s7vhaRFQGhGpoTZVCISxD7UHkVVY9WzJVnjKX3xB4fDFrvk -VyIopjoCZ1l+2CNewah/8FSwRmE3yViQNtM9FMoIkpKqEAD/21rHiz3aocHmsZdG -BqtT5+oWL0l5tdpsRUdYjMSZvsD/Qo7LMGXpfOoDx+CnqFMcCe03iYgEDeilHU0j -bWvoeSOhu1gHpKDH+BBRIo4GuB9j2DoO+bq+0XtiLH/QGJniCIA= -=eVhd ------END PGP SIGNATURE----- diff --git a/bind-9.18.0.tar.xz b/bind-9.18.6.tar.xz similarity index 41% rename from bind-9.18.0.tar.xz rename to bind-9.18.6.tar.xz index 98dcf3f3ab2b781b7698cba1707c439218c9baa9..5c82c4bdffa2d3d79ed50e2aa7d9c6a2cbdc8260 100644 Binary files a/bind-9.18.0.tar.xz and b/bind-9.18.6.tar.xz differ diff --git a/bind-9.18.6.tar.xz.asc b/bind-9.18.6.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..33204c18a690a8633b407bd63afec31046d456c4 --- /dev/null +++ b/bind-9.18.6.tar.xz.asc @@ -0,0 +1,16 @@ +-----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 282e9c1f11e48a49af203252dd2869cbf48754a8..c604a5ebd714d2f5b033790e2038cf3a3139041f 100644 --- a/bind.spec +++ b/bind.spec @@ -1,3 +1,4 @@ +%define anolis_release 1 # bcond_without is built by default, unless --without X is passed # bcond_with is built only when --with X is passed to build %bcond_with SYSTEMTEST @@ -26,11 +27,10 @@ %define bind_export_libs isc dns isccfg irs %{!?_export_dir:%global _export_dir /bind9-export/} %undefine _strict_symbol_defs_build -%define anolis_release 1 Name: bind License: MPLv2.0 -Version: 9.18.0 +Version: 9.18.6 Release: %{anolis_release}%{?dist} Epoch: 32 Url: https://www.isc.org/downloads/bind/ @@ -69,7 +69,7 @@ Requires(pre): shadow-utils Requires(post): shadow-utils Requires(post): glibc-common Requires(post): grep -Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: bind-libs = %{epoch}:%{version}-%{release} # This wild require should satisfy %%selinux_set_boolean macro only # in case it needs to be used Requires(post): ((policycoreutils-python-utils and libselinux-utils) if (selinux-policy-targeted or selinux-policy-mls)) @@ -153,7 +153,7 @@ Contains license of the BIND DNS suite. %package utils Summary: Utilities for querying DNS name servers -Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: bind-libs = %{epoch}:%{version}-%{release} # For compatibility with Debian package Provides: dnsutils = %{epoch}:%{version}-%{release} @@ -169,10 +169,8 @@ servers. %package dnssec-utils Summary: DNSSEC keys and zones management utilities -Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release} +Requires: bind-libs = %{epoch}:%{version}-%{release} Recommends: bind-utils -# TODO: suport python3-bind -#Requires: python3-bind = %{epoch}:%{version}-%{release} Requires: bind-dnssec-doc = %{epoch}:%{version}-%{release} %description dnssec-utils @@ -195,23 +193,23 @@ Bind-dnssec-doc contains manual pages for bind-dnssec-utils. Summary: Header files and libraries needed for bind-dyndb-ldap Provides: bind-lite-devel = %{epoch}:%{version}-%{release} Obsoletes: bind-lite-devel < 32:9.16.6-3 -Requires: bind-libs%{?_isa} = %{epoch}:%{version}-%{release} -Requires: openssl-devel%{?_isa} libxml2-devel%{?_isa} -Requires: libcap-devel%{?_isa} +Requires: bind-libs = %{epoch}:%{version}-%{release} +Requires: openssl-devel libxml2-devel +Requires: libcap-devel %if %{with GSSTSIG} -Requires: krb5-devel%{?_isa} +Requires: krb5-devel %endif %if %{with LMDB} -Requires: lmdb-devel%{?_isa} +Requires: lmdb-devel %endif %if %{with JSON} -Requires: json-c-devel%{?_isa} +Requires: json-c-devel %endif %if %{with DNSTAP} -Requires: fstrm-devel%{?_isa} protobuf-c-devel%{?_isa} +Requires: fstrm-devel protobuf-c-devel %endif %if %{with GEOIP2} -Requires: libmaxminddb-devel%{?_isa} +Requires: libmaxminddb-devel %endif %description devel @@ -224,7 +222,7 @@ Summary: A chroot runtime environment for the ISC BIND DNS server, named( Prefix: %{chroot_prefix} # grep is required due to setup-named-chroot.sh script Requires: grep -Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} +Requires: bind = %{epoch}:%{version}-%{release} %description chroot This package contains a tree of files which can be used as a @@ -235,21 +233,21 @@ Based on the code from Jan "Yenya" Kasprzak %if %{with DLZ} %package dlz-filesystem Summary: BIND server filesystem DLZ module -Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} +Requires: bind = %{epoch}:%{version}-%{release} %description dlz-filesystem Dynamic Loadable Zones filesystem module for BIND server. %package dlz-ldap Summary: BIND server ldap DLZ module -Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} +Requires: bind = %{epoch}:%{version}-%{release} %description dlz-ldap Dynamic Loadable Zones LDAP module for BIND server. %package dlz-mysql Summary: BIND server mysql and mysqldyn DLZ modules -Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} +Requires: bind = %{epoch}:%{version}-%{release} Provides: %{name}-dlz-mysqldyn = %{epoch}:%{version}-%{release} Obsoletes: %{name}-dlz-mysqldyn < 32:9.16.6-3 @@ -257,28 +255,9 @@ Obsoletes: %{name}-dlz-mysqldyn < 32:9.16.6-3 Dynamic Loadable Zones MySQL module for BIND server. Contains also mysqldyn module with dynamic DNS updates (DDNS) support. -# TODO: suport dlz-sqlite3 -#%package dlz-sqlite3 -#Summary: BIND server sqlite3 DLZ module -#Requires: bind%{?_isa} = %{epoch}:%{version}-%{release} -# -#%description dlz-sqlite3 -#Dynamic Loadable Zones sqlite3 module for BIND server. %endif -# TODO: suport python3-bind -#%package -n python3-bind -#Summary: A module allowing rndc commands to be sent from Python programs -#Requires: bind-license = %{epoch}:%{version}-%{release} -#Requires: python3 python3-ply %{?py3_dist:%py3_dist ply} -#BuildArch: noarch -#%{?python_provide:%python_provide python3-bind} -#%{?python_provide:%python_provide python3-isc} -# -#%description -n python3-bind -#This package provides a module which allows commands to be sent to rndc directly from Python programs. - %if %{with DOC} %package doc Summary: BIND 9 Administrator Reference Manual @@ -299,8 +278,7 @@ in HTML and PDF format. %endif %prep -# not suport gpgverify for now -#%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE0}' +%{gpgverify} --keyring='%{SOURCE4}' --signature='%{SOURCE2}' --data='%{SOURCE0}' %setup -q %build @@ -856,15 +834,8 @@ fi; %{_libdir}/{named,bind}/dlz_ldap_dynamic.so %doc contrib/dlz/modules/ldap/testing/* -#%files dlz-sqlite3 -#%{_libdir}/{named,bind}/dlz_sqlite3_dynamic.so -#%doc contrib/dlz/modules/sqlite3/testing/* %endif -#%files -n python3-bind -#%{python3_sitelib}/*.egg-info -#%{python3_sitelib}/isc/ - %if %{with DOC} %files doc %dir %{_pkgdocdir} @@ -876,5 +847,8 @@ fi; %endif %changelog +* Mon Aug 29 2022 Chunmei Xu - 32:9.18.6-1 +- update to 9.18.6 + * Wed Mar 09 2022 DengXiewei - 32:9.18.0-1 - Init from upstream 9.18.0