Accepting request 952940 from home:jmoellers:branches:network

Tested on Tumbleweed and SLE-15-SP4

OBS-URL: https://build.opensuse.org/request/show/952940
OBS-URL: https://build.opensuse.org/package/show/network/bind?expand=0&rev=336

bind-9.16.25.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9fa328850f82843ef8b7bf1ff5322cb68b110273a33f375ba41f35270f5e1ff3
-size 5086780

bind-9.16.25.tar.xz.sha512.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Comment: GPGTools - https://gpgtools.org
-
-iQIzBAABCgAdFiEEqtu6UHTxQC97adVrxbTukxqfnf0FAmHnQzwACgkQxbTukxqf
-nf36OhAAyjIh6tcuDauRQQFfuyBIPHBCDybidjUxE5NsjMfd9EKR6QOp2rICgtJz
-4i/+UxQm0e6B1VmogdDddH5YL4NNk9aiNbeBXCeSVicA8jRwAI44lL5iVSSlBK+f
-4nQ1rWwlSoV7AkE1oDrTIxfz5wPm1gyG4FBxqrTxxsrqrKsrxKZbHjAqEUeBuEEz
-/MqfAkDpvV+JWSFbwp2f8igH/cHx06MCsUkWLuZPWiT3k1g+9lqgfcigcNN3yqoK
-tQQwnozLUwjRJt0t4dl99frb93KKkX4IMqk7Pevue2kEWx0yo1GbPLmPiOdrUeK3
-nFMgMopwAvPzla56RKf4gLpHerHR+YNWWFHoju71teg7/6b++LZEWMQ+7stP1wCj
-B9COURDClp/4Z7j7GuYgE8jVSvpemuHqlkHZyF/94EA1yY1d4fA0ViCsZVrRBfaj
-7QFaKDBl4Qj/5eY1DcP9QZ4t7z83ugSBqgVp5DxJgIqC+ZFPkQSPAy5AxHUILlqX
-/XRyLbRDSSp0ZJjt6G+aJ2C2nRKykrp4QcnVlfRo4AWEBfZ2hC5Q8DRP4nQdAVno
-2wSCDUt4TSXIJZp848PmbfcQccYEB9H5DBbR865nic8hmcT+CniflASwqATqL5PB
-1+RdrwKO1/K0VVrNhmtwswF8JvSMZktWlicqezdLhhQz8Bzdrbc=
-=phwZ
------END PGP SIGNATURE-----

bind-9.18.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56525bf5caf01fd8fd9d90910880cc0f8a90a27a97d169187d651d4ecf0c411c
+size 5292320

bind-9.18.0.tar.xz.sha512.asc

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Comment: GPGTools - https://gpgtools.org
+
+iQIzBAABCgAdFiEEqtu6UHTxQC97adVrxbTukxqfnf0FAmHv4ucACgkQxbTukxqf
+nf133g//c/DzUcbtmssrr13B2vPO0LKa/iGolgUqx5F8jdG6L6j68z9zxAGqGYe3
+FzWgkWfh1oHfdEjgu5ta7Orz3j+KnaAuZhGBCzYlSIGNcOjlopuQdZwFPpQKkT9n
+Ww/66FMN3QIWN9N7a7Ru6zBl0RwaYrIlmKY6tHIGUsjnXM9tUjxdz0YEhIfMkG6i
+HROIJxOhKqAu6Ty5VBHXs/Pede3wLik5dMGJoQ/hZC/vOXF5fjfUiy82HLIKYy+g
+2rkBFpUf32Oir3Aei2rJavaHOrtr5DX9F9pTtbW2Ga6XTPB6cEf1IkFPtMHtJswV
+NPZqCthQujyYknjDo7cZU25uUfmh4c6G9fPu4Xr9j4OVUC+1cdpNBzxf2SQ+PHGf
+Vq3WneoPSA5XfJ2M/5ebX+vFSbwQ2kmawee8g4OruZi8kAFx5ejhwm4LZTqe/tna
+Padejt1UE3YVhB5DyoZxMO55KU3W66ah6xhDJnoCFAXriAWO1dsL1AvI9kAtkrWT
+UJ3wFGGIqQAJO3wtvT3OC0LvaoF1Dv8riQfDVQ3UAFSdib919iGUK5uk9kadDccq
+hcVO4dDn/txM9ffZpUEdvy1wofLhDyVSZSknzuqmpoLVPYhzLAEztF6Y6TowXz7S
+yFjFtEgYrwnjPd1zPD9SusoptzxPrctz4gsHzkE3Gn6SBH07uBM=
+=gmx/
+-----END PGP SIGNATURE-----

