Browse Source

Merge pull request #5298 from wvdakker/master

Fixed double/missing entry in path.
lilik-openwrt-22.03
Hannu Nyman 7 years ago
committed by GitHub
parent
commit
d4ea92b721
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
  1. +1
    -1
      net/shorewall/Makefile
  2. +1
    -1
      net/shorewall/patches/130-set-path.patch
  3. +1
    -1
      net/shorewall6/Makefile
  4. +1
    -1
      net/shorewall6/patches/130-set-path.patch

+ 1
- 1
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:=2
PKG_RELEASE:=3
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)/ \


+ 1
- 1
net/shorewall/patches/130-set-path.patch View File

@ -7,7 +7,7 @@ Index: shorewall-5.1.9/configfiles/shorewall.conf
NFACCT= NFACCT=
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin" -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 PERL=/usr/bin/perl

+ 1
- 1
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:=2
PKG_RELEASE:=3
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)/ \


+ 1
- 1
net/shorewall6/patches/130-set-path.patch View File

@ -7,7 +7,7 @@ Index: shorewall6-5.1.9/configfiles/shorewall6.conf
PERL=/usr/bin/perl PERL=/usr/bin/perl
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin" -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 RESTOREFILE=restore

Loading…
Cancel
Save