Shorewall: Change path to prevent busybox/ip detection before ip-tiny/full.

Signed-off-by: W. van den Akker <redacted>

diff --git a/net/shorewall/Makefile b/net/shorewall/Makefile
index f8f7af75173e290d08e3f9725b1858c11bb934d9..c73408e54cd543629c37f37b30788268dfe2de5f 100644 (file)
--- 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 e36019dc8790b3a9833ede5d72b1f759dbd3f288..5b65ff04ceba18926d99f96b4ecb70113a8b0b85 100644 (file)
--- 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 (file)
index 0000000..a7890e6
--- /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
+