diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh index 0b6eaedf2..40e0edb94 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.4.7.3 +VERSION=4.4.7.4 usage() # $1 = exit status { diff --git a/Shorewall-lite/init.debian.sh b/Shorewall-lite/init.debian.sh index e84f1025d..9bd387d32 100755 --- a/Shorewall-lite/init.debian.sh +++ b/Shorewall-lite/init.debian.sh @@ -2,8 +2,8 @@ ### BEGIN INIT INFO # Provides: shorewall-lite -# Required-Start: $network -# Required-Stop: $network +# Required-Start: $network $remote_fs +# Required-Stop: $network $remote_fs # Default-Start: S # Default-Stop: 0 6 # Short-Description: Configure the firewall at boot time diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 74e89d8ec..fab104e8c 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.7.3 +VERSION=4.4.7.4 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index f1ebcbe54..ce2df7e96 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.7 -%define release 3 +%define release 4 Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Name: %{name} @@ -100,6 +100,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Mon Feb 15 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.7-4 * Sun Feb 14 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.7-3 * Sun Feb 14 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index 0983a7482..5b81f3fb4 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.7.3 +VERSION=4.4.7.4 usage() # $1 = exit status { diff --git a/Shorewall/Perl/Shorewall/Config.pm b/Shorewall/Perl/Shorewall/Config.pm index a2277031d..fd00a92e2 100644 --- a/Shorewall/Perl/Shorewall/Config.pm +++ b/Shorewall/Perl/Shorewall/Config.pm @@ -337,7 +337,7 @@ sub initialize( $ ) { TC_SCRIPT => '', EXPORT => 0, UNTRACKED => 0, - VERSION => "4.4.7.3", + VERSION => "4.4.7.4", CAPVERSION => 40407 , ); diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 370caa70d..3f2fdf798 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,3 +1,7 @@ +Changes in Shorewall 4.4.7.4 + +1) Add $remote_fs to Required-start and Required-stop for Debian. + Changes in Shorewall 4.4.7.3 1) Detect FLOW_FILTER when LOAD_HELPERS_ONLY=Yes diff --git a/Shorewall/init.debian.sh b/Shorewall/init.debian.sh index d0f86e25f..4cc0398fc 100755 --- a/Shorewall/init.debian.sh +++ b/Shorewall/init.debian.sh @@ -1,8 +1,8 @@ #!/bin/sh ### BEGIN INIT INFO # Provides: shorewall -# Required-Start: $network -# Required-Stop: $network +# Required-Start: $network $remote_fs +# Required-Stop: $network $remote_fs # Default-Start: S # Default-Stop: 0 6 # Short-Description: Configure the firewall at boot time diff --git a/Shorewall/install.sh b/Shorewall/install.sh index 6ceeefa72..6ef3f6ab8 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.7.3 +VERSION=4.4.7.4 usage() # $1 = exit status { diff --git a/Shorewall/releasenotes.txt b/Shorewall/releasenotes.txt index bc6856227..da7ec0145 100644 --- a/Shorewall/releasenotes.txt +++ b/Shorewall/releasenotes.txt @@ -1,4 +1,4 @@ -Shorewall 4.4.7 Patch Release 3. +Shorewall 4.4.7 Patch Release 4. ---------------------------------------------------------------------------- R E L E A S E 4 . 4 H I G H L I G H T S @@ -183,6 +183,12 @@ Shorewall 4.4.7 Patch Release 3. unless you choose to replace your current shorewall.conf with the one from the release (not recommended). +---------------------------------------------------------------------------- + P R O B L E M S C O R R E C T E D I N 4 . 4 . 7 . 4 +---------------------------------------------------------------------------- +1) The Debian init scripts are modified to include $remote_fs in the + Required-start and Required-stop specifications. + ---------------------------------------------------------------------------- P R O B L E M S C O R R E C T E D I N 4 . 4 . 7 . 3 ---------------------------------------------------------------------------- diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec index b926540cc..bad3d2887 100644 --- a/Shorewall/shorewall.spec +++ b/Shorewall/shorewall.spec @@ -1,6 +1,6 @@ %define name shorewall %define version 4.4.7 -%define release 3 +%define release 4 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -107,6 +107,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %changelog +* Mon Feb 15 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.7-4 * Sun Feb 14 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.7-3 * Sun Feb 14 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh index 1dda8182a..d1a9e5eef 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.7.3 +VERSION=4.4.7.4 usage() # $1 = exit status { diff --git a/Shorewall6-lite/fallback.sh b/Shorewall6-lite/fallback.sh index 0b6eaedf2..40e0edb94 100755 --- a/Shorewall6-lite/fallback.sh +++ b/Shorewall6-lite/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=4.4.7.3 +VERSION=4.4.7.4 usage() # $1 = exit status { diff --git a/Shorewall6-lite/init.debian.sh b/Shorewall6-lite/init.debian.sh index 576db1b75..fb1e394cf 100755 --- a/Shorewall6-lite/init.debian.sh +++ b/Shorewall6-lite/init.debian.sh @@ -2,8 +2,8 @@ ### BEGIN INIT INFO # Provides: shorewall6-lite -# Required-Start: $network -# Required-Stop: $network +# Required-Start: $network $remote_fs +# Required-Stop: $network $remote_fs # Default-Start: S # Default-Stop: 0 6 # Short-Description: Configure the firewall at boot time diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index c389c3b5e..47d84b579 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.7.3 +VERSION=4.4.7.4 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index 71aeccde1..51fb84915 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.7 -%define release 3 +%define release 4 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -91,6 +91,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Mon Feb 15 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.7-4 * Sun Feb 14 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.7-3 * Sun Feb 14 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index 713a40710..a43d40f6a 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.7.3 +VERSION=4.4.7.4 usage() # $1 = exit status { diff --git a/Shorewall6/fallback.sh b/Shorewall6/fallback.sh index 1393ce323..ac5fb06df 100755 --- a/Shorewall6/fallback.sh +++ b/Shorewall6/fallback.sh @@ -28,7 +28,7 @@ # shown below. Simply run this script to revert to your prior version of # Shoreline Firewall. -VERSION=4.4.7.3 +VERSION=4.4.7.4 usage() # $1 = exit status { diff --git a/Shorewall6/init.debian.sh b/Shorewall6/init.debian.sh index 559e5427e..a5aae1add 100755 --- a/Shorewall6/init.debian.sh +++ b/Shorewall6/init.debian.sh @@ -1,8 +1,8 @@ #!/bin/sh ### BEGIN INIT INFO # Provides: shorewall6 -# Required-Start: $network -# Required-Stop: $network +# Required-Start: $network $remote_fs +# Required-Stop: $network $remote_fs # Default-Start: S # Default-Stop: 0 6 # Short-Description: Configure the firewall at boot time diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index b9c1f6d10..f3d171e9c 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.7.3 +VERSION=4.4.7.4 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index 61f9313b4..985e29a9a 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 %define version 4.4.7 -%define release 3 +%define release 4 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -96,6 +96,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 %changelog +* Mon Feb 15 2010 Tom Eastep tom@shorewall.net +- Updated to 4.4.7-4 * Sun Feb 14 2010 Tom Eastep tom@shorewall.net - Updated to 4.4.7-3 * Sun Feb 14 2010 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index 27bb59c05..b523cc29e 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.7.3 +VERSION=4.4.7.4 usage() # $1 = exit status {