From 368b434a6d7088b3cb24331cd2ad59ce749de1de Mon Sep 17 00:00:00 2001 From: "W. van den Akker" Date: Thu, 4 Jan 2018 22:38:50 +0100 Subject: [PATCH 1/5] Shorewall-core: Bump to version 5.1.10.2 Signed-off-by: W. van den Akker --- net/shorewall-core/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/shorewall-core/Makefile b/net/shorewall-core/Makefile index cc8c9cbfb..24b0fa1ee 100644 --- a/net/shorewall-core/Makefile +++ b/net/shorewall-core/Makefile @@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shorewall-core PKG_MAJOR_MINOR_VERSION:=5.1 -PKG_BUGFIX_MAJOR_VERSION:=9 -PKG_BUGFIX_MINOR_VERSION:= +PKG_BUGFIX_MAJOR_VERSION:=10 +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:=a7735b31305678e1c4d21fabb026fbd37bdb8b3e0f5d8887f60ab2969a485e46 +PKG_HASH:=33d43545b430ba48166b89ca32e375f0afc7cfafa4d4cfb020520ac4b64c400a PKG_MAINTAINER:=Willem van den Akker PKG_LICENSE:=GPL-2.0+ From 136491ccf2ce6eaacb019e097bbb658a6a085180 Mon Sep 17 00:00:00 2001 From: "W. van den Akker" Date: Thu, 4 Jan 2018 22:39:48 +0100 Subject: [PATCH 2/5] Shorewall-lite: Bump to version 5.1.10.2 Signed-off-by: W. van den Akker --- net/shorewall-lite/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/shorewall-lite/Makefile b/net/shorewall-lite/Makefile index ff05c4e7c..c3a92a8cf 100644 --- a/net/shorewall-lite/Makefile +++ b/net/shorewall-lite/Makefile @@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shorewall-lite PKG_MAJOR_MINOR_VERSION:=5.1 -PKG_BUGFIX_MAJOR_VERSION:=9 -PKG_BUGFIX_MINOR_VERSION:= +PKG_BUGFIX_MAJOR_VERSION:=10 +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:=3 +PKG_RELEASE:=1 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ @@ -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:=ed4041004f03d6d0baefa3c3f5be76c5d2e21ad7004c044a95006e95450404d5 +PKG_HASH:=d368209804fb339a7085e220049c9cc7a683c9af657c71cefe3a13423e955498 PKG_MAINTAINER:=Willem van den Akker PKG_LICENSE:=GPL-2.0+ From 78bfa86d0e94ad8c5c55a5606ce454c29f628024 Mon Sep 17 00:00:00 2001 From: "W. van den Akker" Date: Thu, 4 Jan 2018 22:40:41 +0100 Subject: [PATCH 3/5] Shorewall6-lite: Bump to version 5.1.10.2 Corrected patch 020-set-PATH. Signed-off-by: W. van den Akker --- net/shorewall6-lite/Makefile | 8 ++++---- net/shorewall6-lite/patches/020-set-PATH.patch | 2 +- net/shorewall6-lite/patches/120-logfile.patch | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/net/shorewall6-lite/Makefile b/net/shorewall6-lite/Makefile index 37f38194b..77711d79e 100644 --- a/net/shorewall6-lite/Makefile +++ b/net/shorewall6-lite/Makefile @@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shorewall6-lite PKG_MAJOR_MINOR_VERSION:=5.1 -PKG_BUGFIX_MAJOR_VERSION:=9 -PKG_BUGFIX_MINOR_VERSION:= +PKG_BUGFIX_MAJOR_VERSION:=10 +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:=3 +PKG_RELEASE:=1 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ @@ -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:=ccb2bdb749ad487cf26f5d236068b5fb736011387fae226e703e504adf6ec86d +PKG_HASH:=7971f8d906122f65ac59a782051a137d0be5f6288ed06e0fd773fb95e95d37c4 PKG_MAINTAINER:=Willem van den Akker PKG_LICENSE:=GPL-2.0+ diff --git a/net/shorewall6-lite/patches/020-set-PATH.patch b/net/shorewall6-lite/patches/020-set-PATH.patch index 3d332c10d..a75cc6905 100644 --- a/net/shorewall6-lite/patches/020-set-PATH.patch +++ b/net/shorewall6-lite/patches/020-set-PATH.patch @@ -2,7 +2,7 @@ +++ shorewall6-lite-5.1.9/shorewall6-lite.conf 2017-12-17 09:05:55.769714392 -0500 @@ -36,7 +36,7 @@ - IPTABLES= + IP6TABLES= -PATH= +PATH=/usr/sbin:/usr/bin:/sbin:/bin diff --git a/net/shorewall6-lite/patches/120-logfile.patch b/net/shorewall6-lite/patches/120-logfile.patch index 143d58397..6afb39d2a 100644 --- a/net/shorewall6-lite/patches/120-logfile.patch +++ b/net/shorewall6-lite/patches/120-logfile.patch @@ -1,7 +1,7 @@ -Index: shorewall6-lite-5.1.7.2/shorewall6-lite.conf +Index: shorewall6-lite-5.1.10.2/shorewall6-lite.conf =================================================================== ---- shorewall6-lite-5.1.7.2.orig/shorewall6-lite.conf 2017-10-11 15:36:41.037818015 +0200 -+++ shorewall6-lite-5.1.7.2/shorewall6-lite.conf 2017-10-11 15:36:41.033818232 +0200 +--- shorewall6-lite-5.1.10.2.orig/shorewall6-lite.conf 2018-01-04 22:09:34.461951267 +0100 ++++ shorewall6-lite-5.1.10.2/shorewall6-lite.conf 2018-01-04 22:10:23.559291269 +0100 @@ -28,7 +28,7 @@ # L O G G I N G ############################################################################### From cdca392155a0bd026327cf18552b1e5a0e64fa02 Mon Sep 17 00:00:00 2001 From: "W. van den Akker" Date: Thu, 4 Jan 2018 22:42:45 +0100 Subject: [PATCH 4/5] Shorewall: Bump to version 5.1.10.2 Signed-off-by: W. van den Akker --- net/shorewall/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile index 95a3ddc9a..3265661e1 100644 --- a/net/shorewall/Makefile +++ b/net/shorewall/Makefile @@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shorewall PKG_MAJOR_MINOR_VERSION:=5.1 -PKG_BUGFIX_MAJOR_VERSION:=9 -PKG_BUGFIX_MINOR_VERSION:= +PKG_BUGFIX_MAJOR_VERSION:=10 +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:=3 +PKG_RELEASE:=1 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ @@ -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:=e6375b360e370d4f3f0e161431ff93c6b7a3aa8799f5e8be8dee48b409c35007 +PKG_HASH:=c38e7894c0db663233e5ab6d2cf21951fe373bdcbc778ba19c5be20c2c7ef95d PKG_MAINTAINER:=Willem van den Akker PKG_LICENSE:=GPL-2.0+ From 7c9f4776540d0e1370838c6bc650528901af6687 Mon Sep 17 00:00:00 2001 From: "W. van den Akker" Date: Thu, 4 Jan 2018 22:43:33 +0100 Subject: [PATCH 5/5] Shorewall6: Bump to version 5.1.10.2 Signed-off-by: W. van den Akker --- net/shorewall6/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/shorewall6/Makefile b/net/shorewall6/Makefile index de3e67ea1..4935c9ac7 100644 --- a/net/shorewall6/Makefile +++ b/net/shorewall6/Makefile @@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shorewall6 PKG_MAJOR_MINOR_VERSION:=5.1 -PKG_BUGFIX_MAJOR_VERSION:=9 -PKG_BUGFIX_MINOR_VERSION:= +PKG_BUGFIX_MAJOR_VERSION:=10 +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:=3 +PKG_RELEASE:=1 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \ @@ -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:=bb07e55944800b4cc541b9ba51274110387e3e25694a24965aada7d91a4510a6 +PKG_HASH:=f86937c117346d7dbd1a1e7410cf45189a93ec7cd3f6fb5d0419b3e398b681df PKG_MAINTAINER:=Willem van den Akker PKG_LICENSE:=GPL-2.0+