diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 38c95d941..e80c0e6cd 100755 --- a/Shorewall-init/install.sh +++ b/Shorewall-init/install.sh @@ -23,7 +23,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.4.12-RC1 +VERSION=4.4.12-Beta3 usage() # $1 = exit status { diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec index bd1b322a3..4bfe4d03d 100644 --- a/Shorewall-init/shorewall-init.spec +++ b/Shorewall-init/shorewall-init.spec @@ -1,6 +1,6 @@ %define name shorewall-init %define version 4.4.12 -%define release 0RC1 +%define release 0Beta3 Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Name: %{name} @@ -99,8 +99,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog -* Thu Jul 29 2010 Tom Eastep tom@shorewall.net -- Updated to 4.4.12-0RC1 +* Sat Jul 31 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.12-0Beta3 * Sun Jul 25 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.12-0Beta2 * Wed Jul 21 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh index fe0b8dea3..8578c07b2 100755 --- a/Shorewall-init/uninstall.sh +++ b/Shorewall-init/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.4.12-RC1 +VERSION=4.4.12-Beta3 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index ef9580ab2..f888b27e7 100755 --- a/Shorewall-lite/install.sh +++ b/Shorewall-lite/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.4.12-RC1 +VERSION=4.4.12-Beta3 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 3c473635c..eaac7a500 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -1,6 +1,6 @@ %define name shorewall-lite %define version 4.4.12 -%define release 0RC1 +%define release 0Beta3 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -102,8 +102,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog -* Thu Jul 29 2010 Tom Eastep tom@shorewall.net -- Updated to 4.4.12-0RC1 +* Sat Jul 31 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.12-0Beta3 * Sun Jul 25 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.12-0Beta2 * Wed Jul 21 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 6f1ba0fd3..a2178b381 100755 --- a/Shorewall-lite/uninstall.sh +++ b/Shorewall-lite/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.4.12-RC1 +VERSION=4.4.12-Beta3 usage() # $1 = exit status { diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index 180ab9919..18fbc2172 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -343,7 +343,7 @@ sub initialize( $ ) { EXPORT => 0, STATEMATCH => '-m state --state', UNTRACKED => 0, - VERSION => "4.4.12-RC1", + VERSION => "4.4.12-Beta3", CAPVERSION => 40411 , ); diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 29020302e..fc6282070 100755 --- a/Shorewall/install.sh +++ b/Shorewall/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.4.12-RC1 +VERSION=4.4.12-Beta3 usage() # $1 = exit status { diff --git a/Shorewall/known_problems.txt b/Shorewall/known_problems.txt index 6e61c42e7..5666d3ac2 100644 --- a/Shorewall/known_problems.txt +++ b/Shorewall/known_problems.txt @@ -1 +1 @@ -There are no known problems in Shorewall 4.4.12-RC1 +There are no known problems in Shorewall 4.4.12-Beta3 diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index 5e4a3dc2d..9b5c248ce 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.12 -%define release 0RC1 +%define release 0Beta3 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -108,8 +108,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog -* Thu Jul 29 2010 Tom Eastep tom@shorewall.net -- Updated to 4.4.12-0RC1 +* Sat Jul 31 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.12-0Beta3 * Sun Jul 25 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.12-0Beta2 * Wed Jul 21 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index 3a303038d..b7acdb5c9 100755 --- a/Shorewall/uninstall.sh +++ b/Shorewall/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.4.12-RC1 +VERSION=4.4.12-Beta3 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index e61c33c77..dc899cfd2 100755 --- a/Shorewall6-lite/install.sh +++ b/Shorewall6-lite/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.4.12-RC1 +VERSION=4.4.12-Beta3 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index 68894ae78..98fe6da49 100644 --- a/Shorewall6-lite/shorewall6-lite.spec +++ b/Shorewall6-lite/shorewall6-lite.spec @@ -1,6 +1,6 @@ %define name shorewall6-lite %define version 4.4.12 -%define release 0RC1 +%define release 0Beta3 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -93,8 +93,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog -* Thu Jul 29 2010 Tom Eastep tom@shorewall.net -- Updated to 4.4.12-0RC1 +* Sat Jul 31 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.12-0Beta3 * Sun Jul 25 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.12-0Beta2 * Wed Jul 21 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index f7a126f58..068dde545 100755 --- a/Shorewall6-lite/uninstall.sh +++ b/Shorewall6-lite/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.4.12-RC1 +VERSION=4.4.12-Beta3 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index 918f17ecd..cd468044b 100755 --- a/Shorewall6/install.sh +++ b/Shorewall6/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.4.12-RC1 +VERSION=4.4.12-Beta3 usage() # $1 = exit status { diff --git a/Shorewall6/lib.cli b/Shorewall6/lib.cli index ea54b8a55..ad38f6359 100644 --- a/Shorewall6/lib.cli +++ b/Shorewall6/lib.cli @@ -208,6 +208,19 @@ logwatch() # $1 = timeout -- if negative, prompt each time that # an 'interesting' packet count changes { + if [ -z "$LOGFILE" ]; then + LOGFILE=/var/log/messages + + if [ -n "$(syslog_circular_buffer)" ]; then + g_logread="logread | tac" + elif [ -r $LOGFILE ]; then + g_logread="tac $LOGFILE" + else + echo "LOGFILE ($LOGFILE) does not exist!" >&2 + exit 2 + fi + fi + host=$(echo $g_hostname | sed 's/\..*$//') oldrejects=$($IP6TABLES -L -v -n | grep 'LOG') @@ -457,6 +470,20 @@ show_command() { ;; log) [ $# -gt 2 ] && usage 1 + + if [ -z "$LOGFILE" ]; then + LOGFILE=/var/log/messages + + if [ -n "$(syslog_circular_buffer)" ]; then + g_logread="logread | tac" + elif [ -r $LOGFILE ]; then + g_logread="tac $LOGFILE" + else + echo "LOGFILE ($LOGFILE) does not exist!" >&2 + exit 2 + fi + fi + echo "$g_product $SHOREWALL_VERSION Log ($LOGFILE) at $g_hostname - $(date)" echo show_reset @@ -667,6 +694,17 @@ dump_command() { esac done + if [ -z "$LOGFILE" ]; then + if [ -n "$(syslog_circular_buffer)" ]; then + g_logread="logread | tac" + elif [ -r $LOGFILE ]; then + g_logread="tac $LOGFILE" + else + echo "LOGFILE ($LOGFILE) does not exist!" >&2 + exit 2 + fi + fi + g_ipt_options="$g_ipt_options $g_ipt_options1" [ $VERBOSITY -lt 2 ] && VERBOSITY=2 diff --git a/Shorewall6/shorewall6 b/Shorewall6/shorewall6 index ab32081f1..ce2486264 100755 --- a/Shorewall6/shorewall6 +++ b/Shorewall6/shorewall6 @@ -67,15 +67,15 @@ get_config() { # This block is avoided for compile for export and when the user isn't root # if [ "$3" = Yes ]; then - [ -z "$LOGFILE" ] && LOGFILE=/var/log/messages - - if [ -n "$(syslog_circular_buffer)" ]; then - g_logread="logread | tac" - elif [ -r $LOGFILE ]; then - g_logread="tac $LOGFILE" - else - echo "LOGFILE ($LOGFILE) does not exist!" >&2 - exit 2 + if [ -n "$LOGFILE" ]; then + if [ -n "$(syslog_circular_buffer)" ]; then + g_logread="logread | tac" + elif [ -r $LOGFILE ]; then + g_logread="tac $LOGFILE" + else + echo "LOGFILE ($LOGFILE) does not exist!" >&2 + exit 2 + fi fi fi diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index 96b07ee05..dbe2a2337 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.12 -%define release 0RC1 +%define release 0Beta3 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -98,8 +98,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 %changelog -* Thu Jul 29 2010 Tom Eastep tom@shorewall.net -- Updated to 4.4.12-0RC1 +* Sat Jul 31 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.12-0Beta3 * Sun Jul 25 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.12-0Beta2 * Wed Jul 21 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index bfde51d27..79795892e 100755 --- a/Shorewall6/uninstall.sh +++ b/Shorewall6/uninstall.sh @@ -26,7 +26,7 @@ # You may only use this script to uninstall the version # shown below. Simply run this script to remove Shorewall Firewall -VERSION=4.4.12-RC1 +VERSION=4.4.12-Beta3 usage() # $1 = exit status {