bind-avoid-fallthrough-warning-error.patch

@@ -1,26 +0,0 @@
-Index: bind-9.16.23/contrib/dlz/drivers/dlz_ldap_driver.c
-===================================================================
---- bind-9.16.23.orig/contrib/dlz/drivers/dlz_ldap_driver.c
-+++ bind-9.16.23/contrib/dlz/drivers/dlz_ldap_driver.c
-@@ -978,11 +978,13 @@ dlz_ldap_create(const char *dlzname, uns
- 		if (result != ISC_R_SUCCESS) {
- 			return (result);
- 		}
-+		/* FALLTHROUGH */
- 	case 11:
- 		result = dlz_ldap_checkURL(argv[10], 3, "all nodes");
- 		if (result != ISC_R_SUCCESS) {
- 			return (result);
- 		}
-+		/* FALLTHROUGH */
- 	case 10:
- 		if (strlen(argv[9]) > 0) {
- 			result = dlz_ldap_checkURL(argv[9], 3, "authority");
-@@ -990,6 +992,7 @@ dlz_ldap_create(const char *dlzname, uns
- 				return (result);
- 			}
- 		}
-+		/* FALLTHROUGH */
- 	case 9:
- 		result = dlz_ldap_checkURL(argv[8], 3, "lookup");
- 		if (result != ISC_R_SUCCESS) {

bind-define-missing-threads.patch

@@ -0,0 +1,10 @@
+--- bind-9.18.0.orig/contrib/dlz/modules/include/dlz_pthread.h	2022-01-24 09:28:57.521507091 +0100
++++ bind-9.18.0/contrib/dlz/modules/include/dlz_pthread.h	2022-02-08 12:19:14.177179130 +0100
+@@ -18,6 +18,7 @@
+ 
+ #pragma once
+ 
++# define PTHREADS 1
+ #include <pthread.h>
+ #define dlz_mutex_t	  pthread_mutex_t
+ #define dlz_mutex_init	  pthread_mutex_init

bind.changes

@@ -1,3 +1,55 @@
+-------------------------------------------------------------------
+Mon Jan 31 13:49:51 UTC 2022 - Josef Möllers <josef.moellers@suse.com>
+
+- Update to new MAJOR VERSION 9.18.0.
+  This has many enhnancements, bug fixes and changes.
+  The spec file also has mechanisms to run the integrated test suite.
+
+  MAJOR CHANGES:
+  * Support for securing DNS traffic using Transport Layer Security (TLS).
+    TLS is used by both DNS-over-TLS (DoT) and DNS-over-HTTPS (DoH).
+  * Support for zone transfers over TLS (XFR-over-TLS, XoT) for both
+    incoming and outgoing zone transfers.
+  * The dig tool is now able to send DoT queries (+tls option).
+  * Support for OpenSSL 3.0 APIs was added. 
+
+  A number of utilities have been removed: dnssec-checkds,
+  dnssec-coverage, dnssec-keymgr, which have been deprecated in
+  favor of dnssec-policy feature, as well as python support
+  (package python3-bind). 
+  A number of utilities have been moved from (/usr)/sbin to (/usr)/bin
+  The DLZ modules have been put into seperate sub-packages
+  to keep unwanted dependencies out of the main package:
+  * bind-modules-perl: dlz_perl_driver.so
+  * bind-modules-mysql: dlz_mysql_dynamic.so, dlz_mysqldyn_mod.so
+  * bind-modules-ldap: dlz_ldap_dynamic.so
+  * bind-modules-bdbhpt: dlz_bdbhpt_dynamic.so
+  * bind-modules-sqlite3: dlz_sqlite3_dynamic.so
+  * bind-modules-generic: dlz_filesystem_dynamic.so, dlz_wildcard_dynamic.so
+  For a complete list of changes, see
+  * Bind Release Notes
+    https://downloads.isc.org/isc/bind9/9.18.0/doc/arm/html/notes.html
+  * The CHANGES file in the source RPM
+  [bind.spec, bind-9.18.0.tar.xz, bind-9.18.0.tar.xz.sha512.asc,
+   bind-avoid-fallthrough-warning-error.patch,
+   bind-contrib-pthread.patch, named-bootconf.diff]
+
+-------------------------------------------------------------------
+Mon Jan 24 13:18:35 UTC 2022 - Josef Möllers <josef.moellers@suse.com>
+
+- Old-style DLZ drivers have been deprecated in favor of
+  DLZ modules. The DLZ drivers configuration option will
+  be removed from the next major BIND 9 release.
+
+  The option to use the DLZ modules is already available
+  in BIND 9; please see the ARM section on DLZ modules.
+
+  The dynamically lodable driver modules are stored in
+  /usr/lib64/bind-plugins
+  Example configurations for ldap and mysql are provided in
+  named.conf.
+  [bind.spec, vendor-files/config/named.conf]
+
 -------------------------------------------------------------------
 Fri Jan 21 16:24:16 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>
 

bind.spec

@@ -17,6 +17,16 @@
 
 
 %define _buildshell /bin/bash
+%bcond_with check
+
+# DLZ modules
+%bcond_without modules_bdbhpt
+%bcond_without modules_ldap
+%bcond_without modules_mysql
+%bcond_without modules_sqlite3
+%bcond_without modules_perl
+%bcond_without modules_generic
+# end DLZ modules
 
 %define	VENDOR SUSE
 %if 0%{?suse_version} >= 1500
@@ -46,7 +56,7 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           bind
-Version:        9.16.25
+Version:        9.18.0
 Release:        0
 Summary:        Domain Name System (DNS) Server (named)
 License:        MPL-2.0
@@ -64,24 +74,24 @@ Source60:       dlz-schema.txt
 Source70:       bind.conf
 # configuation file for systemd-sysusers
 Source72:       named.conf
-Patch52:        named-bootconf.diff
 Patch56:        bind-ldapdump-use-valid-host.patch
-Patch57:        bind-avoid-fallthrough-warning-error.patch
+# Fix typos in the source code (that will be fixed in th next minor release)
+Patch57:        bind-define-missing-threads.patch
 BuildRequires:  libcap-devel
-BuildRequires:  libmysqlclient-devel
 BuildRequires:  libopenssl-devel
 BuildRequires:  libtool
-BuildRequires:  openldap2-devel
 BuildRequires:  openssl
 BuildRequires:  pkgconfig
 BuildRequires:  python3
 BuildRequires:  python3-Sphinx
 BuildRequires:  python3-ply
 BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(jemalloc)
 BuildRequires:  pkgconfig(json)
 BuildRequires:  pkgconfig(krb5)
 BuildRequires:  pkgconfig(libidn2)
 BuildRequires:  pkgconfig(libmaxminddb)
+BuildRequires:  pkgconfig(libnghttp2)
 BuildRequires:  pkgconfig(libuv)
 BuildRequires:  pkgconfig(libxml-2.0)
 Requires:       %{name}-utils
@@ -140,15 +150,91 @@ test and query the Domain Name System (DNS) and also the libraries rquired
 for the base "bind" package. The Berkeley Internet
 Name Domain (BIND) DNS server is found in the package named bind.
 
-%package -n python3-bind
+# 9.18.0 %package -n python3-bind
-Summary:        A module allowing rndc commands to be sent from Python programs
+# 9.18.0 Summary:        A module allowing rndc commands to be sent from Python programs
-Group:          Development/Languages/Python
+# 9.18.0 Group:          Development/Languages/Python
-Requires:       python3
+# 9.18.0 Requires:       python3
-Requires:       python3-ply
+# 9.18.0 Requires:       python3-ply
-BuildArch:      noarch
+# 9.18.0 BuildArch:      noarch
 
-%description -n python3-bind
+# 9.18.0 %description -n python3-bind
-This package provides a module which allows commands to be sent to rndc directly from Python programs.
+# 9.18.0 This package provides a module which allows commands to be sent to rndc directly from Python programs.
+
+%if %{with_modules_perl}
+%package modules-perl
+Summary:        A dynamically loadable zone (DLZ) plugin embedding a Perl interpreter in BIND
+Group:          Productivity/Networking/DNS/Servers
+BuildRequires:  perl
+
+%description modules-perl
+This package includes a dynamically loadable zone (DLZ) plugin
+embedding a Perl interpreter in BIND, allowing Perl scripts
+to be written to integrate with BIND and serve DNS data.
+%endif
+
+%if %{with_modules_mysql}
+%package modules-mysql
+Summary:        DLZ (dynamically loadable zone) modules which store zone data in a MySQL database
+Group:          Productivity/Networking/DNS/Servers
+BuildRequires:  libmysqlclient-devel
+
+%description modules-mysql
+This package includes dynamically loadable zone (DLZ) plugins
+which store zone data in a MySQL database
+The dlz_mysql_dynamic.so plugin does not support dynamic updates
+the dlz_mysqldyn_mod.so plugin is a dynamically loadable zone (DLZ)
+plugin that uses a fixed-schema MySQL database for back-end storage.
+It allows zone data to be updated via dynamic DNS updates, and
+sends DNS NOTIFY packets to other name servers when appropriate.
+%endif
+
+%if %{with_modules_ldap}
+%package modules-ldap
+Summary:        A DLZ (dynamically loadable zone) module which stores zone data in an LDAP directory
+Group:          Productivity/Networking/DNS/Servers
+BuildRequires:  openldap2-devel
+
+%description modules-ldap
+This package provides the externally loadable ldap DLZ module, without
+update support
+%endif
+
+%if %{with_modules_bdbhpt}
+%package modules-bdbhpt
+Summary:        A DLZ (dynamically loadable zone) module which stores zone data in a BerkeleyDB
+Group:          Productivity/Networking/DNS/Servers
+BuildRequires:  libdb-4_8-devel
+
+%description modules-bdbhpt
+This package provides the externally loadable bdbhpt DLZ driver, without
+update support
+%endif
+
+%if %{with_modules_sqlite3}
+%package modules-sqlite3
+Summary:        A DLZ (dynamically loadable zone) module which stores zone data in an sqlite3 db
+Group:          Productivity/Networking/DNS/Servers
+BuildRequires:  sqlite3-devel
+
+%description modules-sqlite3
+This package provides the externally loadable SQLitee DLZ module, without
+update support.
+%endif
+
+%if %{with_modules_generic}
+%package modules-generic
+Summary:        DLZ (dynamically loadable zone) module which store zone data in plain files
+Group:          Productivity/Networking/DNS/Servers
+
+%description modules-generic
+This package provides the externally loadable filesystem DLZ module, without
+update support and the externally loadable wildcard DLZ module.
+The "wildcard" DLZ module provides a "template" zone for domains matching
+a wildcard name.
+For any zone name matching the wildcard, it would return the data from
+the template.  "$zone$" is replaced with zone name: i.e., the shortest
+possible string of labels in the query name that matches the wildcard.
+%endif
 
 %prep
 %autosetup -p1 -a2
@@ -192,23 +278,25 @@ export LDFLAGS="-pie"
 	--enable-threads \
 	--with-libtool \
 	--with-libxml2 \
-	--with-libjson \
+	--with-dlz_filesystem \
+	--with-json-c \
 	--with-libidn2 \
-	--with-dlz-mysql \
-	--with-dlz-ldap \
 	--with-randomdev=/dev/urandom \
 	--enable-ipv6 \
 	--with-pic \
 	--disable-openssl-version-check \
 	--with-tuning=large \
 	--with-maxminddb \
-	--with-dlopen \
+	--with-dlopen=auto \
 	--with-gssapi=yes \
 	--disable-isc-spnego \
 	--enable-fixed-rrset \
 	--enable-filter-aaaa \
 %if %{with_systemd}
         --with-systemd \
+%endif
+%if %{with check}
+	--enable-querytrace \
 %endif
 	--enable-full-report
 # disable rpath
@@ -224,6 +312,10 @@ done
 %if %{with_systemd}
 %sysusers_generate_pre %{SOURCE72} named named.conf
 %endif
+# special build for the plugins
+for d in contrib/dlz/modules/*; do
+	[ -e $d/Makefile ] && make -C $d
+done
 
 %install
 mkdir -p \
@@ -245,12 +337,33 @@ mkdir -p \
 mkdir -p %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
 %endif
 %make_install
-install -m 0644 .clang-format.headers %{buildroot}/%{_defaultdocdir}/bind
+# install -m 0644 .clang-format.headers %{buildroot}/%{_defaultdocdir}/bind
 # remove useless .h files
 rm -rf %{buildroot}%{_includedir}
 
+# Install the plugins
+mkdir -p %{buildroot}/%{_libdir}/bind-plugins
+%if %{with_modules_perl}
+    install -m 0644 contrib/dlz/modules/perl/*.so %{buildroot}/%{_libdir}/bind-plugins
+%endif
+%if %{with_modules_mysql}
+    install -m 0644 contrib/dlz/modules/mysql/*.so %{buildroot}/%{_libdir}/bind-plugins
+    install -m 0644 contrib/dlz/modules/mysqldyn/*.so %{buildroot}/%{_libdir}/bind-plugins
+%endif
+%if %{with_modules_ldap}
+    install -m 0644 contrib/dlz/modules/ldap/*.so %{buildroot}/%{_libdir}/bind-plugins
+%endif
+%if %{with_modules_bdbhpt}
+    install -m 0644 contrib/dlz/modules/bdbhpt/*.so %{buildroot}/%{_libdir}/bind-plugins
+%endif
+%if %{with_modules_sqlite3}
+    install -m 0644 contrib/dlz/modules/sqlite3/*.so %{buildroot}/%{_libdir}/bind-plugins
+%endif
+%if %{with_modules_generic}
+    install -m 0644 contrib/dlz/modules/{filesystem,wildcard}/*.so %{buildroot}/%{_libdir}/bind-plugins
+%endif
 # remove useless .la files
-rm -f %{buildroot}/%{_libdir}/lib*.{la,a}
+rm -f %{buildroot}/%{_libdir}/lib*.{la,a} %{buildroot}/%{_libdir}/bind/*.la
 mv vendor-files/config/named.conf %{buildroot}/%{_sysconfdir}
 mv vendor-files/config/bind.reg %{buildroot}/%{_sysconfdir}/slp.reg.d
 mv vendor-files/config/rndc-access.conf %{buildroot}/%{_sysconfdir}/named.d
@@ -286,21 +399,24 @@ done
 %if %{with_sfw2}
 install -m 644 vendor-files/sysconfig/SuSEFirewall.named %{buildroot}/%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/bind
 %endif
+%if ! %{with check}
 # Cleanup doc
 rm doc/misc/Makefile*
 find doc/arm -type f ! -name '*.html' -delete
+%endif
 # Create doc as we want it in bind and not bind-doc
 for file in vendor-files/docu/README*; do
 	basename=$( basename ${file})
 	cp -a ${file} %{buildroot}/%{_defaultdocdir}/bind/${basename}.%{VENDOR}
 done
-mkdir -p vendor-files/config/ISC-examples
+# mkdir -p vendor-files/config/ISC-examples
-cp -a bin/tests/*.conf* vendor-files/config/ISC-examples
+# cp -a bin/tests/*.conf* vendor-files/config/ISC-examples
 for d in arm; do
 	cp -a doc/${d}/_build %{buildroot}/%{_defaultdocdir}/bind/${d}
 	echo "%doc %{_defaultdocdir}/bind/${d}" >>filelist-bind-doc
 done
-for file in CHANGES COPYRIGHT README version contrib doc/misc vendor-files/config; do
+for file in CHANGES COPYRIGHT README* version contrib/README* doc/misc vendor-files/config; do
+	[ -r ${file} ] || continue
 	basename=$( basename ${file})
 	cp -a ${file} %{buildroot}/%{_defaultdocdir}/bind/${basename}
 	echo "%doc %{_defaultdocdir}/bind/${basename}" >>filelist-bind-doc
@@ -313,6 +429,8 @@ install -m 0644 bind.keys %{buildroot}%{_localstatedir}/lib/named/named.root.key
 mkdir -p %{buildroot}%{_sysusersdir}
 install -m 644 %{SOURCE72} %{buildroot}%{_sysusersdir}/
 %endif
+find %{buildroot}/usr/share/doc/packages/bind -name cfg_test* -exec rm {} \;
+rm -rf %{buildroot}/usr/share/doc/packages/bind/misc/.libs
 
 %if %{with_systemd}
 %pre -f named.pre
@@ -325,6 +443,12 @@ install -m 644 %{SOURCE72} %{buildroot}%{_sysusersdir}/
 %{USERMOD_NAMED}
 %endif
 
+%if %{with check}
+%check
+sudo bin/tests/system/ifconfig.sh up
+make test
+%endif
+
 %preun
 %if %{with_systemd}
 %service_del_preun named.service
@@ -365,7 +489,7 @@ fi
 %dir %{_sysconfdir}/slp.reg.d
 %attr(0644,root,root) %config /%{_sysconfdir}/slp.reg.d/bind.reg
 %if %{with_systemd}
-%config %{_unitdir}/named.service
+%{_unitdir}/named.service
 %{_prefix}/lib/tmpfiles.d/bind.conf
 %{_sysusersdir}/named.conf
 %{_datadir}/factory
@@ -378,17 +502,21 @@ fi
 %{_bindir}/named-rrchecker
 %{_sbindir}/rcnamed
 %{_sbindir}/named
-%{_sbindir}/named-checkconf
+%{_bindir}/named-checkconf
-%{_sbindir}/named-checkzone
+%{_bindir}/named-checkzone
-%{_sbindir}/named-compilezone
+%{_bindir}/named-compilezone
-%dir %{_libdir}/named
+%{_bindir}/named-journalprint
-%{_libdir}/named/filter-aaaa.so
+%{_bindir}/nsec3hash
+%dir %{_libdir}/bind
+%{_libdir}/bind/filter-aaaa.so
+%{_libdir}/bind/filter-a.so
 %{_mandir}/man1/named-rrchecker.1%{ext_man}
 %{_mandir}/man5/named.conf.5%{ext_man}
-%{_mandir}/man8/named-checkconf.8%{ext_man}
+%{_mandir}/man1/named-checkconf.1%{ext_man}
-%{_mandir}/man8/named-checkzone.8%{ext_man}
+%{_mandir}/man1/named-checkzone.1%{ext_man}
 %{_mandir}/man8/named.8%{ext_man}
 %{_mandir}/man8/filter-aaaa.8%{ext_man}
+%{_mandir}/man8/filter-a.8%{ext_man}
 %dir %{_datadir}/bind
 %{_datadir}/bind/ldapdump
 %ghost %{_rundir}/named
@@ -403,6 +531,34 @@ fi
 %config %{_var}/lib/named/named.root.key
 %dir %{_libexecdir}/bind
 %{_libexecdir}/bind/named.prep
+%dir %{_libdir}/bind-plugins
+
+%if %{with_modules_perl}
+%files modules-perl
+%{_libdir}/bind-plugins/dlz_perl_driver.so
+%endif
+%if %{with_modules_mysql}
+%files modules-mysql
+%{_libdir}/bind-plugins/dlz_mysql_dynamic.so
+%{_libdir}/bind-plugins/dlz_mysqldyn_mod.so
+%endif
+%if %{with_modules_ldap}
+%files modules-ldap
+%{_libdir}/bind-plugins/dlz_ldap_dynamic.so
+%endif
+%if %{with_modules_bdbhpt}
+%files modules-bdbhpt
+%{_libdir}/bind-plugins/dlz_bdbhpt_dynamic.so
+%endif
+%if %{with_modules_sqlite3}
+%files modules-sqlite3
+%{_libdir}/bind-plugins/dlz_sqlite3_dynamic.so
+%endif
+%if %{with_modules_generic}
+%files modules-generic
+%{_libdir}/bind-plugins/dlz_filesystem_dynamic.so
+/usr/lib64/bind-plugins/dlz_wildcard_dynamic.so
+%endif
 
 %files doc -f filelist-bind-doc
 %dir %doc %{_defaultdocdir}/bind
@@ -424,26 +580,26 @@ fi
 %{_bindir}/nsupdate
 %{_bindir}/genDDNSkey
 %{_bindir}/arpaname
+%{_bindir}/dnssec-dsfromkey
+%{_bindir}/dnssec-importkey
+%{_bindir}/dnssec-keyfromlabel
+%{_bindir}/dnssec-keygen
+%{_bindir}/dnssec-revoke
+%{_bindir}/dnssec-settime
+%{_bindir}/dnssec-signzone
+%{_bindir}/dnssec-verify
+%{_bindir}/dnssec-cds
 %{_sbindir}/ddns-confgen
-%{_sbindir}/dnssec-dsfromkey
-%{_sbindir}/dnssec-importkey
-%{_sbindir}/dnssec-keyfromlabel
-%{_sbindir}/dnssec-keygen
-%{_sbindir}/dnssec-revoke
-%{_sbindir}/dnssec-settime
-%{_sbindir}/dnssec-signzone
-%{_sbindir}/dnssec-verify
-%{_sbindir}/dnssec-checkds
-%{_sbindir}/dnssec-coverage
-%{_sbindir}/dnssec-keymgr
-%{_sbindir}/dnssec-cds
-# %%{_sbindir}/genrandom
-# %%{_sbindir}/isc-hmac-fixup
-%{_sbindir}/named-journalprint
-%{_sbindir}/nsec3hash
 %{_sbindir}/rndc
 %{_sbindir}/rndc-confgen
 %{_sbindir}/tsig-keygen
+# 9.18.0 %%{_sbindir}/dnssec-checkds
+# 9.18.0 %%{_sbindir}/dnssec-coverage
+# 9.18.0 %%{_sbindir}/dnssec-keymgr
+# %%{_sbindir}/genrandom
+# %%{_sbindir}/isc-hmac-fixup
+# 9.18.0 %%{_sbindir}/named-journalprint
+# 9.18.0 %%{_sbindir}/nsec3hash
 # Library files, formerly in their own, separate packages:
 %{_libdir}/libbind9-%{version}.so
 %{_libdir}/libdns-%{version}.so
@@ -461,7 +617,7 @@ fi
 %{_libdir}/libns.so
 %dir %doc %{_defaultdocdir}/bind
 %{_defaultdocdir}/bind/README*.%{VENDOR}
-%{_defaultdocdir}/bind/.clang-format.headers
+# %%{_defaultdocdir}/bind/.clang-format.headers
 %{_mandir}/man1/arpaname.1%{ext_man}
 %{_mandir}/man1/delv.1%{ext_man}
 %{_mandir}/man1/dig.1%{ext_man}
@@ -469,33 +625,33 @@ fi
 %{_mandir}/man1/mdig.1%{ext_man}
 %{_mandir}/man1/nslookup.1%{ext_man}
 %{_mandir}/man1/nsupdate.1%{ext_man}
-# %%{_mandir}/man1/dnstap-read.1%%{ext_man}
+%{_mandir}/man1/dnssec-dsfromkey.1%{ext_man}
+%{_mandir}/man1/dnssec-importkey.1%{ext_man}
+%{_mandir}/man1/dnssec-keyfromlabel.1%{ext_man}
+%{_mandir}/man1/dnssec-keygen.1%{ext_man}
+%{_mandir}/man1/dnssec-revoke.1%{ext_man}
+%{_mandir}/man1/dnssec-settime.1%{ext_man}
+%{_mandir}/man1/dnssec-signzone.1%{ext_man}
+%{_mandir}/man1/dnssec-verify.1%{ext_man}
+%{_mandir}/man1/dnssec-cds.1%{ext_man}
+%{_mandir}/man1/named-compilezone.1%{ext_man}
+%{_mandir}/man1/named-journalprint.1%{ext_man}
+%{_mandir}/man1/nsec3hash.1%{ext_man}
 %{_mandir}/man5/rndc.conf.5%{ext_man}
 %{_mandir}/man8/ddns-confgen.8%{ext_man}
-%{_mandir}/man8/dnssec-dsfromkey.8%{ext_man}
+%{_mandir}/man8/rndc.8%{ext_man}
-%{_mandir}/man8/dnssec-importkey.8%{ext_man}
+%{_mandir}/man8/rndc-confgen.8%{ext_man}
-%{_mandir}/man8/dnssec-keyfromlabel.8%{ext_man}
+%{_mandir}/man8/tsig-keygen.8%{ext_man}
-%{_mandir}/man8/dnssec-keygen.8%{ext_man}
+# %%{_mandir}/man1/dnstap-read.1%%{ext_man}
-%{_mandir}/man8/dnssec-revoke.8%{ext_man}
+# 9.18.0 %%{_mandir}/man8/dnssec-checkds.8%%{ext_man}
-%{_mandir}/man8/dnssec-settime.8%{ext_man}
+# 9.18.0 %%{_mandir}/man8/dnssec-coverage.8%%{ext_man}
-%{_mandir}/man8/dnssec-signzone.8%{ext_man}
+# 9.18.0 %%{_mandir}/man8/dnssec-keymgr.8%%{ext_man}
-%{_mandir}/man8/dnssec-verify.8%{ext_man}
-%{_mandir}/man8/dnssec-checkds.8%{ext_man}
-%{_mandir}/man8/dnssec-coverage.8%{ext_man}
-%{_mandir}/man8/dnssec-keymgr.8%{ext_man}
-%{_mandir}/man8/dnssec-cds.8%{ext_man}
 # %%{_mandir}/man8/named-nzd2nzf.8%%{ext_man}
 # %%{_mandir}/man8/genrandom.8%%{ext_man}
 # %%{_mandir}/man8/isc-hmac-fixup.8%%{ext_man}
-%{_mandir}/man8/named-journalprint.8%{ext_man}
-%{_mandir}/man8/nsec3hash.8%{ext_man}
-%{_mandir}/man8/rndc.8%{ext_man}
-%{_mandir}/man8/rndc-confgen.8%{ext_man}
-%{_mandir}/man8/named-compilezone.8%{ext_man}
-%{_mandir}/man8/tsig-keygen.8%{ext_man}
 
-%files -n python3-bind
+# 9.18.0 %%files -n python3-bind
-%{python3_sitelib}/isc
+# 9.18.0 %%{python3_sitelib}/isc
-%{python3_sitelib}/isc-*.egg-info
+# 9.18.0 %%{python3_sitelib}/isc-*.egg-info
 
 %changelog

named-bootconf.diff

@@ -1,23 +0,0 @@
-Index: bind-9.14.7/contrib/scripts/named-bootconf.sh
-===================================================================
---- bind-9.14.7.orig/contrib/scripts/named-bootconf.sh
-+++ bind-9.14.7/contrib/scripts/named-bootconf.sh
-@@ -39,7 +39,8 @@
- # POSSIBILITY OF SUCH DAMAGE.
- 
- if [ ${OPTIONFILE-X} = X ]; then
--	WORKDIR=/tmp/`date +%s`.$$
-+        TMPDIR=`mktemp -p /tmp/ -d named-bootconf.XXXXXXXXXX` || exit 1
-+        WORKDIR=$TMPDIR/`date +%s`.$$
- 	( umask 077 ; mkdir $WORKDIR ) || {
- 		echo "unable to create work directory '$WORKDIR'" >&2 
- 		exit 1
-@@ -293,7 +294,7 @@ if [ $DUMP -eq 1 ]; then
- 	cat $ZONEFILE $COMMENTFILE
- 
- 	rm -f $OPTIONFILE $ZONEFILE $COMMENTFILE
--	rmdir $WORKDIR
-+	rm -rf $TMPDIR
- fi
- 
- exit 0

vendor-files.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0fa62530ab1e30459f5846db88927c4eca95f557c686bc9cb1cb9efab455f1c2
+oid sha256:8211a8f992a9e8602c111b7f0f244f0ce25dd149d4007c7d00679d6249f9b458
-size 19509
+size 20273