Update for 2.1.6

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1563 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2004-08-20 18:02:59 +00:00
parent 1027cd4911
commit 414356a535
6 changed files with 16 additions and 28 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=2.1.5 VERSION=2.1.6
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -1646,27 +1646,13 @@ setup_ipsec() {
for option in $opts; do for option in $opts; do
case $option in case $option in
reqid=*) reqid=*) newoptions="$newoptions --reqid ${option#*=}" ;;
newoptions="$newoptions --reqid ${option#*=}" spi=*) newoptions="$newoptions --spi ${option#*=}" ;;
;; proto=*) newoptions="$newoptions --proto ${option#*=}" ;;
spi=*) mode=*) newoptions="$newoptions --mode ${option#*=}" ;;
newoptions="$newoptions --spi ${option#*=}" tunnel-src=*) newoptions="$newoptions --tunnel-src ${option#*=}" ;;
;; tunnel-dst=*) newoptions="$newoptions --tunnel-dst ${option#*=}" ;;
proto=*) *) fatal_error "Invalid option \"$option\" for zone $zone" ;;
newoptions="$newoptions --proto ${option#*=}"
;;
mode=*)
newoptions="$newoptions --mode ${option#*=}"
;;
tunnel-src=*)
newoptions="$newoptions --tunnel-src ${option#*=}"
;;
tunnel-dst=*)
newoptions="$newoptions --tunnel-dst ${option#*=}"
;;
*)
fatal_error "Invalid option \"$option\" for zone $zone"
;;
esac esac
done done
@ -1697,8 +1683,8 @@ setup_ipsec() {
;; ;;
esac esac
do_options "" $options do_options "" $options
do_options "_in" $in_options do_options "_in" $in_options
do_options "_out" $out_options do_options "_out" $out_options
done < $TMP_DIR/ipsec done < $TMP_DIR/ipsec

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=2.1.5 VERSION=2.1.6
usage() # $1 = exit status usage() # $1 = exit status
{ {

View File

@ -1,4 +1,4 @@
Shorewall 2.1.5 Shorewall 2.1.6
---------------------------------------------------------------------- ----------------------------------------------------------------------
Problems Corrected since 2.0.3 Problems Corrected since 2.0.3

View File

@ -1,5 +1,5 @@
%define name shorewall %define name shorewall
%define version 2.1.5 %define version 2.1.6
%define release 1 %define release 1
%define prefix /usr %define prefix /usr
@ -128,6 +128,8 @@ fi
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
%changelog %changelog
* Fri Aug 20 2004 Tom Eastep tom@shorewall.net
- Updated to 2.1.6-1
* Wed Aug 18 2004 Tom Eastep tom@shorewall.net * Wed Aug 18 2004 Tom Eastep tom@shorewall.net
- Updated to 2.1.5-1 - Updated to 2.1.5-1
- Add /etc/shorewall/ipsec - Add /etc/shorewall/ipsec

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 Seattle Firewall # shown below. Simply run this script to remove Seattle Firewall
VERSION=2.1.5 VERSION=2.1.6
usage() # $1 = exit status usage() # $1 = exit status
{ {