diff options
Diffstat (limited to 'main/bind/APKBUILD')
-rw-r--r-- | main/bind/APKBUILD | 76 |
1 files changed, 43 insertions, 33 deletions
diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD index da445d0e27d..bc4f7199835 100644 --- a/main/bind/APKBUILD +++ b/main/bind/APKBUILD @@ -1,26 +1,26 @@ # Contributor: Sergei Lukin <sergej.lukin@gmail.com> # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Contributor: Carlo Landmeter <clandmeter@gmail.com> +# Contributor: Carlo Landmeter <clandmeter@alpinelinux.org> # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: tcely <bind+aports@tcely.33mail.com> pkgname=bind -pkgver=9.14.12 +pkgver=9.16.15 _ver=${pkgver%_p*} _p=${pkgver#*_p} _major=${pkgver%%.*} -pkgrel=1 -[ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p" +[ "$_p" != "$pkgver" ] && _ver="$_ver-P$_p" +pkgrel=2 pkgdesc="The ISC DNS server" -url="https://www.isc.org" +url="https://www.isc.org/" arch="all" license="MPL-2.0" pkgusers="named" pkggroups="named" depends="dns-root-hints" depends_dev="$pkgname $pkgname-plugins $pkgname-tools" -depends_plugins="$pkgname" +_depends_plugins="$pkgname" _root_keys_upstream="dnssec-root" -depends_root_keys="$_root_keys_upstream" +_depends_root_keys="$_root_keys_upstream" _py3deps="py3-ply python3" makedepends=" bash @@ -29,6 +29,7 @@ makedepends=" json-c-dev krb5-dev libcap-dev + libuv-dev libxml2-dev linux-headers openldap-dev @@ -37,6 +38,7 @@ makedepends=" protobuf-c-dev $_py3deps python3-dev + $_depends_root_keys " install="$pkgname.pre-install" subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc @@ -45,11 +47,7 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc $pkgname-plugins $pkgname-tools " source=" - https://downloads.isc.org/isc/${pkgname}$_major/$_ver/$pkgname-$_ver.tar.gz - CVE-2020-8621.patch - CVE-2020-8622.patch - CVE-2020-8624.patch - + https://downloads.isc.org/isc/bind$_major/$_ver/bind-$_ver.tar.xz bind.plugindir.patch bind.so_bsdcompat.patch named.initd @@ -61,14 +59,24 @@ source=" " # secfixes: -# 9.14.12-r1: +# 9.16.15-r0: +# - CVE-2021-25214 +# - CVE-2021-25215 +# - CVE-2021-25216 +# 9.16.11-r2: +# - CVE-2020-8625 +# 9.16.6-r0: +# - CVE-2020-8620 # - CVE-2020-8621 # - CVE-2020-8622 +# - CVE-2020-8623 # - CVE-2020-8624 +# 9.16.4-r0: +# - CVE-2020-8618 +# - CVE-2020-8619 # 9.14.12-r0: # - CVE-2020-8616 # - CVE-2020-8617 -# - CVE-2020-8619 # 9.14.8-r0: # - CVE-2019-6477 # 9.14.7-r0: @@ -103,7 +111,7 @@ source=" prepare() { default_prepare # Adjusting PATHs in manpages - for i in bin/named/named.8 bin/check/named-checkconf.8 bin/rndc/rndc.8; do + 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' \ @@ -113,7 +121,7 @@ prepare() { } build() { - ### http://bugs.gentoo.org/show_bug.cgi?id=227333 + ### https://bugs.gentoo.org/show_bug.cgi?id=227333 export CFLAGS="$CFLAGS -D_GNU_SOURCE" ./configure \ @@ -139,7 +147,8 @@ build() { --enable-linux-caps \ --enable-shared \ --enable-static \ - --disable-isc-spnego + --disable-isc-spnego \ + --disable-backtrace make } @@ -176,13 +185,6 @@ package() { ln -s named.ca root.cache } -dev() { - default_dev - - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/isc-config.sh "$subpkgdir"/usr/bin/ -} - _py3() { pkgdesc="A module allowing rndc commands to be sent from Python programs" depends="$_py3deps" @@ -203,7 +205,7 @@ _dnssec_tools() { plugins() { pkgdesc="The ISC DNS server plugins" - depends="$depends_plugins" + depends="$_depends_plugins" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/bind "$subpkgdir"/usr/lib/ @@ -244,19 +246,27 @@ root_keys() { ln -s "../../$_dir/$_file" "$_link" } -# TODO: remove when abuild is sufficiently upgraded +# The default_libs() in abuild uses the wrong pattern. libs() { depends="$depends_libs" - default_libs + pkgdesc="$pkgdesc (libraries)" + local dir= file= + for dir in lib usr/lib; do + for file in "$pkgdir"/$dir/lib*.so; do + [ -f "$file" ] || continue + mkdir -p "$subpkgdir"/$dir + mv "$file" "$subpkgdir"/$dir/ + done + done } -#gpg_signature_extensions="sha512.asc" -#gpgfingerprints="good:AE3F AC79 6711 EC59 FC00 7AA4 74BB 6B9A 4CBB 3D38" +_gpg_signature_extensions="sha512.asc" +_gpgfingerprints=" + good:AE3F AC79 6711 EC59 FC00 7AA4 74BB 6B9A 4CBB 3D38 + BE0E 9748 B718 253A 28BB 89FF F1B1 1BF0 5CF0 2E57 + " -sha512sums="f4e6c50cbe8fdb44cdd8e30b4560b6fe2fccd0fd5bde527a897a66e85065265da0d0aceb95af42d5568dea95d59e68574e5a486bbb7e6c5d0af275538c353ddf bind-9.14.12.tar.gz -0b43baa94adf382c49bf01f55a7a25fcd6fc34f6cf985bb19eafb499d2ae8be4571f54dd970e30dfccb375edde9f1c231e0f820504c599cb707ed34730668102 CVE-2020-8621.patch -4edc7aa26fc5187d815f013c9291c71c2273a278bf97419a866b562bf7abbe4aafe39618d77e28ea42cfdecd7716ff1a9425efa38ce9352af9202cbfe74134f9 CVE-2020-8622.patch -c39a06971bee86a8f8832d0cc211bec44f84b5c812899afc19c86413a9cba79ad4ab28dfb32b63cdee4d3997de9fe669dc130d2e8211a17e7344ca113aa33ed8 CVE-2020-8624.patch +sha512sums="30dad6e2144b3ac53ef0a2d1ed3c8342120f148fc0eb6409113a6d5ed3444eecb917915fdf39c26fd223396fc1e873410a50da305f0b870864f7fbbdccec8033 bind-9.16.15.tar.xz 2b32d1e7f62cd1e01bb4fdd92d15460bc14761b933d5acc463a91f5ecd4773d7477c757c5dd2738e8e433693592cf3f623ffc142241861c91848f01aa84640d6 bind.plugindir.patch 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch ca779f52a0a96d774bbc4dbb4e62d136f483ce528693ac73b844435be73500d8495bfddce34534825b5f6fa3197601e3175918a076428bab52bbc33c509a816e named.initd |