aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-05-19 23:28:51 -0300
committerLeo <thinkabit.ukim@gmail.com>2020-05-20 17:08:32 +0000
commitf415ad5b8bc9e3fb57d3f950785b0203d7eee934 (patch)
treecebfb2c89403c05a43e1734b862ebdeb3714b520
parentb5de94f7c3a3a28552ced064e52165c9518fa10b (diff)
downloadaports-f415ad5b8bc9e3fb57d3f950785b0203d7eee934.tar.gz
aports-f415ad5b8bc9e3fb57d3f950785b0203d7eee934.tar.bz2
aports-f415ad5b8bc9e3fb57d3f950785b0203d7eee934.tar.xz
main/bind: upgrade to 9.14.12
see #11558
-rw-r--r--main/bind/APKBUILD39
1 files changed, 16 insertions, 23 deletions
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index ebb1da2b8f..8c2e17c30e 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -5,12 +5,12 @@
# Contributor: ungleich <alpinelinux@ungleich.ch>
# Maintainer:
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=7
+[ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p"
+pkgrel=0
pkgdesc="The ISC DNS server"
url="https://www.isc.org"
arch="all"
@@ -19,11 +19,9 @@ pkgusers="named"
pkggroups="named"
depends="dns-root-hints bind-tools"
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
@@ -44,12 +42,12 @@ makedepends="
"
install="$pkgname.pre-install $pkgname.post-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
"
source="
- https://downloads.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz
+ https://downloads.isc.org/isc/${pkgname}$_major/$_ver/$pkgname-$_ver.tar.gz
bind.plugindir.patch
bind.so_bsdcompat.patch
named.initd
@@ -59,9 +57,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:
@@ -95,21 +95,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"
@@ -141,13 +137,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 \
@@ -231,17 +224,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
@@ -257,7 +250,7 @@ gpgfingerprints="
BE0E 9748 B718 253A 28BB 89FF F1B1 1BF0 5CF0 2E57
"
-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
53db80f7ee4902f42fb1d0bc959242bcb6f20d95256bda99ce2c206af8b4703c7f72bb26d026c633f70451b84a37c3946b210951e34dd5d6620b181cd0183de4 named.initd