From bf2c4a4c8fa3304b4c06650f94b59422d1636ea7 Mon Sep 17 00:00:00 2001
From: TBK <tbk@jjtc.dk>
Date: Sun, 28 Jan 2018 18:10:34 +0100
Subject: main/shorewall: upgrade to 5.1.11.1; modernize

---
 main/shorewall/APKBUILD | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/main/shorewall/APKBUILD b/main/shorewall/APKBUILD
index df9857c8f9..108d99fc5b 100644
--- a/main/shorewall/APKBUILD
+++ b/main/shorewall/APKBUILD
@@ -1,11 +1,11 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=shorewall
-pkgver=5.1.8
+pkgver=5.1.11.1
 
 _ver=$pkgver
 case $pkgver in
-*.*.*.*) _ver=${pkgver%.*};;
+	*.*.*.*) _ver=${pkgver%.*};;
 esac
 
 pkgrel=0
@@ -13,39 +13,36 @@ pkgdesc="An iptables front end for firewall configuration"
 url="http://www.shorewall.net/"
 arch="noarch"
 license="GPL-2.0"
+options="!check"
 depends="shorewall-core perl iptables iproute2"
 # coreutils for install -T
 makedepends="coreutils bash"
-replaces=""
 subpackages="$pkgname-doc"
 source="http://www.shorewall.net/pub/shorewall/${_ver%.*}/shorewall-$_ver/$pkgname-$pkgver.tar.bz2
 	shorewall.initd
 	shorewallrc.alpine
 	"
+builddir="$srcdir/$pkgname-$pkgver"
 
-_builddir="$srcdir/$pkgname-$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
+	cd "$builddir"
+
+	default_prepare	
+
 	cp "$srcdir"/shorewallrc.alpine .
 }
 
 build() {
-	cd "$_builddir"
-	./configure || return 1
+	cd "$builddir"
+	./configure
 }
 
 package() {
-	cd "$_builddir"
-	DESTDIR="$pkgdir" ./install.sh shorewallrc.alpine || return 1
+	cd "$builddir"
+	DESTDIR="$pkgdir" ./install.sh shorewallrc.alpine
 	install -Dm755 "$srcdir"/shorewall.initd "$pkgdir"/etc/init.d/shorewall
 }
 
-sha512sums="12eb3effe2f83ad1d0e38a9b342c5555700bfece8f21656b402b3d90ba4175eb058ab5a482592266432903ce829f54f071dce951c9fdbb92557a66072176888a  shorewall-5.1.8.tar.bz2
+sha512sums="c8d273e9a387a1c68ca4b1790604a25b928ef015c4ac170d9633d62acac3b38f33e6cdb50f56343750c3b7d565c361d4f5f8cdc0e0fdf7feb594dc5460b3808a  shorewall-5.1.11.1.tar.bz2
 7e226f42f74ce92d4c40bd0e812fbe744f0e343de7d7d68f59328b57829b0a10e2226fa9ef78e3465846bb2f691f761810774672b0a8510f96b80d7645982dc5  shorewall.initd
 c076ae42e7b404cecf521fdc32f92ba3a6b77d61579726abde2f00b6b6282e55b0b334b9fe5e43a6e4ae56361cce3214d9a38099f9f8714f03ae4fb888c744b7  shorewallrc.alpine"
-- 
cgit v1.2.3