diff --git a/Shorewall-init/install.sh b/Shorewall-init/install.sh index 78f52d422..c56278b53 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.14-RC1 +VERSION=4.4.14 usage() # $1 = exit status { @@ -285,11 +285,8 @@ fi if [ -z "$DESTDIR" ]; then if [ -n "$first_install" ]; then if [ -n "$DEBIAN" ]; then - if [ -x /sbin/insserv ]; then - insserv /etc/init.d/shorewall-init - else - ln -sf ../init.d/shorewall-init /etc/rcS.d/S38shorewall-init - fi + + update-rc.d shorewall-init defaults echo "Shorewall Init will start automatically at boot" else diff --git a/Shorewall-init/shorewall-init.spec b/Shorewall-init/shorewall-init.spec index 4b20d4483..7094adc89 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.14 -%define release 0RC1 +%define release 0base Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Name: %{name} @@ -99,6 +99,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Sat Oct 23 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.14-0base * Wed Oct 06 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.14-0RC1 * Fri Oct 01 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-init/uninstall.sh b/Shorewall-init/uninstall.sh index 984cf5e59..8df7469c5 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.14-RC1 +VERSION=4.4.14 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index b1cb2f64c..d0deb16d1 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.14-RC1 +VERSION=4.4.14 usage() # $1 = exit status { @@ -355,6 +355,8 @@ if [ -z "$DESTDIR" ]; then if [ -n "$DEBIAN" ]; then run_install $OWNERSHIP -m 0644 default.debian /etc/default/shorewall-lite + update-rc.d shorewall-lite defaults + if [ -x /sbin/insserv ]; then insserv /etc/init.d/shorewall-lite else diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 31c53b685..85a85c23e 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.14 -%define release 0RC1 +%define release 0base Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -102,6 +102,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Sat Oct 23 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.14-0base * Wed Oct 06 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.14-0RC1 * Fri Oct 01 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index e973ef186..3bd107637 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.14-RC1 +VERSION=4.4.14 usage() # $1 = exit status { diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index b40d63fdc..9dc2f6110 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -347,7 +347,7 @@ sub initialize( $ ) { EXPORT => 0, STATEMATCH => '-m state --state', UNTRACKED => 0, - VERSION => "4.4.14-RC1", + VERSION => "4.4.14", CAPVERSION => 40413 , ); @@ -3438,7 +3438,7 @@ sub generate_aux_config() { emit '}'; } - my $fn = find_file 'dumpfilter'; + $fn = find_file 'dumpfilter'; if ( -f $fn ) { emit( '', diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 44af3715f..5087a9def 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -21,6 +21,14 @@ Changes in Shorewall 4.4.14 10) Change value of FORWARD_CLEAR_MARK in *.conf. +11) Use update-rc.d to install init symlinks. + +12) Fix split_list(). + +13) Fix 10+ TC Interfaces. + +14) Insure that VERBOSITY=0 when interrogating compiled script's version + Changes in Shorewall 4.4.13 1) Allow zone lists in rules SOURCE and DEST. diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 7c305e1e1..30abdec45 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.14-RC1 +VERSION=4.4.14 usage() # $1 = exit status { @@ -887,11 +887,7 @@ if [ -z "$DESTDIR" -a -n "$first_install" -a -z "${CYGWIN}${MAC}" ]; then if [ -n "$DEBIAN" ]; then install_file default.debian /etc/default/shorewall 0644 - if [ -x /sbin/insserv ]; then - insserv /etc/init.d/shorewall - else - ln -s ../init.d/shorewall /etc/rcS.d/S40shorewall - fi + update-rc.d shorewall defaults echo "shorewall will start automatically at boot" echo "Set startup=1 in /etc/default/shorewall to enable" diff --git a/Shorewall/known_problems.txt b/Shorewall/known_problems.txt index 7f3855224..698434395 100644 --- a/Shorewall/known_problems.txt +++ b/Shorewall/known_problems.txt @@ -1 +1 @@ -There are no known problems in Shorewall 4.4.14-RC1 +There are no known problems in Shorewall 4.4.14 diff --git a/Shorewall/lib.common b/Shorewall/lib.common index df3ab723b..698685e42 100644 --- a/Shorewall/lib.common +++ b/Shorewall/lib.common @@ -34,6 +34,10 @@ get_script_version() { # $1 = script local version local ifs local digits + local verbosity + + verbosity="$VERBOSITY" + VERBOSITY=0 temp=$( $SHOREWALL_SHELL $1 version | sed 's/-.*//' ) @@ -54,6 +58,8 @@ get_script_version() { # $1 = script fi echo $version + + VERBOSITY="$verbosity" } # diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index 1e78ef405..7bc73a0e0 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -1,6 +1,5 @@ ---------------------------------------------------------------------------- S H O R E W A L L 4 . 4 . 1 4 - R C 1 ---------------------------------------------------------------------------- I. PROBLEMS CORRECTED IN THIS RELEASE @@ -83,6 +82,30 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES install the sample configurations and FORWARD_CLEAR_MARK will default to Yes on systems with MARK support. +10) The install scripts in the tarballs now correctly create init + symlinks on recent Ubuntu releases. + +11) Previously, this entry in the OPTIONS column of + /etc/shorewall/interfaces incorrectly generated a syntax error. + + nets=(1.2.3.0/24) + + The error was: + + ERROR: Invalid VLSM (24)) + +12) Previously, if 10 or more interfaces were configured in Complex + Traffic Shaping (/etc/shorewall/tcdevices), the following + compilation diagnostic was generated: + + Argument "a" isn't numeric in sprintf at + /usr/share/shorewall/Shorewall/Config.pm line 893. + + and an invalid TC configuration was generated. + +13) If the current environment exported the VERBOSITY variable with a + non-zero value, startup would fail. + ---------------------------------------------------------------------------- I I. K N O W N P R O B L E M S R E M A I N I N G ---------------------------------------------------------------------------- diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index ccd539d33..1e4fa8ccc 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.14 -%define release 0RC1 +%define release 0base Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -108,6 +108,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog +* Sat Oct 23 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.14-0base * Wed Oct 06 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.14-0RC1 * Fri Oct 01 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index 058b109f7..5a31b77cb 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.14-RC1 +VERSION=4.4.14 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 564cc8c52..7886070f6 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.14-RC1 +VERSION=4.4.14 usage() # $1 = exit status { @@ -351,11 +351,7 @@ if [ -z "$DESTDIR" ]; then if [ -n "$DEBIAN" ]; then run_install $OWNERSHIP -m 0644 default.debian /etc/default/shorewall6-lite - if [ -x /sbin/insserv ]; then - insserv /etc/init.d/shorewall6-lite - else - ln -s ../init.d/shorewall6-lite /etc/rcS.d/S40shorewall6-lite - fi + update-rc.d shorewall6-lite defaults echo "Shorewall6 Lite will start automatically at boot" else diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index 7cf7c8bad..da0e87e13 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.14 -%define release 0RC1 +%define release 0base Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -93,6 +93,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Sat Oct 23 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.14-0base * Wed Oct 06 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.14-0RC1 * Fri Oct 01 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index 3dd177273..ac1d6de7d 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.14-RC1 +VERSION=4.4.14 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index ff31c2410..67e90423d 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.14-RC1 +VERSION=4.4.14 usage() # $1 = exit status { @@ -738,11 +738,7 @@ if [ -z "$DESTDIR" -a -n "$first_install" -a -z "${CYGWIN}${MAC}" ]; then if [ -n "$DEBIAN" ]; then run_install $OWNERSHIP -m 0644 default.debian /etc/default/shorewall6 - if [ -x /sbin/insserv ]; then - insserv /etc/init.d/shorewall6 - else - ln -s ../init.d/shorewall6 /etc/rcS.d/S40shorewall6 - fi + update-rc.d shorewall6 defaults echo "shorewall6 will start automatically at boot" echo "Set startup=1 in /etc/default/shorewall6 to enable" diff --git a/Shorewall6/lib.common b/Shorewall6/lib.common index 48936e75b..00b3ddfe4 100644 --- a/Shorewall6/lib.common +++ b/Shorewall6/lib.common @@ -32,6 +32,10 @@ get_script_version() { # $1 = script local version local ifs local digits + local verbosity + + verbosity="$VERBOSITY" + VERBOSITY=0 temp=$( $SHOREWALL_SHELL $1 version | sed 's/-.*//' ) @@ -52,6 +56,8 @@ get_script_version() { # $1 = script fi echo $version + + VERBOSITY="$verbosity" } # diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index d5a698458..5df80eb5f 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.14 -%define release 0RC1 +%define release 0base Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -98,6 +98,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 %changelog +* Sat Oct 23 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.14-0base * Wed Oct 06 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.14-0RC1 * Fri Oct 01 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index c37fffafa..d806f565a 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.14-RC1 +VERSION=4.4.14 usage() # $1 = exit status {