diff --git a/Shorewall-common/fallback.sh b/Shorewall-common/fallback.sh index b7c02d5e0..eb49d9578 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall-common/install.sh b/Shorewall-common/install.sh index ae3f33f37..c9d905ab5 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall-common/shorewall-common.spec b/Shorewall-common/shorewall-common.spec index d08ca05da..fdeec9f6d 100644 --- a/Shorewall-common/shorewall-common.spec +++ b/Shorewall-common/shorewall-common.spec @@ -1,6 +1,6 @@ %define name shorewall-common -%define version 4.3.4 -%define release 0base +%define version 4.2.4 +%define release 0RC1 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 +* Wed Dec 17 2008 Tom Eastep tom@shorewall.net +- Updated to 4.2.4-0RC1 * Tue Dec 16 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.4-0base * Sat Dec 13 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall-common/uninstall.sh b/Shorewall-common/uninstall.sh index fdc57a2c2..cd3f84f50 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh index e20d33c9d..1c38b2090 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 29260ae44..794ab3b0a 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index ec77a60d1..875e2fe28 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -1,6 +1,6 @@ %define name shorewall-lite -%define version 4.3.4 -%define release 0base +%define version 4.2.4 +%define release 0RC1 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 +* Wed Dec 17 2008 Tom Eastep tom@shorewall.net +- Updated to 4.2.4-0RC1 * Tue Dec 16 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.4-0base * Sat Dec 13 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index b0c95f568..24c8645dc 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm index b52dcddc0..21f504b3f 100644 --- a/Shorewall-perl/Shorewall/Config.pm +++ b/Shorewall-perl/Shorewall/Config.pm @@ -299,7 +299,7 @@ sub initialize( $ ) { LOGPARMS => '', TC_SCRIPT => '', EXPORT => 0, - VERSION => "4.3.4", + VERSION => "4.2.4-RC1", CAPVERSION => 40203 , ); # diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh index de2fabdd8..66390bedd 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec index bd577a22f..e26b0965d 100644 --- a/Shorewall-perl/shorewall-perl.spec +++ b/Shorewall-perl/shorewall-perl.spec @@ -1,6 +1,6 @@ %define name shorewall-perl -%define version 4.3.4 -%define release 0base +%define version 4.2.4 +%define release 0RC1 Summary: Shoreline Firewall Perl-based compiler. Name: %{name} @@ -62,6 +62,8 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING releasenotes.txt %changelog +* Wed Dec 17 2008 Tom Eastep tom@shorewall.net +- Updated to 4.2.4-0RC1 * Tue Dec 16 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.4-0base * Sat Dec 13 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall-shell/install.sh b/Shorewall-shell/install.sh index 3c4d3f554..b19525b84 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall-shell/shorewall-shell.spec b/Shorewall-shell/shorewall-shell.spec index 73e6393ec..8c67b3a1c 100644 --- a/Shorewall-shell/shorewall-shell.spec +++ b/Shorewall-shell/shorewall-shell.spec @@ -1,6 +1,6 @@ %define name shorewall-shell -%define version 4.3.4 -%define release 0base +%define version 4.2.4 +%define release 0RC1 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Name: %{name} @@ -81,6 +81,8 @@ fi %doc COPYING INSTALL %changelog +* Wed Dec 17 2008 Tom Eastep tom@shorewall.net +- Updated to 4.2.4-0RC1 * Tue Dec 16 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.4-0base * Sat Dec 13 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/fallback.sh b/Shorewall6-lite/fallback.sh index e20d33c9d..1c38b2090 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall6-lite/install.sh b/Shorewall6-lite/install.sh index 887bf5b5d..600592d9a 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall6-lite/shorewall6-lite.spec b/Shorewall6-lite/shorewall6-lite.spec index b475bc3c6..62803a554 100644 --- a/Shorewall6-lite/shorewall6-lite.spec +++ b/Shorewall6-lite/shorewall6-lite.spec @@ -1,6 +1,6 @@ %define name shorewall6-lite -%define version 4.3.4 -%define release 0base +%define version 4.2.4 +%define release 0RC1 Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -89,6 +89,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Wed Dec 17 2008 Tom Eastep tom@shorewall.net +- Updated to 4.2.4-0RC1 * Tue Dec 16 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.4-0base * Sat Dec 13 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall6-lite/uninstall.sh b/Shorewall6-lite/uninstall.sh index fdb4b56bf..e804cd373 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall6/fallback.sh b/Shorewall6/fallback.sh index ea00018d2..dc74e04d2 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall6/install.sh b/Shorewall6/install.sh index ca9603679..b51d32f1d 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/Shorewall6/shorewall6.spec b/Shorewall6/shorewall6.spec index dd04b278a..2a09c172b 100644 --- a/Shorewall6/shorewall6.spec +++ b/Shorewall6/shorewall6.spec @@ -1,6 +1,6 @@ %define name shorewall6 -%define version 4.3.4 -%define release 0base +%define version 4.2.4 +%define release 0RC1 Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Name: %{name} @@ -148,6 +148,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples6 %changelog +* Wed Dec 17 2008 Tom Eastep tom@shorewall.net +- Updated to 4.2.4-0RC1 * Tue Dec 16 2008 Tom Eastep tom@shorewall.net - Updated to 4.3.4-0base * Sat Dec 13 2008 Tom Eastep tom@shorewall.net diff --git a/Shorewall6/uninstall.sh b/Shorewall6/uninstall.sh index 86cd54859..4672011ff 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.3.4 +VERSION=4.2.4-RC1 usage() # $1 = exit status { diff --git a/tools/build/buildshorewall b/tools/build/buildshorewall index e82af3cd4..d51c58949 100755 --- a/tools/build/buildshorewall +++ b/tools/build/buildshorewall @@ -217,7 +217,7 @@ case $1 in BUILDLITE=Yes case $1 in - 4.[02].*) + 4.0.*) ;; *) BUILD6=Yes @@ -419,7 +419,9 @@ case $VERSION in # BASEVERSION=${VERSION%-*} RPMNAME=shorewall-common-${BASEVERSION}-0${VERSION#*-}.noarch.rpm + RP6MNAME=shorewall6-${BASEVERSION}-0${VERSION#*-}.noarch.rpm LITERPMNAME=shorewall-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm + LITE6RPMNAME=shorewall6-lite-${BASEVERSION}-0${VERSION#*-}.noarch.rpm PERLRPMNAME=shorewall-perl-${BASEVERSION}-0${VERSION#*-}.noarch.rpm SHELLRPMNAME=shorewall-shell-${BASEVERSION}-0${VERSION#*-}.noarch.rpm ;; @@ -428,7 +430,9 @@ case $VERSION in # Patch Release # RPMNAME=shorewall-common-${BASEVERSION}-${PATCHNUM}.noarch.rpm + RPM6NAME=shorewall6-${BASEVERSION}-${PATCHNUM}.noarch.rpm LITERPMNAME=shorewall-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm + LITE6RPMNAME=shorewall6-lite-${BASEVERSION}-${PATCHNUM}.noarch.rpm PERLRPMNAME=shorewall-perl-${BASEVERSION}-${PATCHNUM}.noarch.rpm SHELLRPMNAME=shorewall-shell-${BASEVERSION}-${PATCHNUM}.noarch.rpm ;;