Version to 4.4.10-RC2

This commit is contained in:
Tom Eastep 2010-06-04 16:19:15 -07:00
parent 742a3b2eef
commit 0e995d65ac
17 changed files with 55 additions and 36 deletions

View File

@ -23,7 +23,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
VERSION=4.4.10 VERSION=4.4.10-RC2
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -1,6 +1,6 @@
%define name shorewall-init %define name shorewall-init
%define version 4.4.10 %define version 4.4.10
%define release 0base %define release 0RC2
Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall). Summary: Shorewall-init adds functionality to Shoreline Firewall (Shorewall).
Name: %{name} Name: %{name}
@ -99,8 +99,8 @@ fi
%doc COPYING changelog.txt releasenotes.txt %doc COPYING changelog.txt releasenotes.txt
%changelog %changelog
* Thu Jun 03 2010 Tom Eastep tom@shorewall.net * Fri Jun 04 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.10-0base - Updated to 4.4.10-0RC2
* Thu May 27 2010 Tom Eastep tom@shorewall.net * Thu May 27 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.10-0RC1 - Updated to 4.4.10-0RC1
* Wed May 26 2010 Tom Eastep tom@shorewall.net * Wed May 26 2010 Tom Eastep tom@shorewall.net

View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.4.10 VERSION=4.4.10-RC2
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
VERSION=4.4.10 VERSION=4.4.10-RC2
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -1,6 +1,6 @@
%define name shorewall-lite %define name shorewall-lite
%define version 4.4.10 %define version 4.4.10
%define release 0base %define release 0RC2
Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
Name: %{name} Name: %{name}
@ -102,8 +102,8 @@ fi
%doc COPYING changelog.txt releasenotes.txt %doc COPYING changelog.txt releasenotes.txt
%changelog %changelog
* Thu Jun 03 2010 Tom Eastep tom@shorewall.net * Fri Jun 04 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.10-0base - Updated to 4.4.10-0RC2
* Thu May 27 2010 Tom Eastep tom@shorewall.net * Thu May 27 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.10-0RC1 - Updated to 4.4.10-0RC1
* Wed May 26 2010 Tom Eastep tom@shorewall.net * Wed May 26 2010 Tom Eastep tom@shorewall.net

View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.4.10 VERSION=4.4.10-RC2
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -341,7 +341,7 @@ sub initialize( $ ) {
EXPORT => 0, EXPORT => 0,
STATEMATCH => '-m state --state', STATEMATCH => '-m state --state',
UNTRACKED => 0, UNTRACKED => 0,
VERSION => "4.4.10", VERSION => "4.4.10-RC2",
CAPVERSION => 40408 , CAPVERSION => 40408 ,
); );

View File

@ -1385,18 +1385,37 @@ sub compile_updown() {
if ( @$required ) { if ( @$required ) {
my $interfaces = join '|', map $interfaces{$_}->{physical}, @$required; my $interfaces = join '|', map $interfaces{$_}->{physical}, @$required;
$interfaces =~ s/\+/*/; my $wildcard = ( $interfaces =~ s/\+/*/ );
emit( "$interfaces)", emit( "$interfaces)",
' if [ "$COMMAND" = up ]; then', ' if [ "$COMMAND" = up ]; then' );
' COMMAND=start',
' detect_configuration', if ( $wildcard ) {
' define_firewall', emit( ' if [ "$state" = started ]; then',
' else', ' COMMAND=restart',
' COMMAND=stop', ' else',
' detect_configuration', ' COMMAND=start',
' stop_firewall', ' fi' );
' fi', } else {
emit( ' COMMAND=start' );
}
emit( ' detect_configuration',
' define_firewall' );
if ( $wildcard ) {
emit( ' elif [ "$state" = started ]; then',
' COMMAND=restart',
' detect_configuration',
' define_firewall' );
} else {
emit( ' else',
' COMMAND=stop',
' detect_configuration',
' stop_firewall' );
}
emit( ' fi',
' ;;' ' ;;'
); );
} }

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
VERSION=4.4.10 VERSION=4.4.10-RC2
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -1,6 +1,6 @@
%define name shorewall %define name shorewall
%define version 4.4.10 %define version 4.4.10
%define release 0base %define release 0RC2
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
Name: %{name} Name: %{name}
@ -108,8 +108,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples %doc COPYING INSTALL changelog.txt releasenotes.txt Contrib/* Samples
%changelog %changelog
* Thu Jun 03 2010 Tom Eastep tom@shorewall.net * Fri Jun 04 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.10-0base - Updated to 4.4.10-0RC2
* Thu May 27 2010 Tom Eastep tom@shorewall.net * Thu May 27 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.10-0RC1 - Updated to 4.4.10-0RC1
* Wed May 26 2010 Tom Eastep tom@shorewall.net * Wed May 26 2010 Tom Eastep tom@shorewall.net

View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.4.10 VERSION=4.4.10-RC2
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
VERSION=4.4.10 VERSION=4.4.10-RC2
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -1,6 +1,6 @@
%define name shorewall6-lite %define name shorewall6-lite
%define version 4.4.10 %define version 4.4.10
%define release 0base %define release 0RC2
Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems. Summary: Shoreline Firewall 6 Lite is an ip6tables-based firewall for Linux systems.
Name: %{name} Name: %{name}
@ -93,8 +93,8 @@ fi
%doc COPYING changelog.txt releasenotes.txt %doc COPYING changelog.txt releasenotes.txt
%changelog %changelog
* Thu Jun 03 2010 Tom Eastep tom@shorewall.net * Fri Jun 04 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.10-0base - Updated to 4.4.10-0RC2
* Thu May 27 2010 Tom Eastep tom@shorewall.net * Thu May 27 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.10-0RC1 - Updated to 4.4.10-0RC1
* Wed May 26 2010 Tom Eastep tom@shorewall.net * Wed May 26 2010 Tom Eastep tom@shorewall.net

View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.4.10 VERSION=4.4.10-RC2
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
VERSION=4.4.10 VERSION=4.4.10-RC2
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -1,6 +1,6 @@
%define name shorewall6 %define name shorewall6
%define version 4.4.10 %define version 4.4.10
%define release 0base %define release 0RC2
Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems. Summary: Shoreline Firewall 6 is an ip6tables-based firewall for Linux systems.
Name: %{name} Name: %{name}
@ -98,8 +98,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn ipv6 Samples6
%changelog %changelog
* Thu Jun 03 2010 Tom Eastep tom@shorewall.net * Fri Jun 04 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.10-0base - Updated to 4.4.10-0RC2
* Thu May 27 2010 Tom Eastep tom@shorewall.net * Thu May 27 2010 Tom Eastep tom@shorewall.net
- Updated to 4.4.10-0RC1 - Updated to 4.4.10-0RC1
* Wed May 26 2010 Tom Eastep tom@shorewall.net * Wed May 26 2010 Tom Eastep tom@shorewall.net

View File

@ -26,7 +26,7 @@
# You may only use this script to uninstall the version # You may only use this script to uninstall the version
# shown below. Simply run this script to remove Shorewall Firewall # shown below. Simply run this script to remove Shorewall Firewall
VERSION=4.4.10 VERSION=4.4.10-RC2
usage() # $1 = exit status usage() # $1 = exit status
{ {