From 5b9a57d49ea9f42a2546b1e063abf5404e7454d2 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Tue, 4 Feb 2003 16:59:49 +0000
Subject: [PATCH] Changes for 1.3.14 RC1

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@430 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall/changelog.txt  |  2 --
 Shorewall/fallback.sh    |  2 +-
 Shorewall/firewall       | 19 +++++--------------
 Shorewall/install.sh     |  2 +-
 Shorewall/shorewall.spec |  4 +++-
 Shorewall/tunnels        | 11 +++++------
 Shorewall/uninstall.sh   |  2 +-
 7 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt
index aa1d92cfb..837f5b3d1 100755
--- a/Shorewall/changelog.txt
+++ b/Shorewall/changelog.txt
@@ -17,5 +17,3 @@ Changes since 1.3.13
 7. Updated copyrights for 2003.
 
 8. Added support for openvpn tunnels on arbitrary ports
-
-9. Added support for openvpn with NAT on the other end.
diff --git a/Shorewall/fallback.sh b/Shorewall/fallback.sh
index 01066f990..3b8149ad1 100755
--- a/Shorewall/fallback.sh
+++ b/Shorewall/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of 
 #       Shoreline Firewall.
 
-VERSION=1.3.14Beta2
+VERSION=1.3.14RC1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/firewall b/Shorewall/firewall
index d1a676b77..e080b1586 100755
--- a/Shorewall/firewall
+++ b/Shorewall/firewall
@@ -1424,7 +1424,7 @@ setup_tunnels() # $1 = name of tunnels file
 	echo "   PPTP server defined."
     }
 
-    setup_one_openvpn() # $1 = gateway, $2 = kind
+    setup_one_openvpn() # $1 = gateway, $2 = kind[:port]
     {
 	case $2 in
 	    *:*)
@@ -1435,14 +1435,8 @@ setup_tunnels() # $1 = name of tunnels file
 		;;
 	esac
 
-	if [ $3 = openvpn ]; then
-	    sport="--sport $p"
-	else
-	    sport=
-	fi
-
-	addrule $inchain  -p udp -s $1 $sport --dport $p -j ACCEPT
-	addrule $outchain -p udp -d $1 $sport --dport $p -j ACCEPT
+	addrule $inchain  -p udp -s $1 --sport $p --dport $p -j ACCEPT
+	addrule $outchain -p udp -d $1 --sport $p --dport $p -j ACCEPT
 
 	echo "   OPENVPN tunnel to $1:$p defined."
     }
@@ -1474,11 +1468,8 @@ setup_tunnels() # $1 = name of tunnels file
 		pptpserver|PPTPSERVER)
 		    setup_pptp_server
 		    ;;
-		openvpn*|OPENVPN*)
-		    setup_one_openvpn $gateway $kind openvpn
-		    ;;
-		openvpnnat*|OPENVPNNAT*)
-		    setup_one_openvpn $gateway $kind openvpnnat
+		openvpn|OPENVPN|openvpn:*|OPENVPN:*)
+		    setup_one_openvpn $gateway $kind
 		    ;;
 		*)
 		    error_message "Tunnels of type $kind are not supported:" \
diff --git a/Shorewall/install.sh b/Shorewall/install.sh
index 7dcc075de..46e874594 100755
--- a/Shorewall/install.sh
+++ b/Shorewall/install.sh
@@ -54,7 +54,7 @@
 #        /etc/rc.d/rc.local file is modified to start the firewall.
 #
 
-VERSION=1.3.14Beta2
+VERSION=1.3.14RC1
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall/shorewall.spec b/Shorewall/shorewall.spec
index 965c32f63..61003db82 100644
--- a/Shorewall/shorewall.spec
+++ b/Shorewall/shorewall.spec
@@ -1,6 +1,6 @@
 %define name shorewall
 %define version 1.3.14
-%define release 0Beta2
+%define release 0RC1
 %define prefix /usr
 
 Summary: Shoreline Firewall is an iptables-based firewall for Linux systems.
@@ -105,6 +105,8 @@ fi
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
 
 %changelog
+* Tue Feb 04 2003 Tom Eastep <tom@shorewall.net>
+- Changes version to 1.3.14-0RC1
 * Tue Jan 28 2003 Tom Eastep <tom@shorewall.net>
 - Changes version to 1.3.14-0Beta2
 * Sat Jan 25 2003 Tom Eastep <tom@shorewall.net>
diff --git a/Shorewall/tunnels b/Shorewall/tunnels
index cfb0a54fe..86747729b 100644
--- a/Shorewall/tunnels
+++ b/Shorewall/tunnels
@@ -10,13 +10,12 @@
 #	The columns are:
 #
 #	TYPE	    --	must start in column 1 and be "ipsec", "ipsecnat","ip"
-#			"gre", "pptpclient", "pptpserver", "openvpn" or
-#			"openvpnnat"
+#			"gre", "pptpclient", "pptpserver" or "openvpn".
 #
-#			If type is "openvpn" or "openvpnnam", it may optionally
-#			be followed by ":" and the port number used by the
-#			tunnel. If no ":" and port number are included, then
-#			the default port of 5000 will be used
+#			If type is "openvpn", it may optionally be followed
+#			by ":" and the port number used by the tunnel. if no
+#			":" and port number are included, then the default port
+#			of 5000 will be used
 #
 #	ZONE	    --	The zone of the physical interface through which
 #			tunnel traffic passes. This is normally your internet
diff --git a/Shorewall/uninstall.sh b/Shorewall/uninstall.sh
index c30563b47..0ef626153 100755
--- a/Shorewall/uninstall.sh
+++ b/Shorewall/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Seattle Firewall
 
-VERSION=1.3.14Beta2
+VERSION=1.3.14RC1
 
 usage() # $1 = exit status
 {