Shorewall 2.0.3-RC1

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1401 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-06-15 19:35:55 +00:00
parent 0cb1824b2b
commit 1ca874db80
9 changed files with 23 additions and 13 deletions

View File

@ -93,6 +93,10 @@
# excluded from the rule by following the zone name with # excluded from the rule by following the zone name with
# "!' and a comma-separated list of sub-zone names. # "!' and a comma-separated list of sub-zone names.
# #
# When "all" is used either in the SOURCE or DEST column
# intra-zone traffic is not affected. You must add
# separate rules to handle that traffic.
#
# Except when "all" is specified, clients may be further # Except when "all" is specified, clients may be further
# restricted to a list of subnets and/or hosts by # restricted to a list of subnets and/or hosts by
# appending ":" and a comma-separated list of subnets # appending ":" and a comma-separated list of subnets
@ -123,6 +127,10 @@
# /etc/shorewall/zones, $FW to indicate the firewall # /etc/shorewall/zones, $FW to indicate the firewall
# itself or "all" # itself or "all"
# #
# When "all" is used either in the SOURCE or DEST column
# intra-zone traffic is not affected. You must add
# separate rules to handle that traffic.
#
# Except when "all" is specified, the server may be # Except when "all" is specified, the server may be
# further restricted to a particular subnet, host or # further restricted to a particular subnet, host or
# interface by appending ":" and the subnet, host or # interface by appending ":" and the subnet, host or

View File

@ -2571,10 +2571,10 @@ add_an_action()
else else
if [ -n "$loglevel" ]; then if [ -n "$loglevel" ]; then
log_rule_limit $loglevel $action $logtarget "$ratelimit" "$logtag" $userandgroup \ log_rule_limit $loglevel $action $logtarget "$ratelimit" "$logtag" $userandgroup \
$(fix_bang $proto $sports $multiport $cli $dports) $(fix_bang $proto $sports $multiport $cli $dest_interface $dports)
fi fi
run_iptables2 -A $action $proto $multiport $cli $sports \ run_iptables2 -A $action $proto $multiport $cli $dest_interface $sports \
$dports $ratelimit $userandgroup -j $target $dports $ratelimit $userandgroup -j $target
fi fi
fi fi
@ -3357,7 +3357,7 @@ add_a_rule()
if [ $COMMAND != check ]; then if [ $COMMAND != check ]; then
if [ -n "$loglevel" ]; then if [ -n "$loglevel" ]; then
log_rule_limit $loglevel $chain $logtarget "$ratelimit" "$logtag" $userandgroup \ log_rule_limit $loglevel $chain $logtarget "$ratelimit" "$logtag" $userandgroup \
$(fix_bang $proto $multiport $dest_interface $cli $sports $dports) $(fix_bang $proto $multiport $cli $dest_interface $sports $dports)
fi fi
if [ "$logtarget" != LOG ]; then if [ "$logtarget" != LOG ]; then
@ -3366,8 +3366,8 @@ add_a_rule()
$cli $sports $dports $ratelimit $userandgroup -j RETURN $cli $sports $dports $ratelimit $userandgroup -j RETURN
[ "$logtarget" != NONAT ] && \ [ "$logtarget" != NONAT ] && \
run_iptables2 -A $chain $proto $multiport $dest_interface \ run_iptables2 -A $chain $proto $multiport $cli $dest_interface \
$cli $sports $dports $ratelimit $userandgroup -j $target $sports $dports $ratelimit $userandgroup -j $target
fi fi
fi fi
fi fi

View File

@ -1 +1 @@
2.0.3-Beta1 2.0.3-RC1

View File

@ -15,7 +15,7 @@
</author> </author>
</authorgroup> </authorgroup>
<pubdate>2004-06-12</pubdate> <pubdate>2004-06-15</pubdate>
<copyright> <copyright>
<year>2001-2004</year> <year>2001-2004</year>
@ -455,7 +455,7 @@
This variable may contain a simple file name that designates the This variable may contain a simple file name that designates the
default restore script when the command doesn&#39;t specify one. To default restore script when the command doesn&#39;t specify one. To
maintain backward compatibility with Shorewall 2.0.2, if RESTOREFILE maintain backward compatibility with Shorewall 2.0.2, if RESTOREFILE
is not set or is set to the empty value (RESTOREFILE=&#34;&#34;), the is not set or is set to the empty value (RESTOREFILE=&#34;&#34;), then
the default value is <filename>restore</filename>.</para> the default value is <filename>restore</filename>.</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>

View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of # shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall. # Shoreline Firewall.
VERSION=2.0.3-Beta1 VERSION=2.0.3-RC1
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
# #
VERSION=2.0.3-Beta1 VERSION=2.0.3-RC1
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -1,4 +1,4 @@
Shorewall 2.0.3 Beta 2 Shorewall 2.0.3 RC1
---------------------------------------------------------------------- ----------------------------------------------------------------------
Problems Corrected since 2.0.2 Problems Corrected since 2.0.2

View File

@ -1,6 +1,6 @@
%define name shorewall %define name shorewall
%define version 2.0.3 %define version 2.0.3
%define release 0Beta1 %define release 0RC1
%define prefix /usr %define prefix /usr
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@ -141,6 +141,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
%changelog %changelog
* Tue Jun 15 2004 Tom Eastep tom@shorewall.net
- Updated to 2.0.2-0RC1
* Mon Jun 14 2004 Tom Eastep tom@shorewall.net * Mon Jun 14 2004 Tom Eastep tom@shorewall.net
- Added %attr spec for /etc/init.d/shorewall - Added %attr spec for /etc/init.d/shorewall
* Sat May 15 2004 Tom Eastep tom@shorewall.net * Sat May 15 2004 Tom Eastep tom@shorewall.net

View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Seattle Firewall # shown below. Simply run this script to remove Seattle Firewall
VERSION=2.0.3-Beta1 VERSION=2.0.3-RC1
usage() # $1 = exit status usage() # $1 = exit status
{ {