Merge pull request #7557 from wvdakker/master

Shorewall: Bump to version 5.2.1.2

7 files changed, 18 insertions, 18 deletions

diff --git a/net/shorewall-core/Makefile b/net/shorewall-core/Makefile
index 35bda4830..77f2079fa 100644
--- a/net/shorewall-core/Makefile
+++ b/net/shorewall-core/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=shorewall-core
 PKG_MAJOR_MINOR_VERSION:=5.2
 PKG_BUGFIX_MAJOR_VERSION:=1
-PKG_BUGFIX_MINOR_VERSION:=.1
+PKG_BUGFIX_MINOR_VERSION:=.2
 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:=7c3c3bbed2adacfda91c9eb1b226be8fb9cd32dc8231153ef1ea944528338a36
+PKG_HASH:=f84852b86c82487f270172f2d00d13b83255dc05eee9be1e8b76fe7b600021b5
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0+
diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile
index 9aa869215..384f885a3 100644
--- a/net/shorewall-lite/Makefile
+++ b/net/shorewall-lite/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=shorewall-lite
 PKG_MAJOR_MINOR_VERSION:=5.2
 PKG_BUGFIX_MAJOR_VERSION:=1
-PKG_BUGFIX_MINOR_VERSION:=.1
+PKG_BUGFIX_MINOR_VERSION:=.2
 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:=101f9dc52abecd616a9e7d7e3b6e4b5a96545c153680e34e51ed2a2baf9af548
+PKG_HASH:=8c3ac19563847b30a064fc64f0fd8e64f61db03dc6b9ff28609876dce13af806
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0+
diff --git a/net/shorewall-lite/patches/010-install_cp.patch b/net/shorewall-lite/patches/010-install_cp.patch
index 4e47198f4..6e9e264d2 100644
--- a/net/shorewall-lite/patches/010-install_cp.patch
+++ b/net/shorewall-lite/patches/010-install_cp.patch
@@ -1,8 +1,8 @@
-Index: shorewall-lite-5.1.7.2/install.sh
+Index: shorewall-lite-5.2.1.2/install.sh
 ===================================================================
---- shorewall-lite-5.1.7.2.orig/install.sh	2017-10-11 08:15:57.201324746 +0200
-+++ shorewall-lite-5.1.7.2/install.sh	2017-10-11 08:15:57.197324953 +0200
-@@ -492,7 +492,7 @@
+--- shorewall-lite-5.2.1.2.orig/install.sh	2018-12-02 22:24:48.432796798 +0100
++++ shorewall-lite-5.2.1.2/install.sh	2018-12-02 22:24:48.424797192 +0100
+@@ -500,7 +500,7 @@
  if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then
      [ ${DESTDIR} ] && make_parent_directory ${DESTDIR}${SYSCONFDIR} 0755
  
diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile
index b7bf0c68e..c0fa621b0 100644
--- a/net/shorewall/Makefile
+++ b/net/shorewall/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=shorewall
 PKG_MAJOR_MINOR_VERSION:=5.2
 PKG_BUGFIX_MAJOR_VERSION:=1
-PKG_BUGFIX_MINOR_VERSION:=.1
+PKG_BUGFIX_MINOR_VERSION:=.2
 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:=6ce8c126155ab2615ffe97d0164cd12db7b523f8a83c182ee50c7b0494f161de
+PKG_HASH:=07a914270d169261deff6cc835a031ec187de2575c5476e3bd55224a4855fc64
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0+
diff --git a/net/shorewall6-lite/Makefile b/net/shorewall6-lite/Makefile
index 07f117cfa..b415ae86e 100644
--- a/net/shorewall6-lite/Makefile
+++ b/net/shorewall6-lite/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=shorewall6-lite
 PKG_MAJOR_MINOR_VERSION:=5.2
 PKG_BUGFIX_MAJOR_VERSION:=1
-PKG_BUGFIX_MINOR_VERSION:=.1
+PKG_BUGFIX_MINOR_VERSION:=.2
 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:=4594cbd7e631a9c266d0be2ff05976851a5fde30e5c407daa4bf7ed22e998277
+PKG_HASH:=859995c6cf86d5f865b842b130ce7bd0c3acfa9efdeedc8484287cab5c94cb03
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0+
diff --git a/net/shorewall6-lite/patches/010-install_cp.patch b/net/shorewall6-lite/patches/010-install_cp.patch
index 2be37014b..913be5437 100644
--- a/net/shorewall6-lite/patches/010-install_cp.patch
+++ b/net/shorewall6-lite/patches/010-install_cp.patch
@@ -1,8 +1,8 @@
-Index: shorewall6-lite-5.1.7.2/install.sh
+Index: shorewall6-lite-5.2.1.2/install.sh
 ===================================================================
---- shorewall6-lite-5.1.7.2.orig/install.sh	2017-10-11 15:34:43.612217209 +0200
-+++ shorewall6-lite-5.1.7.2/install.sh	2017-10-11 15:34:43.608217428 +0200
-@@ -492,7 +492,7 @@
+--- shorewall6-lite-5.2.1.2.orig/install.sh	2018-12-02 22:31:46.628225916 +0100
++++ shorewall6-lite-5.2.1.2/install.sh	2018-12-02 22:31:46.624226113 +0100
+@@ -500,7 +500,7 @@
  if [ -n "$SYSCONFFILE" -a -f "$SYSCONFFILE" -a ! -f ${DESTDIR}${SYSCONFDIR}/${PRODUCT} ]; then
      [ ${DESTDIR} ] && make_parent_directory ${DESTDIR}${SYSCONFDIR} 0755
  
diff --git a/net/shorewall6/Makefile b/net/shorewall6/Makefile
index 6f4675027..ee1cdb356 100644
--- a/net/shorewall6/Makefile
+++ b/net/shorewall6/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=shorewall6
 PKG_MAJOR_MINOR_VERSION:=5.2
 PKG_BUGFIX_MAJOR_VERSION:=1
-PKG_BUGFIX_MINOR_VERSION:=.1
+PKG_BUGFIX_MINOR_VERSION:=.2
 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:=019bcb0f2fe2c10cb7b35e0e165abd61dd7214ea07d0d49a29f7b998a4fa99d8
+PKG_HASH:=4f6fc8e9a3494ee6b67ee47e327fccfb8e56b392ea9f7f65344d1b8adaa38018
 
 PKG_MAINTAINER:=Willem van den Akker <wvdakker@wilsoft.nl>
 PKG_LICENSE:=GPL-2.0+