Merge pull request #5298 from wvdakker/master

Fixed double/missing entry in path.
This commit is contained in:
Hannu Nyman 2017-12-18 16:52:03 +02:00 committed by GitHub
commit d4ea92b721
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View file

@ -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)/ \

View file

@ -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

View file

@ -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)/ \

View file

@ -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