From 8723e3901e9571bc74e7d0eeded15d1432278c01 Mon Sep 17 00:00:00 2001 From: "W. van den Akker" Date: Mon, 18 Dec 2017 15:32:31 +0100 Subject: [PATCH 1/2] Shorewall: Fix double/missing entry in path. Signed-off-by: W. van den Akker --- net/shorewall/Makefile | 2 +- net/shorewall/patches/130-set-path.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile index c73408e54..95a3ddc9a 100644 --- a/net/shorewall/Makefile +++ b/net/shorewall/Makefile @@ -14,7 +14,7 @@ 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:=2 +PKG_RELEASE:=3 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)/ \ diff --git a/net/shorewall/patches/130-set-path.patch b/net/shorewall/patches/130-set-path.patch index a7890e6f2..78e0c672a 100644 --- a/net/shorewall/patches/130-set-path.patch +++ b/net/shorewall/patches/130-set-path.patch @@ -7,7 +7,7 @@ Index: shorewall-5.1.9/configfiles/shorewall.conf NFACCT= -PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin" -+PATH="/usr/sbin:/usr/bin:/sbin:/usr/bin" ++PATH="/usr/sbin:/usr/bin:/sbin:/bin" PERL=/usr/bin/perl From 597a4fc5bb62680c110c290916708988fa0ae6d2 Mon Sep 17 00:00:00 2001 From: "W. van den Akker" Date: Mon, 18 Dec 2017 15:33:50 +0100 Subject: [PATCH 2/2] Shorewall6: Fix double/missing entry in path. Signed-off-by: W. van den Akker --- net/shorewall6/Makefile | 2 +- net/shorewall6/patches/130-set-path.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/shorewall6/Makefile b/net/shorewall6/Makefile index 952268d19..de3e67ea1 100644 --- a/net/shorewall6/Makefile +++ b/net/shorewall6/Makefile @@ -14,7 +14,7 @@ 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:=2 +PKG_RELEASE:=3 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)/ \ diff --git a/net/shorewall6/patches/130-set-path.patch b/net/shorewall6/patches/130-set-path.patch index 24c1a9c3a..f020ae7e6 100644 --- a/net/shorewall6/patches/130-set-path.patch +++ b/net/shorewall6/patches/130-set-path.patch @@ -7,7 +7,7 @@ Index: shorewall6-5.1.9/configfiles/shorewall6.conf PERL=/usr/bin/perl -PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin" -+PATH="/usr/sbin:/usr/bin:/sbin:/usr/bin" ++PATH="/usr/sbin:/usr/bin:/sbin:/bin" RESTOREFILE=restore