forked from extern/shorewall_code
Remove capabilities file from SVN
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4271 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep
parent
9b71bcddba
commit
dc56da3828
@ -1,37 +0,0 @@
|
||||
#
|
||||
# Shorewall version 3.2 - Capabilities File
|
||||
#
|
||||
# /etc/shorewall/capabilities
|
||||
#
|
||||
# This file is used when compiling with the -e flag. It specifies
|
||||
# the capabilities of the kernel/iptables on the target system.
|
||||
# The capabilities are listed in the same order as they appear in
|
||||
# the output of "shorewall show capabilities". If the capability
|
||||
# is available, set the corresponding variable to "Yes". Otherwise
|
||||
# leave it empty.
|
||||
#
|
||||
# You may generate the contents of this file programatically using the
|
||||
# 'shorecap' program included with your Shorewall distribution. If you
|
||||
# installed using the RPM, the file will be in the Shorewall
|
||||
# documentation directory. Otherwise, please find the program in the
|
||||
# directory created when you expanded the Shorewall distribution tarball.
|
||||
|
||||
NAT_ENABLED=Yes # NAT
|
||||
MANGLE_ENABLED=Yes # Packet Mangling
|
||||
CONNTRACK_MATCH=Yes # Connection Tracking Match
|
||||
USEPKTTYPE= # Packet Type Match
|
||||
MULTIPORT=Yes # Multi-port Match
|
||||
XMULTIPORT=Yes # Extended Multi-port Match
|
||||
POLICY_MATCH=Yes # Policy Match
|
||||
PHYSDEV_MATCH=Yes # Physdev Match
|
||||
LENGTH_MATCH=Yes # Packet Length Match
|
||||
IPRANGE_MATCH=Yes # IP range Match
|
||||
RECENT_MATCH=Yes # Recent Match
|
||||
OWNER_MATCH=Yes # Owner match
|
||||
IPSET_MATCH= # Ipset Match
|
||||
CONNMARK=Yes # CONNMARK Target
|
||||
CONNMARK_MATCH=Yes # Connmark Match
|
||||
RAW_TABLE=Yes # Raw Table
|
||||
IPP2P_MATCH= # IPP2P Match
|
||||
CLASSIFY_TARGET=Yes # CLASSIFY Target
|
||||
ENHANCED_REJECT=Yes # Extended REJECT
|
||||
@ -10,6 +10,8 @@ Changes in 3.3.0
|
||||
|
||||
5) Fixed modules/xmodules snafu.
|
||||
|
||||
6) Correct handling of CONFIG_PATH when EXPORT=Yes.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -8223,7 +8223,10 @@ __EOF__
|
||||
if [ \${LIBVERSION:-0} -lt 30191 ]; then
|
||||
fatal_error "This script requires Shorewall Lite version 3.2.0-RC2 or later; current version is \$version"
|
||||
fi
|
||||
|
||||
#
|
||||
# These variables are required by the library functions called in this script
|
||||
#
|
||||
CONFIG_PATH="/etc/shorewall-lite:/usr/share/shorewall-lite"
|
||||
__EOF__
|
||||
else
|
||||
cat >&3 << __EOF__
|
||||
@ -8236,14 +8239,14 @@ __EOF__
|
||||
if [ \${LIBVERSION:-0} -lt 30191 ]; then
|
||||
fatal_error "This script requires Shorewall version 3.2.0-Beta7 or later; current version is \$version"
|
||||
fi
|
||||
|
||||
#
|
||||
# These variables are required by the library functions called in this script
|
||||
#
|
||||
CONFIG_PATH="$CONFIG_PATH"
|
||||
__EOF__
|
||||
fi
|
||||
|
||||
cat >&3 << __EOF__
|
||||
#
|
||||
# These variables are required by the library functions called in this script
|
||||
#
|
||||
[ -n "\${COMMAND:=restart}" ]
|
||||
[ -n "\${VERBOSE:=0}" ]
|
||||
MODULESDIR="$MODULESDIR"
|
||||
@ -8266,7 +8269,6 @@ __EOF__
|
||||
cat >&3 << __EOF__
|
||||
RESTOREFILE="$RESTOREFILE"
|
||||
VERSION="$VERSION"
|
||||
CONFIG_PATH="$CONFIG_PATH"
|
||||
SUBSYSLOCK="$SUBSYSLOCK"
|
||||
PATH="$PATH"
|
||||
TERMINATOR=fatal_error
|
||||
|
||||
@ -258,7 +258,7 @@ chmod 755 ${PREFIX}/usr/share/shorewall/configfiles
|
||||
#
|
||||
run_install $OWNERSHIP -m 0644 shorewall.conf ${PREFIX}/usr/share/shorewall/configfiles/shorewall.conf
|
||||
|
||||
qt mywhich perl && perl -p -w -i -e 's|^CONFIG_PATH=.*|CONFIG_PATH=/usr/share/shorewall-lite:/usr/share/shorewall/configfiles:/usr/share/shorewall|;' /usr/share/shorewall/configfiles/shorewall.conf
|
||||
qt mywhich perl && perl -p -w -i -e 's|^CONFIG_PATH=.*|CONFIG_PATH=/usr/share/shorewall/configfiles:/usr/share/shorewall|;' /usr/share/shorewall/configfiles/shorewall.conf
|
||||
|
||||
if [ ! -f ${PREFIX}/etc/shorewall/shorewall.conf ]; then
|
||||
run_install $OWNERSHIP -m 0644 shorewall.conf ${PREFIX}/etc/shorewall/shorewall.conf
|
||||
@ -414,15 +414,11 @@ fi
|
||||
#
|
||||
# Install the Modules files
|
||||
#
|
||||
if [ ! -f ${PREFIX}/usr/share/shorewall/modules ]; then
|
||||
run_install $OWNERSHIP -m 0600 modules ${PREFIX}/usr/share/shorewall/modules
|
||||
echo "Modules file installed as ${PREFIX}/usr/share/shorewall/modules"
|
||||
fi
|
||||
run_install $OWNERSHIP -m 0600 modules ${PREFIX}/usr/share/shorewall/modules
|
||||
echo "Modules file installed as ${PREFIX}/usr/share/shorewall/modules"
|
||||
|
||||
if [ ! -f ${PREFIX}/usr/share/shorewall/xmodules ]; then
|
||||
run_install $OWNERSHIP -m 0600 xmodules ${PREFIX}/usr/share/shorewall/xmodules
|
||||
echo "Xmodules file installed as ${PREFIX}/usr/share/shorewall/xmodules"
|
||||
fi
|
||||
run_install $OWNERSHIP -m 0600 xmodules ${PREFIX}/usr/share/shorewall/xmodules
|
||||
echo "Xmodules file installed as ${PREFIX}/usr/share/shorewall/xmodules"
|
||||
|
||||
#
|
||||
# Install the TC Rules file
|
||||
|
||||
@ -33,12 +33,7 @@ Note to users upgrading from Shorewall 2.x or 3.0
|
||||
|
||||
Problems Corrected in 3.3.0
|
||||
|
||||
1) The output formatting of the 'hits' command under BusyBox 1.2.0 has
|
||||
been corrected.
|
||||
|
||||
2) The output of the 'hits' command was previously scrambled if
|
||||
/etc/services contained spaces as column delimiters rather than
|
||||
tabs.
|
||||
None.
|
||||
|
||||
Other changes in 3.3.0
|
||||
|
||||
@ -54,9 +49,6 @@ Migration Considerations:
|
||||
removed. Please use ipsets to implement dynamic zones as described
|
||||
in http://www.shorewall.net/DynamicZones.html.
|
||||
|
||||
2) Shorewall no longer requires extended MARK support to use the 'track'
|
||||
provider option when HIGH_ROUTE_MARKS=No.
|
||||
|
||||
New Features:
|
||||
|
||||
None.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user