From 62c3b17783836db520d882a87b9a6f9818302b7c Mon Sep 17 00:00:00 2001
From: Steve Prybylski <sa.prybylx@gmail.com>
Date: Fri, 16 Oct 2015 16:37:13 -0400
Subject: [PATCH 1/2] shorewall: update to 5.0.1.

---
 srcpkgs/shorewall/template | 71 +++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/shorewall/template b/srcpkgs/shorewall/template
index 034b065e0c..9aa6f3caf5 100644
--- a/srcpkgs/shorewall/template
+++ b/srcpkgs/shorewall/template
@@ -1,20 +1,20 @@
 # Template file for 'shorewall'
 pkgname=shorewall
-version=4.6.8.1
+version=5.0.1
 revision=1
-_disturl="http://www.shorewall.net/pub/${pkgname}/4.6/${pkgname}-${version%.*}"
+_disturl="http://www.shorewall.net/pub/${pkgname}/${version%.*}/${pkgname}-${version}"
 distfiles="
  ${_disturl}/${pkgname}-${version}.tar.bz2
  ${_disturl}/${pkgname}6-${version}.tar.bz2
  ${_disturl}/${pkgname}-core-${version}.tar.bz2"
 checksum="
- 30d87605ea40143137ef41a21fc63613bddebad5de5bab23c42da41cc6c6f40d
- 29da1b7597958193933ef3341dfe03a4b935d248b498f5eaa6484120d3a1351c
- 9c7fcd4c3cf11ca9aa1f430e05acc4fed40946cbb34b204d6257ca83802d945c"
+ 1b5147d5ecb1ccf950785c239a6b6db47fa694cde229ad7d4eaea2e3fcc2a4ee
+ 466b6486cb992385443e46158afab60d669e6e5f774f68b0754d2b394feaf740
+ fd2c764f34f02b923ad4a2c5b4017b9b96df2c6886710254f2e2771e3b007a0b"
 depends="shorewall-core perl"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.shorewall.net/"
-license="GPL"
+license="GPL-2"
 short_desc="An iptables-based firewall for Linux systems"
 
 noarch="yes"
@@ -23,6 +23,7 @@ make_dirs="/var/lib/${pkgname} 0755 0 0"
 conf_files="
  /etc/shorewall/accounting
  /etc/shorewall/actions
+ /etc/shorewall/arprules
  /etc/shorewall/blrules
  /etc/shorewall/clear
  /etc/shorewall/conntrack
@@ -34,6 +35,7 @@ conf_files="
  /etc/shorewall/interfaces
  /etc/shorewall/lib.private
  /etc/shorewall/maclist
+ /etc/shorewall/mangle
  /etc/shorewall/masq
  /etc/shorewall/nat
  /etc/shorewall/netmap
@@ -61,45 +63,44 @@ conf_files="
  /etc/shorewall/tcfilters
  /etc/shorewall/tcinterfaces
  /etc/shorewall/tcpri
- /etc/shorewall/tos
  /etc/shorewall/tunnels
  /etc/shorewall/zones"
 
 do_build(){
-    for product in ${pkgname}{-core,6,}-${version}; do
-        cd ${wrksrc}/${product}
-        ./configure HOST=archlinux SBINDIR=/usr/bin
-    done
+	for product in ${pkgname}{-core,6,}-${version}; do
+		cd ${wrksrc}/${product}
+		./configure HOST=archlinux SBINDIR=/usr/bin SERVICEDIR=
+	done
 }
 
 do_install() {
-    cd ${wrksrc}/${pkgname}-${version}
-    DESTDIR="${DESTDIR}" ./install.sh
-    vmkdir usr/share/doc/${pkgname}
-    cp -r Samples ${PKGDESTDIR}/usr/share/doc/${pkgname}
-    vsv shorewall
+	cd ${wrksrc}/${pkgname}-${version}
+	DESTDIR="${DESTDIR}" ./install.sh
+	vmkdir usr/share/doc/${pkgname}
+	cp -r Samples ${PKGDESTDIR}/usr/share/doc/${pkgname}
+	vsv shorewall
 }
 
 shorewall-core_package() {
-    noarch="yes"
-    depends="iptables iproute2"
-    short_desc+=" - Core Shorewall files"
-    pkg_install() {
-        cd ${wrksrc}/${pkgname}-${version}
-        DESTDIR="${PKGDESTDIR}" ./install.sh
-    }
+	noarch="yes"
+	depends="iptables iproute2"
+	short_desc+=" - Core Shorewall files"
+	pkg_install() {
+		cd ${wrksrc}/${pkgname}-${version}
+		DESTDIR="${PKGDESTDIR}" ./install.sh
+	}
 }
 shorewall6_package() {
-    noarch="yes"
-    depends="shorewall"
-    short_desc+=" - IPv6 support"
-    make_dirs="/var/lib/${pkgname} 0755 0 0"
-    pkg_install() {
-        cd ${wrksrc}/${pkgname}-${version}
-        DESTDIR="${PKGDESTDIR}" ./install.sh
-        vsv shorewall6
-    }
-    for f in ${PKGDESTDIR}/etc/${pkgname}/*; do
-        conf_files+="${f##${PKGDESTDIR}} "
-    done
+	noarch="yes"
+	depends="shorewall"
+	short_desc+=" - IPv6 support"
+	make_dirs="/var/lib/${pkgname} 0755 0 0"
+	pkg_install() {
+		cd ${wrksrc}/${pkgname}-${version}
+		DESTDIR="${PKGDESTDIR}" ./install.sh
+		vsv shorewall6
+	}
+	for f in ${PKGDESTDIR}/etc/${pkgname}/*; do
+		conf_files+="${f##${PKGDESTDIR}} "
+	done
 }

From 08918b8b9be9122e5480fc0ee526c0c2acb715ee Mon Sep 17 00:00:00 2001
From: Steve Prybylski <sa.prybylx@gmail.com>
Date: Fri, 16 Oct 2015 18:33:53 -0400
Subject: [PATCH 2/2] shorewall: add update file

---
 srcpkgs/shorewall/update | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 srcpkgs/shorewall/update

diff --git a/srcpkgs/shorewall/update b/srcpkgs/shorewall/update
new file mode 100644
index 0000000000..7102b7517d
--- /dev/null
+++ b/srcpkgs/shorewall/update
@@ -0,0 +1 @@
+pattern='<td>\K[\d.]+(?=</td>)'