Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5296 from wvdakker/set-path

Browse source 
Shorewall(6): Set path
This commit is contained in:
Hannu Nyman 2017-12-18 16:02:23 +02:00 committed by GitHub
commit 8eec9cda08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/shorewall/Makefile
View file

@ -14,7 +14,7 @@ PKG_BUGFIX_MAJOR_VERSION:=9
PKG_BUGFIX_MINOR_VERSION:= PKG_BUGFIX_MINOR_VERSION:=
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(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_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)/ \ 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)/ \ http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \

10
net/shorewall/patches/120-logfile.patch
View file

@ -1,8 +1,6 @@
Index: shorewall-5.1.4.1/configfiles/shorewall.conf --- a/configfiles/shorewall.conf
=================================================================== +++ b/configfiles/shorewall.conf
--- shorewall-5.1.4.1.orig/configfiles/shorewall.conf 2017-10-05 11:18:41.586275516 +0200 @@ -33,7 +33,7 @@ FIREWALL=
+++ shorewall-5.1.4.1/configfiles/shorewall.conf 2017-10-05 11:26:11.825609382 +0200
@@ -33,7 +33,7 @@
# L O G G I N G # L O G G I N G
############################################################################### ###############################################################################
@ -11,7 +9,7 @@ Index: shorewall-5.1.4.1/configfiles/shorewall.conf
BLACKLIST_LOG_LEVEL= BLACKLIST_LOG_LEVEL=
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@ RESTOREFILE=restore
SHOREWALL_SHELL=/bin/sh SHOREWALL_SHELL=/bin/sh

13
net/shorewall/patches/130-set-path.patch Normal file
View file

@ -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
net/shorewall6/Makefile
View file

@ -14,7 +14,7 @@ PKG_BUGFIX_MAJOR_VERSION:=9
PKG_BUGFIX_MINOR_VERSION:= PKG_BUGFIX_MINOR_VERSION:=
PKG_VERSION:=$(PKG_MAJOR_MINOR_VERSION).$(PKG_BUGFIX_MAJOR_VERSION)$(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_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)/ \ 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)/ \ http://www1.shorewall.net/pub/shorewall/$(PKG_MAJOR_MINOR_VERSION)/shorewall-$(PKG_DIRECTORY)/ \

13
net/shorewall6/patches/130-set-path.patch Normal file
View file

@ -0,0 +1,13 @@
Index: shorewall6-5.1.9/configfiles/shorewall6.conf
===================================================================
--- shorewall6-5.1.9.orig/configfiles/shorewall6.conf 2017-12-18 08:13:01.999494346 +0100
+++ shorewall6-5.1.9/configfiles/shorewall6.conf 2017-12-18 08:13:37.253618974 +0100
@@ -92,7 +92,7 @@
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"
RESTOREFILE=restore