From bed37c1965b59700ddc8d3988cc36ff7bf188780 Mon Sep 17 00:00:00 2001 From: teastep Date: Tue, 5 Feb 2008 23:35:53 +0000 Subject: [PATCH] Update versions git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8148 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb --- Shorewall-common/fallback.sh | 2 +- Shorewall-common/install.sh | 2 +- Shorewall-common/releasenotes.txt | 12 ++++++------ 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/Accounting.pm | 2 +- Shorewall-perl/Shorewall/Chains.pm | 2 +- Shorewall-perl/Shorewall/Compiler.pm | 2 +- Shorewall-perl/Shorewall/Config.pm | 4 ++-- Shorewall-perl/Shorewall/IPAddrs.pm | 8 +++++--- Shorewall-perl/Shorewall/Nat.pm | 2 +- Shorewall-perl/Shorewall/Providers.pm | 2 +- Shorewall-perl/Shorewall/Rules.pm | 2 +- Shorewall-perl/Shorewall/Tc.pm | 2 +- Shorewall-perl/Shorewall/Tunnels.pm | 2 +- Shorewall-perl/Shorewall/Zones.pm | 2 +- Shorewall-perl/install.sh | 2 +- Shorewall-perl/shorewall-perl.spec | 4 +++- Shorewall-shell/install.sh | 2 +- Shorewall-shell/shorewall-shell.spec | 4 +++- docs/VPNBasics.xml | 18 ++++++++++++++++++ 25 files changed, 60 insertions(+), 32 deletions(-) diff --git a/Shorewall-common/fallback.sh b/Shorewall-common/fallback.sh index a5f6cb2c5..6db9c25c6 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.1.4 +VERSION=4.1.5 usage() # $1 = exit status { diff --git a/Shorewall-common/install.sh b/Shorewall-common/install.sh index febf00a46..7cc84814f 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.1.4 +VERSION=4.1.5 usage() # $1 = exit status { diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index d9417ec43..f6e8cc2b9 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -499,8 +499,8 @@ New Features in Shorewall 4.1. /bin/sh after issuing a warning message. Previously, both terminated with a fatal error. -12) Shorewall-perl now generates fatal error conditions when there are - no IPv4 zones defined and when there are no interfaces defined. +12) Shorewall-perl now generates fatal error conditions if there are + no IPv4 zones defined or there are no interfaces defined. 13) Shorewall now unconditionally uses tc filter rules to classify traffic by MARK value. Previously, Shorewall used the CLASSIFY @@ -511,11 +511,11 @@ New Features in Shorewall 4.1. To install Shorewall-perl under Cygwin: - $ tar -xf shorewall-perl-4.1.3.tar.bz2 - $ tar -xf shorewall-common-4.1.3.tar.bz2 - $ cd shorewall-perl-4.1.3 + $ tar -zxf shorewall-perl-4.x.y.tar.bz2 + $ tar -zxf shorewall-common-4.x.y.tar.bz2 + $ cd shorewall-perl-4.x.y $ USER= GROUP=None ./install.sh - $ cd ../shorewall-common-4.1.3 + $ cd ../shorewall-common-4.x.y $ USER= GROUP=None ./install.sh The 'shorewall' program is installed in /bin/ (a.k.a, /usr/bin/). diff --git a/Shorewall-common/shorewall-common.spec b/Shorewall-common/shorewall-common.spec index 0ff35f56e..ea70a6b6c 100644 --- a/Shorewall-common/shorewall-common.spec +++ b/Shorewall-common/shorewall-common.spec @@ -1,5 +1,5 @@ %define name shorewall-common -%define version 4.1.4 +%define version 4.1.5 %define release 0base Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. @@ -243,6 +243,8 @@ fi %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel ipsecvpn Samples %changelog +* Tue Feb 05 2008 Tom Eastep tom@shorewall.net +- Updated to 4.1.5-0base * Fri Jan 04 2008 Tom Eastep tom@shorewall.net - Updated to 4.1.4-0base * Wed Dec 12 2007 Tom Eastep tom@shorewall.net diff --git a/Shorewall-common/uninstall.sh b/Shorewall-common/uninstall.sh index 48e6055cf..251de4956 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.1.4 +VERSION=4.1.5 usage() # $1 = exit status { diff --git a/Shorewall-lite/fallback.sh b/Shorewall-lite/fallback.sh index de2ac0e49..240457c8b 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.1.4 +VERSION=4.1.5 usage() # $1 = exit status { diff --git a/Shorewall-lite/install.sh b/Shorewall-lite/install.sh index 886785c20..263ecd3ac 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.1.4 +VERSION=4.1.5 usage() # $1 = exit status { diff --git a/Shorewall-lite/shorewall-lite.spec b/Shorewall-lite/shorewall-lite.spec index e898fd018..c1a571e88 100644 --- a/Shorewall-lite/shorewall-lite.spec +++ b/Shorewall-lite/shorewall-lite.spec @@ -1,5 +1,5 @@ %define name shorewall-lite -%define version 4.1.4 +%define version 4.1.5 %define release 0base Summary: Shoreline Firewall Lite is an iptables-based firewall for Linux systems. @@ -98,6 +98,8 @@ fi %doc COPYING changelog.txt releasenotes.txt %changelog +* Tue Feb 05 2008 Tom Eastep tom@shorewall.net +- Updated to 4.1.5-0base * Fri Jan 04 2008 Tom Eastep tom@shorewall.net - Updated to 4.1.4-0base * Wed Dec 12 2007 Tom Eastep tom@shorewall.net diff --git a/Shorewall-lite/uninstall.sh b/Shorewall-lite/uninstall.sh index ef2e5765f..1e16a1e20 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.1.4 +VERSION=4.1.5 usage() # $1 = exit status { diff --git a/Shorewall-perl/Shorewall/Accounting.pm b/Shorewall-perl/Shorewall/Accounting.pm index de6a1b72f..7bae110b7 100644 --- a/Shorewall-perl/Shorewall/Accounting.pm +++ b/Shorewall-perl/Shorewall/Accounting.pm @@ -35,7 +35,7 @@ use strict; our @ISA = qw(Exporter); our @EXPORT = qw( setup_accounting ); our @EXPORT_OK = qw( ); -our $VERSION = 4.0.6; +our $VERSION = 4.1.5; # # Initialize globals -- we take this novel approach to globals initialization to allow diff --git a/Shorewall-perl/Shorewall/Chains.pm b/Shorewall-perl/Shorewall/Chains.pm index 402837a7e..f96ba98f9 100644 --- a/Shorewall-perl/Shorewall/Chains.pm +++ b/Shorewall-perl/Shorewall/Chains.pm @@ -144,7 +144,7 @@ our %EXPORT_TAGS = ( Exporter::export_ok_tags('internal'); -our $VERSION = 4.1.2; +our $VERSION = 4.1.5; # # Chain Table diff --git a/Shorewall-perl/Shorewall/Compiler.pm b/Shorewall-perl/Shorewall/Compiler.pm index e250ee8c8..dbe89c275 100644 --- a/Shorewall-perl/Shorewall/Compiler.pm +++ b/Shorewall-perl/Shorewall/Compiler.pm @@ -41,7 +41,7 @@ use Shorewall::Proxyarp; our @ISA = qw(Exporter); our @EXPORT = qw( compiler EXPORT TIMESTAMP DEBUG ); our @EXPORT_OK = qw( $export ); -our $VERSION = 4.1.2; +our $VERSION = 4.1.4; our $export; diff --git a/Shorewall-perl/Shorewall/Config.pm b/Shorewall-perl/Shorewall/Config.pm index 7d6920308..f2c5092eb 100644 --- a/Shorewall-perl/Shorewall/Config.pm +++ b/Shorewall-perl/Shorewall/Config.pm @@ -107,7 +107,7 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_object Exporter::export_ok_tags('internal'); -our $VERSION = 4.1.3; +our $VERSION = 4.1.4; # # describe the current command, it's present progressive, and it's completion. @@ -255,7 +255,7 @@ sub initialize() { ORIGINAL_POLICY_MATCH => '', LOGPARMS => '', TC_SCRIPT => '', - VERSION => "4.1.4", + VERSION => "4.1.5", CAPVERSION => 40100 , ); # diff --git a/Shorewall-perl/Shorewall/IPAddrs.pm b/Shorewall-perl/Shorewall/IPAddrs.pm index 729ab89e6..a87eec5bd 100644 --- a/Shorewall-perl/Shorewall/IPAddrs.pm +++ b/Shorewall-perl/Shorewall/IPAddrs.pm @@ -20,7 +20,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # -# This module provides interfaces for dealing with IPv4 addresses. +# This module provides interfaces for dealing with IPv4 addresses, protocol names, and +# port names. It also exports functions for validating protocol- and port- (service) +# related constructs. # package Shorewall::IPAddrs; require Exporter; @@ -49,7 +51,7 @@ our @EXPORT = qw( ALLIPv4 validate_icmp ); our @EXPORT_OK = qw( ); -our $VERSION = 4.0.5; +our $VERSION = 4.1.5; # # Some IPv4 useful stuff @@ -194,7 +196,7 @@ sub rfc1918_networks() { } # -# Resolve the contents of the PROTO column. +# Protocol/port validation # our %nametoproto = ( all => 0, ALL => 0, icmp => 1, ICMP => 1, tcp => 6, TCP => 6, udp => 17, UDP => 17 ); diff --git a/Shorewall-perl/Shorewall/Nat.pm b/Shorewall-perl/Shorewall/Nat.pm index 9cc34beab..8194d75c5 100644 --- a/Shorewall-perl/Shorewall/Nat.pm +++ b/Shorewall-perl/Shorewall/Nat.pm @@ -37,7 +37,7 @@ use strict; our @ISA = qw(Exporter); our @EXPORT = qw( setup_masq setup_nat setup_netmap add_addresses ); our @EXPORT_OK = (); -our $VERSION = 4.0.6; +our $VERSION = 4.1.4; our @addresses_to_add; our %addresses_to_add; diff --git a/Shorewall-perl/Shorewall/Providers.pm b/Shorewall-perl/Shorewall/Providers.pm index 51979a921..bce4d1711 100644 --- a/Shorewall-perl/Shorewall/Providers.pm +++ b/Shorewall-perl/Shorewall/Providers.pm @@ -35,7 +35,7 @@ use strict; our @ISA = qw(Exporter); our @EXPORT = qw( setup_providers @routemarked_interfaces); our @EXPORT_OK = qw( initialize lookup_provider ); -our $VERSION = 4.1.1; +our $VERSION = 4.1.4; use constant { LOCAL_NUMBER => 255, MAIN_NUMBER => 254, diff --git a/Shorewall-perl/Shorewall/Rules.pm b/Shorewall-perl/Shorewall/Rules.pm index 632f60545..91a3bf6b4 100644 --- a/Shorewall-perl/Shorewall/Rules.pm +++ b/Shorewall-perl/Shorewall/Rules.pm @@ -47,7 +47,7 @@ our @EXPORT = qw( process_tos dump_rule_chains ); our @EXPORT_OK = qw( process_rule process_rule1 initialize ); -our $VERSION = 4.1.2; +our $VERSION = 4.1.5; # # Keep track of chains for the /var/lib/shorewall[-lite]/chains file diff --git a/Shorewall-perl/Shorewall/Tc.pm b/Shorewall-perl/Shorewall/Tc.pm index a88c4f275..400c4451a 100644 --- a/Shorewall-perl/Shorewall/Tc.pm +++ b/Shorewall-perl/Shorewall/Tc.pm @@ -39,7 +39,7 @@ use strict; our @ISA = qw(Exporter); our @EXPORT = qw( setup_tc ); our @EXPORT_OK = qw( process_tc_rule initialize ); -our $VERSION = 4.0.6; +our $VERSION = 4.1.4; our %tcs = ( T => { chain => 'tcpost', connmark => 0, diff --git a/Shorewall-perl/Shorewall/Tunnels.pm b/Shorewall-perl/Shorewall/Tunnels.pm index 1ae368371..e3db70df6 100644 --- a/Shorewall-perl/Shorewall/Tunnels.pm +++ b/Shorewall-perl/Shorewall/Tunnels.pm @@ -34,7 +34,7 @@ use strict; our @ISA = qw(Exporter); our @EXPORT = qw( setup_tunnels ); our @EXPORT_OK = ( ); -our $VERSION = 4.0.6; +our $VERSION = 4.1.4; # # Here starts the tunnel stuff -- we really should get rid of this crap... diff --git a/Shorewall-perl/Shorewall/Zones.pm b/Shorewall-perl/Shorewall/Zones.pm index 1dac67773..340b5797c 100644 --- a/Shorewall-perl/Shorewall/Zones.pm +++ b/Shorewall-perl/Shorewall/Zones.pm @@ -64,7 +64,7 @@ our @EXPORT = qw( NOTHING ); our @EXPORT_OK = qw( initialize ); -our $VERSION = 4.1.2; +our $VERSION = 4.1.4; # # IPSEC Option types diff --git a/Shorewall-perl/install.sh b/Shorewall-perl/install.sh index 15257c692..d1f4bacfa 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.1.4 +VERSION=4.1.5 usage() # $1 = exit status { diff --git a/Shorewall-perl/shorewall-perl.spec b/Shorewall-perl/shorewall-perl.spec index 983e77904..6c78d7f05 100644 --- a/Shorewall-perl/shorewall-perl.spec +++ b/Shorewall-perl/shorewall-perl.spec @@ -1,5 +1,5 @@ %define name shorewall-perl -%define version 4.1.4 +%define version 4.1.5 %define release 0base Summary: Shoreline Firewall Perl-based compiler. @@ -64,6 +64,8 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING releasenotes.txt %changelog +* Tue Feb 05 2008 Tom Eastep tom@shorewall.net +- Updated to 4.1.5-0base * Fri Jan 04 2008 Tom Eastep tom@shorewall.net - Updated to 4.1.4-0base * Wed Dec 12 2007 Tom Eastep tom@shorewall.net diff --git a/Shorewall-shell/install.sh b/Shorewall-shell/install.sh index b8a3a53d2..081d6c9b1 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.1.4 +VERSION=4.1.5 usage() # $1 = exit status { diff --git a/Shorewall-shell/shorewall-shell.spec b/Shorewall-shell/shorewall-shell.spec index 560bdbc68..f1b777052 100644 --- a/Shorewall-shell/shorewall-shell.spec +++ b/Shorewall-shell/shorewall-shell.spec @@ -1,5 +1,5 @@ %define name shorewall-shell -%define version 4.1.4 +%define version 4.1.5 %define release 0base Summary: Shoreline Firewall is an iptables-based firewall for Linux systems. @@ -81,6 +81,8 @@ fi %doc COPYING INSTALL %changelog +* Tue Feb 05 2008 Tom Eastep tom@shorewall.net +- Updated to 4.1.5-0base * Fri Jan 04 2008 Tom Eastep tom@shorewall.net - Updated to 4.1.4-0base * Wed Dec 12 2007 Tom Eastep tom@shorewall.net diff --git a/docs/VPNBasics.xml b/docs/VPNBasics.xml index 5ab97ac03..cffe76b8f 100644 --- a/docs/VPNBasics.xml +++ b/docs/VPNBasics.xml @@ -396,4 +396,22 @@ ACCEPT $FW Z1:1.2.3.4 udp - P + +
+ Links to Other VPN Articles at shorewall.net + + + + OpenVPN + + + + IPSEC + + + + PPTP + + +
\ No newline at end of file