From 7451a56c64f16e2e3d7bfe8b0bc4fa04a657c519 Mon Sep 17 00:00:00 2001 From: teastep Date: Tue, 23 Sep 2008 16:15:42 +0000 Subject: [PATCH] Document Debian init fix git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8734 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-common/fallback.sh | 2 +- Shorewall-common/install.sh | 2 +- Shorewall-common/releasenotes.txt | 11 ++++++----- Shorewall-common/shorewall-common.spec | 4 +++- Shorewall-common/uninstall.sh | 2 +- Shorewall-lite/fallback.sh | 2 +- Shorewall-lite/install.sh | 2 +- Shorewall-lite/shorewall-lite.spec | 4 +++- Shorewall-lite/uninstall.sh | 2 +- Shorewall-perl/Shorewall/Config.pm | 2 +- Shorewall-perl/install.sh | 2 +- Shorewall-perl/shorewall-perl.spec | 4 +++- Shorewall-shell/install.sh | 2 +- Shorewall-shell/shorewall-shell.spec | 4 +++- 14 files changed, 27 insertions(+), 18 deletions(-) diff --git a/Shorewall-common/fallback.sh b/Shorewall-common/fallback.sh index 7cfa90cb8..c80b45910 100755 --- a/Shorewall-common/fallback.sh +++ b/Shorewall-common/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=4.2.0-RC3 +VERSION=4.2.0-RC4 usage() # $1 = exit status { diff --git a/Shorewall-common/install.sh b/Shorewall-common/install.sh index 22337f1d0..4c6633e59 100755 --- a/Shorewall-common/install.sh +++ b/Shorewall-common/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.2.0-RC3 +VERSION=4.2.0-RC4 usage() # $1 = exit status { diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index 7721f4567..b97b238b8 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -1,4 +1,4 @@ -Shorewall 4.2.0 RC 3. +Shorewall 4.2.0 RC 4. ---------------------------------------------------------------------------- R E L E A S E 4 . 2 H I G H L I G H T S @@ -78,11 +78,12 @@ Migration Issues. 7) DYNAMIC_ZONES=Yes is no longer supported by Shorewall-perl. Use ipset-based zones instead. -Problems corrected in Shorewall-shell 4.2.0-RC3 +Problems corrected in Shorewall 4.2.0-RC4 -1) In /etc/shorewall/rules, if the DEST column contained 'all-' and - the SOURCE column was not some form of 'all', then $FW was - incorrectly included in the destination. +1) A bashism has been corrected in the init script shipped for Debian + and Debian-like distributions which prevented the proper options + from being passed to /sbin/shorewall or /sbin/shorewall-lite in + some cases. New Features in Shorewall 4.2. diff --git a/Shorewall-common/shorewall-common.spec b/Shorewall-common/shorewall-common.spec index 7dd223017..b36da2493 100644 --- a/Shorewall-common/shorewall-common.spec +++ b/Shorewall-common/shorewall-common.spec @@ -1,6 +1,6 @@ %define name shorewall-common %define version 4.2.0 -%define release 0RC3 +%define release 0RC4 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -175,6 +175,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %changelog +* Tue Sep 23 2008 Tom Eastep tom@shorewall.net +- Updated to 4.2.0-0RC4 * Mon Sep 15 2008 Tom Eastep tom@shorewall.net - Updated to 4.2.0-0RC3 * Mon Sep 08 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall-common/uninstall.sh b/Shorewall-common/uninstall.sh index 22db8d0d7..4c1c15bc5 100755 --- a/Shorewall-common/uninstall.sh +++ b/Shorewall-common/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.2.0-RC3 +VERSION=4.2.0-RC4 usage() # $1 = exit status { diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh index c7b11826f..221302206 100755 --- a/Shorewall-lite/fallback.sh +++ b/Shorewall-lite/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=4.2.0-RC3 +VERSION=4.2.0-RC4 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 0c10aba2d..3b7798213 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.2.0-RC3 +VERSION=4.2.0-RC4 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index 79010b4d3..c5ba33cfa 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -1,6 +1,6 @@ %define name shorewall-lite %define version 4.2.0 -%define release 0RC3 +%define release 0RC4 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -98,6 +98,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Tue Sep 23 2008 Tom Eastep tom@shorewall.net +- Updated to 4.2.0-0RC4 * Mon Sep 15 2008 Tom Eastep tom@shorewall.net - Updated to 4.2.0-0RC3 * Mon Sep 08 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 84917eeaa..c2d529e6f 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.2.0-RC3 +VERSION=4.2.0-RC4 usage() # $1 = exit status { diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm index ab7dd1d06..f6171325c 100644 --- a/Shorewall-perl/Shorewall/Config.pm +++ b/Shorewall-perl/Shorewall/Config.pm @@ -266,7 +266,7 @@ sub initialize() { ORIGINAL_POLICY_MATCH => '', LOGPARMS => '', TC_SCRIPT => '', - VERSION => "4.2.0-RC3", + VERSION => "4.2.0-RC4", CAPVERSION => 40190 , ); # diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh index 7ceccb09a..70f6afe8b 100755 --- a/Shorewall-perl/install.sh +++ b/Shorewall-perl/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.2.0-RC3 +VERSION=4.2.0-RC4 usage() # $1 = exit status { diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec index 517fa63ce..fa75e547a 100644 --- a/Shorewall-perl/shorewall-perl.spec +++ b/Shorewall-perl/shorewall-perl.spec @@ -1,6 +1,6 @@ %define name shorewall-perl %define version 4.2.0 -%define release 0RC3 +%define release 0RC4 Summary: Shoreline Firewall Perl-based compiler. Name: %{name} @@ -64,6 +64,8 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING releasenotes.txt %changelog +* Tue Sep 23 2008 Tom Eastep tom@shorewall.net +- Updated to 4.2.0-0RC4 * Mon Sep 15 2008 Tom Eastep tom@shorewall.net - Updated to 4.2.0-0RC3 * Mon Sep 08 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall-shell/install.sh b/Shorewall-shell/install.sh index eb52ffa65..413bc5188 100755 --- a/Shorewall-shell/install.sh +++ b/Shorewall-shell/install.sh @@ -22,7 +22,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -VERSION=4.2.0-RC3 +VERSION=4.2.0-RC4 usage() # $1 = exit status { diff --git a/Shorewall-shell/shorewall-shell.spec b/Shorewall-shell/shorewall-shell.spec index f0db61371..bb2323415 100644 --- a/Shorewall-shell/shorewall-shell.spec +++ b/Shorewall-shell/shorewall-shell.spec @@ -1,6 +1,6 @@ %define name shorewall-shell %define version 4.2.0 -%define release 0RC3 +%define release 0RC4 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -81,6 +81,8 @@ fi %doc COPYING INSTALL %changelog +* Tue Sep 23 2008 Tom Eastep tom@shorewall.net +- Updated to 4.2.0-0RC4 * Mon Sep 15 2008 Tom Eastep tom@shorewall.net - Updated to 4.2.0-0RC3 * Mon Sep 08 2008 Tom Eastep tom@shorewall.net