main/unbound: upgrade to 1.5.8

main/unbound/APKBUILD

@@ -2,8 +2,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=unbound
-pkgver=1.5.7
-pkgrel=1
+pkgver=1.5.8
+pkgrel=0
 pkgdesc="Unbound is a validating, recursive, and caching DNS resolver"
 pkgusers="unbound"
 pkggroups="unbound"
@@ -17,23 +17,12 @@ install="$pkgname.pre-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-dbg py-unbound:py $pkgname-migrate"
 source="http://unbound.net/downloads/unbound-$pkgver.tar.gz
 	conf.patch
-	swig.patch
 	update-unbound-root-hints
 	migrate-dnscache-to-unbound
 	root.hints
 	unbound.initd"
 
-_builddir="$srcdir"/unbound-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
+_builddir="$srcdir"/$pkgname-$pkgver
 build() {
 	cd "$_builddir"
 	./configure \
@@ -58,7 +47,8 @@ build() {
 		|| return 1
 
 	# do not link to libpython
-	sed -i -e '/^LIBS=/s/-lpython.*[[:space:]]/ /' Makefile
+	sed -e '/^LIBS=/s/-lpython.*[[:space:]]/ /' \
+		-i Makefile || return 1
 
 	make || return 1
 }
@@ -105,23 +95,20 @@ migrate() {
 		"$subpkgdir"/usr/bin/
 }
 
-md5sums="a1253cbbb339dbca03404dcc58365d71  unbound-1.5.7.tar.gz
+md5sums="1c34282bae0c625b86374ee9caaef6f7  unbound-1.5.8.tar.gz
 0b8eea5cab939465cfde0ed0ebeed9a9  conf.patch
-deb0a18f2250caa53750ee2cecac71e9  swig.patch
 c1c71cd0e7f9630536a2abf2513c675d  update-unbound-root-hints
 5340681e5ec1a1fd47a0de27f5c03c21  migrate-dnscache-to-unbound
 a1d7e8e26cf5697de1da80f1d6b52c67  root.hints
 b98eded68339fc605ec7e6cbb50e5aa3  unbound.initd"
-sha256sums="4b2088e5aa81a2d48f6337c30c1cf7e99b2e2dc4f92e463b3bee626eee731ca8  unbound-1.5.7.tar.gz
+sha256sums="33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be  unbound-1.5.8.tar.gz
 7399f4efd0ad3866065ef7003d4be891c80a00584f67dc10da9773bed194c63f  conf.patch
-d131e19129744f7014167d8701cb39c8358269a89b317b8a74dacfd267e1f516  swig.patch
 0db3ca197b62901fab984cb2559925adbf3307ccd1dca3e1dd69cd1642ff0a36  update-unbound-root-hints
 582851b4017044d8642c42c5df09b27494c963e1eebb8be3373b2dbd168d0ac0  migrate-dnscache-to-unbound
 f2dd3ea44863ccd6f2b3089c5b98432a2ce6615a0b4c7c4350cbc23666a5d32d  root.hints
 d9997000449179dc16f5084bf061453faf09094f843acb1d163757f8000c0cd7  unbound.initd"
-sha512sums="7fc000364139519ed837ef9883f2e8a684b5ac19f2d3343626ab0a4c3459a7c3ccf2c79e9d992d82b123c6a38245fc286994365b427145d218e0b3c645c4dc4f  unbound-1.5.7.tar.gz
+sha512sums="0c296a2e5489fae0fdf0ca2ea11ed72f00498c8499f38f308ff32078665d980a2d5a80ee0e106273dc13a146611a238553857c5f301fe9622072382c06b8434a  unbound-1.5.8.tar.gz
 90faa8bf352132b63f6b33cd7d7cac164df331272568e7a442d92e021fcf727334f6e28c11ed211bcd3eb62aa606c110e4931b514fecf388d0fbea3810b7530a  conf.patch
-7d2666363be7156b26fd857459492f6e78fbc24bd6923dd51477e09df938d8c617035e4aa8bf91ffcde384e2dff8225eced14d7aaa7690e3a95b34c5f21eaf7d  swig.patch
 0f80b507a8f71b0c00729501d861657ce91a57024cd1963c150d0630c71eccceba370d6e732ff39bb807713672550d87a8c8ecdb9fce6b8b4386c12689603700  update-unbound-root-hints
 b26a13c1c88da9611a65705dc59f7233c5e0f6aced0d7d66c18536a969a2de627ca5d4bb55eedd81f2f040fa11bde48eaaeca2850f376e72e7a531678a259131  migrate-dnscache-to-unbound
 1c00f53e9d3a3dcbad7c053a5a7d4dedefb12a6b4730b357178b62de7b8cfce42ceed08232a050a3d802c12324a89cd24ced0346b5099a0d8975be4b595105b7  root.hints

main/unbound/swig.patch

---- ./Makefile.in.orig
-+++ ./Makefile.in
-@@ -394,7 +394,7 @@
- 	unbound.h
- libunbound/python/libunbound_wrap.c:	$(srcdir)/libunbound/python/libunbound.i unbound.h
- 	@-if test ! -d libunbound/python; then $(INSTALL) -d libunbound/python; fi
--	$(SWIG) -python -o $@ $(CPPFLAGS) -DPY_MAJOR_VERSION=$(PY_MAJOR_VERSION) $(srcdir)/libunbound/python/libunbound.i
-+	$(SWIG) -python -o $@ "$(CPPFLAGS)" -DPY_MAJOR_VERSION=$(PY_MAJOR_VERSION) $(srcdir)/libunbound/python/libunbound.i
- 
- # Pyunbound python unbound wrapper
- _unbound.la:	libunbound_wrap.lo libunbound.la