From bfb207bd0871b07b7da3af6e8619c73ddb78ad5c Mon Sep 17 00:00:00 2001 From: "W. van den Akker" Date: Mon, 18 Dec 2017 14:23:31 +0100 Subject: [PATCH] Shorewall: Change path to prevent busybox/ip detection before ip-tiny/full. Signed-off-by: W. van den Akker --- net/shorewall/Makefile | 2 +- net/shorewall/patches/120-logfile.patch | 10 ++++------ net/shorewall/patches/130-set-path.patch | 13 +++++++++++++ 3 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 net/shorewall/patches/130-set-path.patch diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile index f8f7af7517..c73408e54c 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:=1 +PKG_RELEASE:=2 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/120-logfile.patch b/net/shorewall/patches/120-logfile.patch index e36019dc87..5b65ff04ce 100644 --- a/net/shorewall/patches/120-logfile.patch +++ b/net/shorewall/patches/120-logfile.patch @@ -1,8 +1,6 @@ -Index: shorewall-5.1.4.1/configfiles/shorewall.conf -=================================================================== ---- shorewall-5.1.4.1.orig/configfiles/shorewall.conf 2017-10-05 11:18:41.586275516 +0200 -+++ shorewall-5.1.4.1/configfiles/shorewall.conf 2017-10-05 11:26:11.825609382 +0200 -@@ -33,7 +33,7 @@ +--- a/configfiles/shorewall.conf ++++ b/configfiles/shorewall.conf +@@ -33,7 +33,7 @@ FIREWALL= # L O G G I N G ############################################################################### @@ -11,7 +9,7 @@ Index: shorewall-5.1.4.1/configfiles/shorewall.conf BLACKLIST_LOG_LEVEL= -@@ -101,7 +101,7 @@ +@@ -101,7 +101,7 @@ RESTOREFILE=restore SHOREWALL_SHELL=/bin/sh diff --git a/net/shorewall/patches/130-set-path.patch b/net/shorewall/patches/130-set-path.patch new file mode 100644 index 0000000000..a7890e6f2f --- /dev/null +++ b/net/shorewall/patches/130-set-path.patch @@ -0,0 +1,13 @@ +Index: shorewall-5.1.9/configfiles/shorewall.conf +=================================================================== +--- shorewall-5.1.9.orig/configfiles/shorewall.conf 2017-12-18 08:09:12.043625770 +0100 ++++ shorewall-5.1.9/configfiles/shorewall.conf 2017-12-18 08:09:54.353402257 +0100 +@@ -93,7 +93,7 @@ + + NFACCT= + +-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin" ++PATH="/usr/sbin:/usr/bin:/sbin:/usr/bin" + + PERL=/usr/bin/perl + -- 2.30.2