main/bind: upgrade to 9.12.0 and modernize abuild

1 files changed, 25 insertions, 32 deletions

diff --git a/main/bind/APKBUILD b/main/bind/APKBUILD
index b34632430c..2458b66a58 100644
--- a/main/bind/APKBUILD
+++ b/main/bind/APKBUILD
@@ -3,11 +3,12 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bind
-pkgver=9.11.2_p1
+pkgver=9.12.0
 _ver=${pkgver%_p*}
 _p=${pkgver#*_p}
+_major=${pkgver%%.*}
 [ "$_p" != "$pkgver" ] && _ver="${_ver}-P$_p"
-pkgrel=1
+pkgrel=0
 pkgdesc="The ISC DNS server"
 url="http://www.isc.org"
 arch="all"
@@ -16,13 +17,12 @@ arch="all"
 #  as alias addresses on the loopback interface.
 options="!check"
 license="MIT BSD"
-depends=""
 pkgusers="named"
 pkggroups="named"
 makedepends="bash libressl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc $pkgname-tools"
-source="http://ftp.isc.org/isc/bind9/${_ver}/bind-${_ver}.tar.gz
+source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz
 	bind.so_bsdcompat.patch
 	named.initd
 	named.confd
@@ -32,6 +32,7 @@ source="http://ftp.isc.org/isc/bind9/${_ver}/bind-${_ver}.tar.gz
 	localhost.zone
 	named.ca
 	"
+builddir="$srcdir/$pkgname-$_ver"
 
 # secfixes:
 #   9.11.2_p1-r0:
@@ -45,7 +46,6 @@ source="http://ftp.isc.org/isc/bind9/${_ver}/bind-${_ver}.tar.gz
 #     - CVE-2016-9147
 #     - CVE-2016-9444
 
-builddir="$srcdir/bind-${_ver}"
 prepare() {
 	cd "$builddir"
 
@@ -58,17 +58,17 @@ prepare() {
 			-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}" || return 1
+			"${i}"
 	done
 
-	patch -p0 -i "$srcdir"/bind.so_bsdcompat.patch || return 1
+	patch -p0 -i "$srcdir"/bind.so_bsdcompat.patch
 }
 
 build() {
 	cd "$builddir"
 	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
+		--build="$CBUILD" \
+		--host="$CHOST" \
 		--prefix=/usr \
 		--sysconfdir=/etc/bind \
 		--localstatedir=/var \
@@ -84,10 +84,9 @@ build() {
 		--with-libtool \
 		--with-randomdev=/dev/random \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		|| return 1
+		--infodir=/usr/share/info
 
-	make || return 1
+	make
 }
 
 package() {
@@ -95,36 +94,30 @@ package() {
 	install -d -m0770 -g named -o root "$pkgdir"/var/bind \
 		"$pkgdir"/var/bind/sec \
 		"$pkgdir"/var/bind/dyn \
-		"$pkgdir"/var/run/named \
-		|| return 1
+		"$pkgdir"/var/run/named
 
 	install -d -m0750 -g named -o root "$pkgdir"/etc/bind \
-		"$pkgdir"/var/bind/pri || return 1
+		"$pkgdir"/var/bind/pri
 
-	make -j1 DESTDIR="$pkgdir" install || return 1
-
-	# FIXME: Workaround for broken symlink handling in abuild
-	rm -f "$pkgdir"/usr/share/man/man1/bind9-config.1
-	find "$pkgdir"/usr/share/man/man3 -name 'lwres_*' \
-		-type f -exec rm -f \{\} \;
+	make -j1 DESTDIR="$pkgdir" install
 
 	install -Dm755 "$srcdir"/named.initd \
-		"$pkgdir"/etc/init.d/named || return 1
+		"$pkgdir"/etc/init.d/named
 	install -Dm644 "$srcdir"/named.confd \
-		"$pkgdir"/etc/conf.d/named || return 1
+		"$pkgdir"/etc/conf.d/named
 	install -Dm644 "$srcdir"/named.conf.authoritative \
-		"$pkgdir"/etc/bind/named.conf.authoritative || return 1
+		"$pkgdir"/etc/bind/named.conf.authoritative
 	install -Dm644 "$srcdir"/named.conf.recursive \
-		"$pkgdir"/etc/bind/named.conf.recursive || return 1
+		"$pkgdir"/etc/bind/named.conf.recursive
 	install -Dm644 "$srcdir"/named.ca \
-		"$pkgdir"/var/bind/named.ca || return 1
+		"$pkgdir"/var/bind/named.ca
 	install -Dm644 "$srcdir"/127.zone \
-		"$pkgdir"/var/bind/pri/127.zone || return 1
+		"$pkgdir"/var/bind/pri/127.zone
 	install -Dm644 "$srcdir"/localhost.zone \
-		"$pkgdir"/var/bind/pri/localhost.zone || return 1
+		"$pkgdir"/var/bind/pri/localhost.zone
 
 	cd "$pkgdir"/var/bind
-	ln -s named.ca root.cache || return 1
+	ln -s named.ca root.cache
 }
 
 tools() {
@@ -134,16 +127,16 @@ tools() {
 
 	mkdir -p "$subpkgdir"/usr/bin
 	for i in dig host nslookup delv nsupdate; do
-		mv "$pkgdir"/usr/bin/${i} "$subpkgdir"/usr/bin/ || return 1
+		mv "$pkgdir"/usr/bin/${i} "$subpkgdir"/usr/bin/
 	done
 
 	mkdir -p "$subpkgdir"/usr/sbin
 	for i in "$pkgdir"/usr/sbin/dnssec-*; do
-		mv "$i" "$subpkgdir"/usr/sbin || return 1
+		mv "$i" "$subpkgdir"/usr/sbin
 	done
 }
 
-sha512sums="168f27f580e3be2f7ada27afa2f72e715e750eec76831cf01bd32fabc1fa65dc29dab0eb7ed1682b076d3be99269897ddbc2c10551631a3911d9e5ae1aa40597  bind-9.11.2-P1.tar.gz
+sha512sums="4b6f1b8830f57cdffcbd3c4cfb965b978d8c6e99fa40aae8276ea2741ef47d336e1edf8fb33a01a8a5d7e0efd910adae7645152e948c5728f08fa103b2b230f3  bind-9.12.0.tar.gz
 f3e3d1b680617485b9db20a59a10fec3b3b539d423984493228a7d5aaa29d699b9012ad60e863e56bdaf15b73952c22710d0ded1c86cd24417ac775ee062cfa3  bind.so_bsdcompat.patch
 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015  named.initd
 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf  named.confd