bind: update to 9.11.4.

common/shlibs

@@ -1015,7 +1015,7 @@ libtirpc.so.3 libtirpc-1.0.2_1
 librpcsecgss.so.3 librpcsecgss-0.19_1
 libnfsidmap.so.0 libnfsidmap-0.24_1
 libbind9.so.160 bind-libs-9.11.3_1
-libdns.so.1100 bind-libs-9.11.3_1
+libdns.so.1102 bind-libs-9.11.4_1
 libirs.so.160 bind-libs-9.11.3_1
 libisc.so.169 bind-libs-9.11.3_1
 libisccc.so.160 bind-libs-9.11.3_1

srcpkgs/bind/patches/libressl-2.7.patch

@@ -1,52 +0,0 @@
-diff --git a/lib/dns/openssldh_link.c b/lib/dns/openssldh_link.c
-index ab2f68a..727d5dd 100644
---- ./lib/dns/openssldh_link.c
-+++ ./lib/dns/openssldh_link.c
-@@ -69,7 +69,7 @@ static isc_result_t openssldh_todns(const dst_key_t *key, isc_buffer_t *data);
- 
- static BIGNUM *bn2, *bn768, *bn1024, *bn1536;
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- /*
-  * DH_get0_key, DH_set0_key, DH_get0_pqg and DH_set0_pqg
-  * are from OpenSSL 1.1.0.
-diff --git a/lib/dns/openssldsa_link.c b/lib/dns/openssldsa_link.c
-index 4c2d3e4..5e8096f 100644
---- ./lib/dns/openssldsa_link.c
-+++ ./lib/dns/openssldsa_link.c
-@@ -49,7 +49,7 @@
- 
- static isc_result_t openssldsa_todns(const dst_key_t *key, isc_buffer_t *data);
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- static void
- DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q,
- 	     const BIGNUM **g)
-diff --git a/lib/dns/opensslecdsa_link.c b/lib/dns/opensslecdsa_link.c
-index 9168ec2..a39dadf 100644
---- ./lib/dns/opensslecdsa_link.c
-+++ ./lib/dns/opensslecdsa_link.c
-@@ -42,7 +42,7 @@
- 
- #define DST_RET(a) {ret = a; goto err;}
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- /* From OpenSSL 1.1 */
- static void
- ECDSA_SIG_get0(const ECDSA_SIG *sig, const BIGNUM **pr, const BIGNUM **ps) {
-diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c
-index 5dddc2e..74e167b 100644
---- ./lib/dns/opensslrsa_link.c
-+++ ./lib/dns/opensslrsa_link.c
-@@ -121,7 +121,7 @@
- #endif
- #define DST_RET(a) {ret = a; goto err;}
- 
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- /* From OpenSSL 1.1.0 */
- static int
- RSA_set0_key(RSA *r, BIGNUM *n, BIGNUM *e, BIGNUM *d) {

srcpkgs/bind/template

@@ -1,24 +1,9 @@
 # Template file for 'bind'
 pkgname=bind
-_distver=9.11.3
+version=9.11.4
-version="${_distver}"
+revision=1
-revision=3
+_fullver="${version}${_patchver:+-${_patchver}}"
-_fullver="${_distver}${_patchver:+-${_patchver}}"
 wrksrc="${pkgname}-${_fullver}"
-short_desc="Berkeley Internet Name Domain server"
-maintainer="Juan RP <xtraeme@voidlinux.eu>"
-license="ISC"
-homepage="https://www.isc.org/software/bind/"
-distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.gz"
-checksum=0d9dde14b2ec7f9cdc3b69f19540c7a2e4eee7b6c727965dfae48810965876f5
-
-build_options="geoip seccomp"
-build_options_default="geoip"
-
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default+=" seccomp"
-fi
-
 build_style=gnu-configure
 configure_args="--disable-static --enable-threads --enable-largefile
  --with-libtool --enable-atomic --sysconfdir=/etc/named --enable-epoll
@@ -30,17 +15,32 @@ configure_args="--disable-static --enable-threads --enable-largefile
 hostmakedepends="automake libtool perl"
 makedepends="libressl-devel libxml2-devel libcap-devel readline-devel libatomic-devel
  $(vopt_if geoip geoip-devel) $(vopt_if seccomp libseccomp-devel)"
+short_desc="Berkeley Internet Name Domain server"
+maintainer="Juan RP <xtraeme@voidlinux.eu>"
+license="ISC"
+homepage="https://www.isc.org/software/bind/"
+distfiles="https://ftp.isc.org/isc/bind9/${_fullver}/bind-${_fullver}.tar.gz"
+checksum=595070b031f869f8939656b5a5d11b121211967f15f6afeafa895df745279617
+
 conf_files="/etc/named/named.conf"
 system_accounts="named"
 named_descr="BIND DNS server"
 named_homedir="/var/named"
 make_dirs="/var/named 0770 root named"
 
+build_options="geoip seccomp"
+build_options_default="geoip"
+
+if [ -z "$CROSS_BUILD" ]; then
+	build_options_default+=" seccomp"
+fi
+
 pre_configure() {
 	autoreconf -fi
 	# disable bin tests for now.
 	sed -e "s,tests,,g" -i bin/Makefile.in
 }
+
 post_install() {
 	vsv named
 	vinstall ${FILESDIR}/named.logrotate 600 etc/logrotate.d named
@@ -58,6 +58,7 @@ bind-libs_package() {
 		vmove usr/lib/*.so.*
 	}
 }
+
 bind-utils_package() {
 	short_desc+=" - DNS utils"
 	pkg_install() {
@@ -67,6 +68,7 @@ bind-utils_package() {
 		done
 	}
 }
+
 bind-devel_package() {
 	depends="bind-libs>=${version}_${revision}"
 	short_desc+=" - development files"