Update version to Beta 7 for build testing

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6665 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-06-24 14:07:53 +00:00
parent 526f2e08ac
commit 86920338b1
14 changed files with 26 additions and 15 deletions

View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of # shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall. # Shoreline Firewall.
VERSION=4.0.0-Beta6 VERSION=4.0.0-Beta7
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
# #
VERSION=4.0.0-Beta6 VERSION=4.0.0-Beta7
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -1,6 +1,6 @@
%define name shorewall %define name shorewall
%define version 4.0.0 %define version 4.0.0
%define release 0Beta6 %define release 0Beta7
%define prefix /usr %define prefix /usr
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@ -252,6 +252,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples
%changelog %changelog
* Sun Jun 24 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta7
* Wed Jun 20 2007 Tom Eastep tom@shorewall.net * Wed Jun 20 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta6 - Updated to 4.0.0-0Beta6
* Thu Jun 14 2007 Tom Eastep tom@shorewall.net * Thu Jun 14 2007 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.0.0-Beta6 VERSION=4.0.0-Beta7
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -28,7 +28,7 @@
# shown below. Simply run this script to revert to your prior version of # shown below. Simply run this script to revert to your prior version of
# Shoreline Firewall. # Shoreline Firewall.
VERSION=4.0.0-Beta6 VERSION=4.0.0-Beta7
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
# #
VERSION=4.0.0-Beta6 VERSION=4.0.0-Beta7
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.0.0 %define version 4.0.0
%define release 0Beta6 %define release 0Beta7
%define prefix /usr %define prefix /usr
Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems.
@ -99,6 +99,8 @@ fi
%doc COPYING changelog.txt releasenotes.txt %doc COPYING changelog.txt releasenotes.txt
%changelog %changelog
* Sun Jun 24 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta7
* Wed Jun 20 2007 Tom Eastep tom@shorewall.net * Wed Jun 20 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta6 - Updated to 4.0.0-0Beta6
* Thu Jun 14 2007 Tom Eastep tom@shorewall.net * Thu Jun 14 2007 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.0.0-Beta6 VERSION=4.0.0-Beta7
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -212,6 +212,7 @@ use constant { NULL_STATE => 0 , # Generating neither shell commands nor iptab
CMD_STATE => 2 }; # Generating shell commands. CMD_STATE => 2 }; # Generating shell commands.
our $state; our $state;
our $emitted_comment;
# #
# Initialize globals -- we take this novel approach to globals initialization to allow # Initialize globals -- we take this novel approach to globals initialization to allow
@ -302,6 +303,10 @@ sub initialize() {
# State of the generator. # State of the generator.
# #
$state = NULL_STATE; $state = NULL_STATE;
#
# When true, we've emitted a comment about global variable initialization
#
$emitted_comment = 0;
} }
INIT { INIT {
@ -1844,8 +1849,6 @@ sub emitr( $ ) {
} }
} }
my $emitted_comment = 0;
sub emit_comment() { sub emit_comment() {
unless ( $emitted_comment ) { unless ( $emitted_comment ) {
emitj ( '#', emitj ( '#',

View File

@ -128,7 +128,7 @@ sub initialize() {
ORIGINAL_POLICY_MATCH => '', ORIGINAL_POLICY_MATCH => '',
LOGPARMS => '', LOGPARMS => '',
TC_SCRIPT => '', TC_SCRIPT => '',
VERSION => '4.0.0-Beta6', VERSION => '4.0.0-Beta7',
CAPVERSION => 30405 , CAPVERSION => 30405 ,
); );
# #

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
# #
VERSION=4.0.0-Beta6 VERSION=4.0.0-Beta7
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -1,6 +1,6 @@
%define name shorewall-perl %define name shorewall-perl
%define version 4.0.0 %define version 4.0.0
%define release 0Beta6 %define release 0Beta7
%define prefix /usr %define prefix /usr
Summary: Shoreline Firewall Perl-based compiler. Summary: Shoreline Firewall Perl-based compiler.
@ -91,6 +91,8 @@ fi
%doc COPYING releasenotes.txt %doc COPYING releasenotes.txt
%changelog %changelog
* Sun Jun 24 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta7
* Wed Jun 20 2007 Tom Eastep tom@shorewall.net * Wed Jun 20 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta6 - Updated to 4.0.0-0Beta6
- Add new components. - Add new components.

View File

@ -22,7 +22,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
# #
VERSION=4.0.0-Beta6 VERSION=4.0.0-Beta7
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -1,6 +1,6 @@
%define name shorewall-shell %define name shorewall-shell
%define version 4.0.0 %define version 4.0.0
%define release 0Beta6 %define release 0Beta7
%define prefix /usr %define prefix /usr
Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@ -64,6 +64,8 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING INSTALL %doc COPYING INSTALL
%changelog %changelog
* Sun Jun 24 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta7
* Wed Jun 20 2007 Tom Eastep tom@shorewall.net * Wed Jun 20 2007 Tom Eastep tom@shorewall.net
- Updated to 4.0.0-0Beta6 - Updated to 4.0.0-0Beta6
* Thu Jun 14 2007 Tom Eastep tom@shorewall.net * Thu Jun 14 2007 Tom Eastep tom@shorewall.net