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

Update Version to Beta3

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5276 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-01-22 16:04:11 +00:00
parent 9a552c06b1
commit 9b1e179b6b
12 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-lite/fallback.sh
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=3.4.0-Beta2 VERSION=3.4.0-Beta3
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall-lite/install.sh
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=3.4.0-Beta2 VERSION=3.4.0-Beta3
usage() # $1 = exit status usage() # $1 = exit status
{ {

4
Shorewall-lite/shorewall-lite.spec
View File

@ -1,6 +1,6 @@
%define name shorewall-lite %define name shorewall-lite
%define version 3.4.0 %define version 3.4.0
%define release 0Beta2 %define release 0Beta3
%define prefix /usr %define prefix /usr
Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
@ -99,6 +99,8 @@ fi
%doc COPYING changelog.txt releasenotes.txt %doc COPYING changelog.txt releasenotes.txt
%changelog %changelog
* Mon Jan 22 2007 Tom Eastep tom@shorewall.net
- Updated to 3.4.0-0Beta3
* Wed Jan 03 2007 Tom Eastep tom@shorewall.net * Wed Jan 03 2007 Tom Eastep tom@shorewall.net
- Updated to 3.4.0-0Beta2 - Updated to 3.4.0-0Beta2
- Handle rename of shorewall.conf - Handle rename of shorewall.conf

2
Shorewall-lite/uninstall.sh
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 Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=3.4.0-Beta2 VERSION=3.4.0-Beta3
usage() # $1 = exit status usage() # $1 = exit status
{ {

3
Shorewall/changelog.txt
View File

@ -8,6 +8,9 @@ Changes in 3.4.0 Beta 3
4) 'noah' is implied by ipsecnat in /etc/shorewall/tunnels. 4) 'noah' is implied by ipsecnat in /etc/shorewall/tunnels.
5) Reduce the number of rules in the 'blacklst' chain when
BLACKLIST_LOGLEVEL is specified.
Changes in 3.4.0 Beta 2 Changes in 3.4.0 Beta 2
1) Fix for empty blacklist file. 1) Fix for empty blacklist file.

20
Shorewall/compiler
View File

@ -3208,11 +3208,7 @@ rules_chain() # $1 = source zone, $2 = destination zone
# $dport = destination port selector # $dport = destination port selector
# #
add_blacklist_rule() { add_blacklist_rule() {
if [ -n "$BLACKLIST_LOGLEVEL" ]; then run_iptables2 -A blacklst $source $proto $dport -j $target
log_rule $BLACKLIST_LOGLEVEL blacklst $BLACKLIST_DISPOSITION $(fix_bang $source $proto $dport)
fi
run_iptables2 -A blacklst $source $proto $dport -j $disposition
} }
# #
@ -3299,11 +3295,14 @@ process_blacklist()
{ {
local disposition=$BLACKLIST_DISPOSITION local disposition=$BLACKLIST_DISPOSITION
local f=$(find_file blacklist) local f=$(find_file blacklist)
local target
if [ -s $TMP_DIR/blacklist ]; then if [ -s $TMP_DIR/blacklist ]; then
[ "$disposition" = REJECT ] && disposition=reject [ "$disposition" = REJECT ] && disposition=reject
[ -n "$BLACKLIST_LOGLEVEL" ] && target=blacklog || target=$disposition
progress_message2 "Compiling $f..." progress_message2 "Compiling $f..."
cat >&3 << __EOF__ cat >&3 << __EOF__
@ -3337,6 +3336,17 @@ setup_blacklist() {
createchain blacklst no createchain blacklst no
if [ -n "$BLACKLIST_LOGLEVEL" ]; then
createchain blacklog no
log_rule_limit $BLACKLIST_LOGLEVEL blacklog blacklst $BLACKLIST_DISPOSITION "$LOGLIMIT" "" -A
if [ $BLACKLIST_DISPOSITION = REJECT ]; then
run_iptables -A blacklog -j reject
else
run_iptables -A blacklog -j $BLACKLIST_DISPOSITION
fi
fi
[ -n "$BLACKLISTNEWONLY" ] && state="-m state --state NEW,INVALID" || state= [ -n "$BLACKLISTNEWONLY" ] && state="-m state --state NEW,INVALID" || state=
for host in $hosts; do for host in $hosts; do

2
Shorewall/fallback.sh
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=3.4.0-Beta2 VERSION=3.4.0-Beta3
usage() # $1 = exit status usage() # $1 = exit status
{ {

2
Shorewall/install.sh
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=3.4.0-Beta2 VERSION=3.4.0-Beta3
usage() # $1 = exit status usage() # $1 = exit status
{ {

3
Shorewall/releasenotes.txt
View File

@ -61,6 +61,9 @@ Other Changes in 3.4.0 Beta 3
(unless 'isecnat:noah' was given). Given that AH is incompatible (unless 'isecnat:noah' was given). Given that AH is incompatible
with nat-traversal, 'ipsecnat' now implies 'ipsecnat:noah'. with nat-traversal, 'ipsecnat' now implies 'ipsecnat:noah'.
2) Shorewall now generates half as many rules as previously in the
'blacklst' chain when BLACKLIST_LOGLEVEL is specified.
Migration Considerations: Migration Considerations:
1) Shorewall supports the notion of "default actions". A default 1) Shorewall supports the notion of "default actions". A default

4
Shorewall/shorewall.spec
View File

@ -1,6 +1,6 @@
%define name shorewall %define name shorewall
%define version 3.4.0 %define version 3.4.0
%define release 0Beta2 %define release 0Beta3
%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.
@ -257,6 +257,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
%changelog %changelog
* Mon Jan 22 2007 Tom Eastep tom@shorewall.net
- Updated to 3.4.0-0Beta3
* Wed Jan 03 2007 Tom Eastep tom@shorewall.net * Wed Jan 03 2007 Tom Eastep tom@shorewall.net
- Updated to 3.4.0-0Beta2 - Updated to 3.4.0-0Beta2
* Thu Dec 14 2006 Tom Eastep tom@shorewall.net * Thu Dec 14 2006 Tom Eastep tom@shorewall.net

2
Shorewall/uninstall.sh
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 Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=3.4.0-Beta2 VERSION=3.4.0-Beta3
usage() # $1 = exit status usage() # $1 = exit status
{ {

4
tools/build/publish
View File

@ -93,9 +93,7 @@ while [ $# -gt 0 ]; do
f="$WEBSITE/$b" f="$WEBSITE/$b"
fi fi
GENTOC= list_search $1 $NOTOC && GENTOC="--stringparam generate.toc ''" || GENTOC=
list_search $1 $NOTOC && GENTOC="--stringparam generate.toc ''"
echo "Converting $1 from XML to HTML ($b) ..." echo "Converting $1 from XML to HTML ($b) ..."