main/bind: security upgrade to 9.14.12

see #11558

1 files changed, 14 insertions, 21 deletions

diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index e71b6dcaf97..743ad9a6553 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -4,12 +4,12 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: tcely <bind+aports@tcely.33mail.com>
 pkgname=bind
-pkgver=9.14.8
+pkgver=9.14.12
 _ver=${pkgver%_p*}
 _p=${pkgver#*_p}
 _major=${pkgver%%.*}
-[ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p"
 pkgrel=0
+[ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p"
 pkgdesc="The ISC DNS server"
 url="https://www.isc.org"
 arch="all"
@@ -18,11 +18,9 @@ pkgusers="named"
 pkggroups="named"
 depends="dns-root-hints"
 depends_dev="$pkgname $pkgname-plugins $pkgname-tools"
-depends_libs=""
 depends_plugins="$pkgname"
 _root_keys_upstream="dnssec-root"
 depends_root_keys="$_root_keys_upstream"
-depends_tools=""
 _py3deps="py3-ply python3"
 makedepends="
 	bash
@@ -42,7 +40,7 @@ makedepends="
 	"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc
-	${pkgname}-${_root_keys_upstream}:root_keys:noarch
+	$pkgname-${_root_keys_upstream}:root_keys:noarch
 	py3-$pkgname:_py3 $pkgname-dnssec-tools:_dnssec_tools
 	$pkgname-plugins $pkgname-tools
 	"
@@ -57,9 +55,11 @@ source="
 	127.zone
 	localhost.zone
 	"
-builddir="$srcdir/$pkgname-$_ver"
 
 # secfixes:
+#   9.14.12-r0:
+#     - CVE-2020-8616
+#     - CVE-2020-8617
 #   9.14.8-r0:
 #     - CVE-2019-6477
 #   9.14.7-r0:
@@ -93,21 +93,17 @@ builddir="$srcdir/$pkgname-$_ver"
 
 prepare() {
 	default_prepare
-	cd "$builddir"
-
 	# Adjusting PATHs in manpages
 	for i in bin/named/named.8 bin/check/named-checkconf.8 bin/rndc/rndc.8; do
 		sed -i \
 			-e 's:/etc/named.conf:/etc/bind/named.conf:g' \
 			-e 's:/etc/rndc.conf:/etc/bind/rndc.conf:g' \
 			-e 's:/etc/rndc.key:/etc/bind/rndc.key:g' \
-			"${i}"
+			"$i"
 	done
 }
 
 build() {
-	cd "$builddir"
-
 	### http://bugs.gentoo.org/show_bug.cgi?id=227333
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
@@ -139,13 +135,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-
 	./bin/named/named -V
 }
 
 package() {
-	cd "$builddir"
 	install -d -m0770 -g named -o root "$pkgdir"/var/bind \
 		"$pkgdir"/var/bind/sec \
 		"$pkgdir"/var/bind/dyn \
@@ -229,17 +222,17 @@ root_keys() {
 	depends="$depends_root_keys"
 
 	local _dir _file _link
-	_dir="usr/share/${_root_keys_upstream}"
-	_file="${pkgname}-${_root_keys_upstream}.keys"
-	_link="${pkgdir}/etc/bind/bind.keys"
+	_dir="usr/share/$_root_keys_upstream"
+	_file="$pkgname-$_root_keys_upstream.keys"
+	_link="$pkgdir/etc/bind/bind.keys"
 
-	mkdir -p "${subpkgdir}/${_dir}"
-	cd "${subpkgdir}/${_dir}"
+	mkdir -p "$subpkgdir/$_dir"
+	cd "$subpkgdir/$_dir"
 
 	mv "$_link" "$_file"
 	ln -s "$_file" bind.keys
 
-	ln -s "../../${_dir}/${_file}" "$_link"
+	ln -s "../../$_dir/$_file" "$_link"
 }
 
 # TODO: remove when abuild is sufficiently upgraded
@@ -251,7 +244,7 @@ libs() {
 #gpg_signature_extensions="sha512.asc"
 #gpgfingerprints="good:AE3F AC79 6711 EC59 FC00  7AA4 74BB 6B9A 4CBB 3D38"
 
-sha512sums="eb52760982ebd246e6e1945684771193fc7364324a6d6a95a0cae33afa0a4fa24ffe8313b5f9094420c7c2ec932b1b1a9fb19f6e673ff3c5583ab5e3ff04eb6a  bind-9.14.8.tar.gz
+sha512sums="f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf  bind-9.14.12.tar.gz
 2b32d1e7f62cd1e01bb4fdd92d15460bc14761b933d5acc463a91f5ecd4773d7477c757c5dd2738e8e433693592cf3f623ffc142241861c91848f01aa84640d6  bind.plugindir.patch
 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6  bind.so_bsdcompat.patch
 ca779f52a0a96d774bbc4dbb4e62d136f483ce528693ac73b844435be73500d8495bfddce34534825b5f6fa3197601e3175918a076428bab52bbc33c509a816e  named.initd