Shorewall: bump to version 5.1.9

Removed 010-update_install_sh.patch. Merged upstream.

Signed-off-by: W. van den Akker <redacted>

diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile
index e8d6b265281f066e88e5d2a2d40d485248ee70e0..f8f7af75173e290d08e3f9725b1858c11bb934d9 100644 (file)
--- a/net/shorewall/Makefile
+++ b/net/shorewall/Makefile
@@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall
 PKG_MAJOR_MINOR_VERSION:=5.1
-PKG_BUGFIX_MAJOR_VERSION:=8
-PKG_BUGFIX_MINOR_VERSION:=.1
+PKG_BUGFIX_MAJOR_VERSION:=9
+PKG_BUGFIX_MINOR_VERSION:=
 PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(PKG_BUGFIX_MINOR_VERSION)
 PKG_DIRECTORY:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)
 PKG_RELEASE:=1
@@ -22,7 +22,8 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION
        http://shorewall.de/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \
        http://www.shorewall.com.au/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=0ba4f22394d988a5714637444c248e542d5897e41ab5770907edf38e422fe2ff
+PKG_HASH:=e6375b360e370d4f3f0e161431ff93c6b7a3aa8799f5e8be8dee48b409c35007
+
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=COPYING

diff --git a/net/shorewall/patches/010-update_install_sh.patch b/net/shorewall/patches/010-update_install_sh.patch
deleted file mode 100644 (file)
index bd9e971..0000000
--- a/net/shorewall/patches/010-update_install_sh.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: shorewall-5.1.4.1/install.sh
-===================================================================
---- shorewall-5.1.4.1.orig/install.sh  2017-05-26 17:39:12.000000000 +0200
-+++ shorewall-5.1.4.1/install.sh       2017-06-06 19:26:46.152686822 +0200
-@@ -213,6 +213,8 @@
-               BUILD=suse
-           elif [ -f /etc/arch-release ] ; then
-               BUILD=archlinux
-+          elif [ -f ${CONFDIR}/openwrt_release ] ; then
-+              BUILD=openwrt
-           else
-               BUILD=linux
-           fi
-@@ -264,6 +266,9 @@
-     archlinux)
-       echo "Installing ArchLinux-specific configuration..."
-       ;;
-+    openwrt)
-+      echo "Installing OpenWRT-specific configuration..."
-+      ;;
-     linux)
-       ;;
-     *)