From 5f58c4df8dffff5589f831f5e0364ca88ceef380 Mon Sep 17 00:00:00 2001
From: Nathan <ndowens@artixlinux.org>
Date: Sat, 24 Oct 2020 14:42:48 +0000
Subject: user/bind: upgrade to 9.16.8

---
 user/bind/APKBUILD | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'user')

diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD
index 04cd2de05..2b39c5f1f 100644
--- a/user/bind/APKBUILD
+++ b/user/bind/APKBUILD
@@ -4,7 +4,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=bind
-pkgver=9.14.12
+pkgver=9.16.8
 _p=${pkgver#*_p}
 _ver=${pkgver%_p*}
 _major=${pkgver%%.*}
@@ -25,10 +25,10 @@ license="ISC AND Apache-2.0 AND OpenSSL AND BSD-2-Clause AND BSD-3-Clause AND BS
 pkgusers="named"
 pkggroups="named"
 depends=""
-makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev py3-ply"
+makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev py3-ply libuv-dev"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc $pkgname-tools"
 install="$pkgname.pre-install"
-source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz
+source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.xz
 	bind.so_bsdcompat.patch
 	named.initd
 	named.confd
@@ -41,6 +41,14 @@ source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz
 builddir="$srcdir/$pkgname-$_ver"
 
 # secfixes:
+#   9.16.8-r0:
+#     - CVE-2020-8620
+#     - CVE-2020-8621
+#     - CVE-2020-8622
+#     - CVE-2020-8623
+#     - CVE-2020-8624
+#     - CVE-2020-8618
+#     - CVE-2020-8619
 #   9.14.9-r0:
 #     - CVE-2019-6477
 #   9.14.7-r0:
@@ -79,13 +87,13 @@ prepare() {
 	export CFLAGS="$CFLAGS -D_GNU_SOURCE"
 
 	# 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}"
-	done
+	for i in bin/named/named.rst bin/check/named-checkconf.rst bin/rndc/rndc.rst; 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"
+done
 }
 
 build() {
@@ -153,7 +161,7 @@ tools() {
 	done
 }
 
-sha512sums="f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf  bind-9.14.12.tar.gz
+sha512sums="803af842b4f83c16556036f3a2a52b4aeab4781bafb35385b786a3331cf17ef6148c23928f6903fd371337ba92870d7a8548f5d178b805d160d0af34af45fee7  bind-9.16.8.tar.xz
 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6  bind.so_bsdcompat.patch
 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015  named.initd
 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf  named.confd
-- 
cgit v1.2.3-60-g2f50