Shorewall6: bump to version 5.1.9

Removed 010-update_install_sh.patch. Merged upstream.

Signed-off-by: W. van den Akker <wvdakker@wilsoft.nl>

diff --git a/net/shorewall6/Makefile b/net/shorewall6/Makefile
index 770980324e9ae85f0b5c8831a57aaa3f9816e9ba..387f640132783d7faf50d740f172221ab1848d62 100644 (file)
--- a/net/shorewall6/Makefile
+++ b/net/shorewall6/Makefile
@@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shorewall6
 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:=fde5b7a9eb0d4241ef3dfb8392b93f86a974c76cec8b05bd946bc12f509aca8e
+PKG_HASH:=bb07e55944800b4cc541b9ba51274110387e3e25694a24965aada7d91a4510a6
+
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0+
 PKG_LICENSE_FILES:=COPYING

diff --git a/net/shorewall6/patches/010-update_install_sh.patch b/net/shorewall6/patches/010-update_install_sh.patch
deleted file mode 100644 (file)
index 948c365..0000000
--- a/net/shorewall6/patches/010-update_install_sh.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: shorewall6-5.1.4.1/install.sh
-===================================================================
---- shorewall6-5.1.4.1.orig/install.sh 2017-05-26 17:39:12.000000000 +0200
-+++ shorewall6-5.1.4.1/install.sh      2017-06-06 21:22:46.124285327 +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)
-       ;;
-     *)