From 01cedffe0babdb391158d78a495ec4d2a21539be Mon Sep 17 00:00:00 2001
From: Sean McAvoy <seanmcavoy@gmail.com>
Date: Mon, 31 Jan 2022 21:33:52 -0500
Subject: [PATCH] main/bind: security upgrade to 9.16.25 update to latest
 stable includes fix for CVE-2021-25219

---
 main/bind/APKBUILD                          | 10 +++++-----
 main/bind/bind-9.16.20-map-format-fix.patch |  8 --------
 2 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 main/bind/bind-9.16.20-map-format-fix.patch

diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index ca5c565b1e2..1fc533eb659 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -5,12 +5,12 @@
 # Contributor: ungleich <alpinelinux@ungleich.ch>
 # Maintainer:
 pkgname=bind
-pkgver=9.16.20
+pkgver=9.16.25
 _ver=${pkgver%_p*}
 _p=${pkgver#*_p}
 _major=${pkgver%%.*}
 [ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p"
-pkgrel=1
+pkgrel=0
 pkgdesc="The ISC DNS server"
 url="https://www.isc.org/"
 arch="all"
@@ -57,10 +57,11 @@ source="
 	named.conf.recursive
 	127.zone
 	localhost.zone
-	bind-9.16.20-map-format-fix.patch
 	"
 
 # secfixes:
+#   9.16.25-r0:
+#     - CVE-2021-25219
 #   9.16.20-r0:
 #     - CVE-2021-25218
 #   9.16.15-r0:
@@ -274,7 +275,7 @@ _gpgfingerprints="
 	"
 
 sha512sums="
-bd4ffcc2589ca8f1ac228576ec11e86f317d5a78d7964a0a7ae70b2fa38831d5bd65c2e8c35d8190502de7139f85d8b080b3b8ee968811a8df78e5761781525d  bind-9.16.20.tar.xz
+e43c0e59159d3a5642db051f3982d8767fb726426380c32960fefe4b9afd05708ed8f7e80a98b803a580b048e1a368c888e2dd5695fa5fcd7b8b75574a27cb62  bind-9.16.25.tar.xz
 2b32d1e7f62cd1e01bb4fdd92d15460bc14761b933d5acc463a91f5ecd4773d7477c757c5dd2738e8e433693592cf3f623ffc142241861c91848f01aa84640d6  bind.plugindir.patch
 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6  bind.so_bsdcompat.patch
 53db80f7ee4902f42fb1d0bc959242bcb6f20d95256bda99ce2c206af8b4703c7f72bb26d026c633f70451b84a37c3946b210951e34dd5d6620b181cd0183de4  named.initd
@@ -283,5 +284,4 @@ d2f61d02d7829af51faf14fbe2bafe8bc90087e6b6697c6275a269ebbddcaa14a234fff5c41da793
 3aba9763cfaf0880a89fd01202f41406b465547296ce91373eb999ea7719040bc1ac4e47b0de025a8060f693d3d88774a20d09a43fa7ac6aa43989b58b5ee8fe  named.conf.recursive
 eed9886717539399518e011ae5eae6335aed4fae019e1def088c5be26bdc896c99c07adf84ee61babafa31d31ff3b028263d1c88d2eee17ecf4c95a9d77d524c  127.zone
 340e86472a2c2746fe585c0aa5f079d3a9b46e828c1f53d48026533a169b7f77ded7d0a13d291d6962607bb9481456e6fa69df1834603e7555332615fb998f0b  localhost.zone
-d9224712ee2c6f6d0ff483ed253497548935fe35f45e5bdf26c9bd25c6234adde00727df7eb49fbfbfb34aad9d9fa0f112e900804794ad90a5cd8a64e9db61c6  bind-9.16.20-map-format-fix.patch
 "
diff --git a/main/bind/bind-9.16.20-map-format-fix.patch b/main/bind/bind-9.16.20-map-format-fix.patch
deleted file mode 100644
index f6e3c9b3782..00000000000
--- a/main/bind/bind-9.16.20-map-format-fix.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/lib/dns/mapapi
-+++ b/lib/dns/mapapi
-@@ -13,4 +13,4 @@
- # Whenever releasing a new major release of BIND9, set this value
- # back to 1.0 when releasing the first alpha.  Map files are *never*
- # compatible across major releases.
--MAPAPI=2.0
-+MAPAPI=3.0