Merge pull request #5246 from wvdakker/master
Shorewall: bump to version 5.1.9
This commit is contained in:
commit
61471e1b23
7 changed files with 17 additions and 61 deletions
|
@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=shorewall-core
|
||||
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,7 @@ 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:=0caca8dbd969e88f3f875789b3ac31985a19d39916efe15f69766a6ddd8d97ac
|
||||
PKG_HASH:=a7735b31305678e1c4d21fabb026fbd37bdb8b3e0f5d8887f60ab2969a485e46
|
||||
|
||||
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
|
||||
PKG_LICENSE:=GPL-2.0+
|
||||
|
|
|
@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=shorewall-lite
|
||||
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,7 @@ 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:=2efc424c1d4f737618f91864ba8e618328605514965e497660ee0ac9020b6048
|
||||
PKG_HASH:=ed4041004f03d6d0baefa3c3f5be76c5d2e21ad7004c044a95006e95450404d5
|
||||
|
||||
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
|
||||
PKG_LICENSE:=GPL-2.0+
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
;;
|
||||
*)
|
|
@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=shorewall6-lite
|
||||
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,7 @@ 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:=7f1b99465df8f6bc47e0bc40e413b9323a5a9d0b2576709fd28366f0af5b852e
|
||||
PKG_HASH:=ccb2bdb749ad487cf26f5d236068b5fb736011387fae226e703e504adf6ec86d
|
||||
|
||||
PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
|
||||
PKG_LICENSE:=GPL-2.0+
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
;;
|
||||
*)
|
Loading…
Reference in a new issue