From c82951d8a5ec91611f41e0efdf36b48959449729 Mon Sep 17 00:00:00 2001
From: Cameron Nemo <camerontnorman@gmail.com>
Date: Fri, 14 Dec 2018 16:47:32 -0800
Subject: [PATCH] ufw: update to 0.36.

closes #5882
---
 .../0001-use-default-tcp-syncookies.patch     | 15 -------
 srcpkgs/ufw/patches/0002-lp1633698.patch      | 19 --------
 srcpkgs/ufw/template                          | 44 ++++++++-----------
 3 files changed, 19 insertions(+), 59 deletions(-)
 delete mode 100644 srcpkgs/ufw/patches/0001-use-default-tcp-syncookies.patch
 delete mode 100644 srcpkgs/ufw/patches/0002-lp1633698.patch

diff --git a/srcpkgs/ufw/patches/0001-use-default-tcp-syncookies.patch b/srcpkgs/ufw/patches/0001-use-default-tcp-syncookies.patch
deleted file mode 100644
index fab037af0a..0000000000
--- a/srcpkgs/ufw/patches/0001-use-default-tcp-syncookies.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Origin: r972
-Description: don't override distribution defaults for TCP syncookies
-Index: ufw-0.35/conf/sysctl.conf
-===================================================================
---- ufw-0.35.orig/conf/sysctl.conf
-+++ ufw-0.35/conf/sysctl.conf
-@@ -39,7 +39,7 @@ net/ipv4/conf/all/log_martians=0
-
- # Change to '1' to enable TCP/IP SYN cookies This disables TCP Window Scaling
- # (http://lkml.org/lkml/2008/2/5/167)
--net/ipv4/tcp_syncookies=0
-+#net/ipv4/tcp_syncookies=1
-
- #net/ipv4/tcp_fin_timeout=30
- #net/ipv4/tcp_keepalive_intvl=1800
diff --git a/srcpkgs/ufw/patches/0002-lp1633698.patch b/srcpkgs/ufw/patches/0002-lp1633698.patch
deleted file mode 100644
index 815def8a6d..0000000000
--- a/srcpkgs/ufw/patches/0002-lp1633698.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Origin: r962
-Description: adjust ufw6-before-output rules for echo-reply and echo-request
-Bug-Ubuntu: https://launchpad.net/bugs/1633698
-
-Index: ufw-0.35/conf/before6.rules
-===================================================================
---- ufw-0.35.orig/conf/before6.rules
-+++ ufw-0.35/conf/before6.rules
-@@ -77,8 +77,8 @@
- -A ufw6-before-output -p icmpv6 --icmpv6-type time-exceeded -j ACCEPT
- # codes 0-2
- -A ufw6-before-output -p icmpv6 --icmpv6-type parameter-problem -j ACCEPT
---A ufw6-before-input -p icmpv6 --icmpv6-type echo-request -j ACCEPT
---A ufw6-before-input -p icmpv6 --icmpv6-type echo-reply -j ACCEPT
-+-A ufw6-before-output -p icmpv6 --icmpv6-type echo-request -j ACCEPT
-+-A ufw6-before-output -p icmpv6 --icmpv6-type echo-reply -j ACCEPT
- -A ufw6-before-output -p icmpv6 --icmpv6-type router-solicitation -m hl --hl-eq 255 -j ACCEPT
- -A ufw6-before-output -p icmpv6 --icmpv6-type neighbor-advertisement -m hl --hl-eq 255 -j ACCEPT
- -A ufw6-before-output -p icmpv6 --icmpv6-type neighbor-solicitation -m hl --hl-eq 255 -j ACCEPT
diff --git a/srcpkgs/ufw/template b/srcpkgs/ufw/template
index 218ae8826f..82732ae8c2 100644
--- a/srcpkgs/ufw/template
+++ b/srcpkgs/ufw/template
@@ -1,35 +1,29 @@
 # Template file for 'ufw'
 pkgname=ufw
-version=0.35
-revision=6
-hostmakedepends="python iptables"
-depends="$hostmakedepends"
+version=0.36
+revision=1
 noarch=yes
+build_style=python3-module
 pycompile_module="ufw"
+conf_files="
+ /etc/ufw/*.conf
+ /etc/ufw/*.rules
+ /etc/ufw/applications.d/*"
+hostmakedepends="python3-setuptools iptables"
+depends="iptables"
 short_desc="Uncomplicated Firewall"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 homepage="https://launchpad.net/ufw"
 license="GPL-3.0-only"
-distfiles="http://launchpad.net/ufw/${version}/${version}/+download/ufw-${version}.tar.gz"
-checksum=662f865bc83bf8aa1a40a6fe578bc2ce796ff60a1be2c1103def7db1b91f8509
-patch_args="-p1"
-conf_files="
- /etc/ufw/after.init
- /etc/ufw/after.rules
- /etc/ufw/after6.rules
- /etc/ufw/before.init
- /etc/ufw/before.rules
- /etc/ufw/before6.rules
- /etc/ufw/sysctl.conf
- /etc/ufw/ufw.conf
- /etc/ufw/user.rules
- /etc/ufw/user6.rules
- /etc/ufw/applications.d/*"
+homepage="https://launchpad.net/ufw"
+distfiles="https://launchpad.net/ufw/${version}/${version}/+download/ufw-${version}.tar.gz"
+checksum=754b22ae5edff0273460ac9f57509c3938187e0cf4fb9692c6a02833fff33cfc
 
-do_install() {
-	sed -e 's|/lib|/usr/lib|' -i setup.py
-	python2 setup.py install --root=$DESTDIR
-	vmkdir usr/bin
-	vsv ufw
-	mv ${DESTDIR}/usr/sbin/* ${DESTDIR}/usr/bin
+pre_configure() {
+	sed -i -e 's|/lib|/usr/lib|' setup.py
+	sed -i -e 's|sbin|bin|' setup.py
+}
+
+post_install() {
+	vsv ufw
 }