holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Fix SHELLSHAREDIR in 4.0 Path

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6590 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-18 20:22:57 +00:00
parent cad3104555
commit dcd6a98eb9
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Shorewall-common/diff-3.4-lib.base
View File

@ -1,6 +1,6 @@
--- /home/teastep/shorewall/branches/3.4/Shorewall/lib.base 2007-06-17 14:30:30.000000000 -0700 --- /home/teastep/shorewall/branches/3.4/Shorewall/lib.base 2007-06-17 14:36:04.000000000 -0700
+++ lib.base 2007-06-17 14:36:20.000000000 -0700 +++ lib.base 2007-06-18 13:22:05.000000000 -0700
@@ -28,7 +28,7 @@ @@ -28,13 +28,13 @@
# and /usr/share/shorewall-lite/shorecap. # and /usr/share/shorewall-lite/shorecap.
# #
@ -9,6 +9,13 @@
SHOREWALL_CAPVERSION=30405 SHOREWALL_CAPVERSION=30405
[ -n "${VARDIR:=/var/lib/shorewall}" ] [ -n "${VARDIR:=/var/lib/shorewall}" ]
[ -n "${SHAREDIR:=/usr/share/shorewall}" ]
[ -n "${CONFDIR:=/etc/shorewall}" ]
-SHELLSHAREDIR=/usr/share/shorewall
+SHELLSHAREDIR=/usr/share/shorewall-shell
PERLSHAREDIR=/usr/share/shorewall-perl
#
@@ -360,6 +360,8 @@ @@ -360,6 +360,8 @@
eval loaded=\$LIB_${1}_LOADED eval loaded=\$LIB_${1}_LOADED

4
Shorewall-common/diff-3.4-shorewall
View File

@ -1,5 +1,5 @@
--- /home/teastep/shorewall/branches/3.4/Shorewall/shorewall 2007-06-18 10:56:27.000000000 -0700 --- /home/teastep/shorewall/branches/3.4/Shorewall/shorewall 2007-06-18 11:32:15.000000000 -0700
+++ shorewall 2007-06-18 10:54:54.000000000 -0700 +++ shorewall 2007-06-18 11:31:44.000000000 -0700
@@ -1305,7 +1305,7 @@ @@ -1305,7 +1305,7 @@
echo " stop" echo " stop"
echo " status" echo " status"

2
Shorewall-common/lib.base
View File

@ -34,7 +34,7 @@ SHOREWALL_CAPVERSION=30405
[ -n "${VARDIR:=/var/lib/shorewall}" ] [ -n "${VARDIR:=/var/lib/shorewall}" ]
[ -n "${SHAREDIR:=/usr/share/shorewall}" ] [ -n "${SHAREDIR:=/usr/share/shorewall}" ]
[ -n "${CONFDIR:=/etc/shorewall}" ] [ -n "${CONFDIR:=/etc/shorewall}" ]
SHELLSHAREDIR=/usr/share/shorewall SHELLSHAREDIR=/usr/share/shorewall-shell
PERLSHAREDIR=/usr/share/shorewall-perl PERLSHAREDIR=/usr/share/shorewall-perl
# #

2
Shorewall-common/releasenotes.txt
View File

@ -41,7 +41,7 @@ Other changes in Shorewall 4.0.0 Beta 6
<file> is the name of the capabilities file. <file> is the name of the capabilities file.
<version> is the current Shorewall version. <version> is the current Shorewall version.
Existing capabilities file contain no CAPVERSION. When such a file Existing capabilities files contain no CAPVERSION. When such a file
is read, Shorewall will issue this message: is read, Shorewall will issue this message:
WARNING: <file> may be not contain all of the capabilities defined WARNING: <file> may be not contain all of the capabilities defined

1
Shorewall-common/shorewall.conf
View File

@ -27,6 +27,7 @@ VERBOSITY=1
############################################################################### ###############################################################################
# C O M P I L E R # C O M P I L E R
# (setting this to 'perl' requires installation of Shorewall-perl) # (setting this to 'perl' requires installation of Shorewall-perl)
# May not be set to the value of a variable from /etc/shorewall/params
############################################################################### ###############################################################################
SHOREWALL_COMPILER= SHOREWALL_COMPILER=