mirror of
https://gitlab.com/shorewall/code.git
synced 2025-06-19 08:07:13 +02:00
Changes for 1.3.14 RC1
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@430 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
0079744348
commit
5b9a57d49e
@ -17,5 +17,3 @@ Changes since 1.3.13
|
|||||||
7. Updated copyrights for 2003.
|
7. Updated copyrights for 2003.
|
||||||
|
|
||||||
8. Added support for openvpn tunnels on arbitrary ports
|
8. Added support for openvpn tunnels on arbitrary ports
|
||||||
|
|
||||||
9. Added support for openvpn with NAT on the other end.
|
|
||||||
|
@ -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=1.3.14Beta2
|
VERSION=1.3.14RC1
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -1424,7 +1424,7 @@ setup_tunnels() # $1 = name of tunnels file
|
|||||||
echo " PPTP server defined."
|
echo " PPTP server defined."
|
||||||
}
|
}
|
||||||
|
|
||||||
setup_one_openvpn() # $1 = gateway, $2 = kind
|
setup_one_openvpn() # $1 = gateway, $2 = kind[:port]
|
||||||
{
|
{
|
||||||
case $2 in
|
case $2 in
|
||||||
*:*)
|
*:*)
|
||||||
@ -1435,14 +1435,8 @@ setup_tunnels() # $1 = name of tunnels file
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [ $3 = openvpn ]; then
|
addrule $inchain -p udp -s $1 --sport $p --dport $p -j ACCEPT
|
||||||
sport="--sport $p"
|
addrule $outchain -p udp -d $1 --sport $p --dport $p -j ACCEPT
|
||||||
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
|
|
||||||
|
|
||||||
echo " OPENVPN tunnel to $1:$p defined."
|
echo " OPENVPN tunnel to $1:$p defined."
|
||||||
}
|
}
|
||||||
@ -1474,11 +1468,8 @@ setup_tunnels() # $1 = name of tunnels file
|
|||||||
pptpserver|PPTPSERVER)
|
pptpserver|PPTPSERVER)
|
||||||
setup_pptp_server
|
setup_pptp_server
|
||||||
;;
|
;;
|
||||||
openvpn*|OPENVPN*)
|
openvpn|OPENVPN|openvpn:*|OPENVPN:*)
|
||||||
setup_one_openvpn $gateway $kind openvpn
|
setup_one_openvpn $gateway $kind
|
||||||
;;
|
|
||||||
openvpnnat*|OPENVPNNAT*)
|
|
||||||
setup_one_openvpn $gateway $kind openvpnnat
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
error_message "Tunnels of type $kind are not supported:" \
|
error_message "Tunnels of type $kind are not supported:" \
|
||||||
|
@ -54,7 +54,7 @@
|
|||||||
# /etc/rc.d/rc.local file is modified to start the firewall.
|
# /etc/rc.d/rc.local file is modified to start the firewall.
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION=1.3.14Beta2
|
VERSION=1.3.14RC1
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
%define name shorewall
|
%define name shorewall
|
||||||
%define version 1.3.14
|
%define version 1.3.14
|
||||||
%define release 0Beta2
|
%define release 0RC1
|
||||||
%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.
|
||||||
@ -105,6 +105,8 @@ fi
|
|||||||
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
|
%doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
|
||||||
|
|
||||||
%changelog
|
%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>
|
* Tue Jan 28 2003 Tom Eastep <tom@shorewall.net>
|
||||||
- Changes version to 1.3.14-0Beta2
|
- Changes version to 1.3.14-0Beta2
|
||||||
* Sat Jan 25 2003 Tom Eastep <tom@shorewall.net>
|
* Sat Jan 25 2003 Tom Eastep <tom@shorewall.net>
|
||||||
|
@ -10,13 +10,12 @@
|
|||||||
# The columns are:
|
# The columns are:
|
||||||
#
|
#
|
||||||
# TYPE -- must start in column 1 and be "ipsec", "ipsecnat","ip"
|
# TYPE -- must start in column 1 and be "ipsec", "ipsecnat","ip"
|
||||||
# "gre", "pptpclient", "pptpserver", "openvpn" or
|
# "gre", "pptpclient", "pptpserver" or "openvpn".
|
||||||
# "openvpnnat"
|
|
||||||
#
|
#
|
||||||
# If type is "openvpn" or "openvpnnam", it may optionally
|
# If type is "openvpn", it may optionally be followed
|
||||||
# be followed by ":" and the port number used by the
|
# by ":" and the port number used by the tunnel. if no
|
||||||
# tunnel. If no ":" and port number are included, then
|
# ":" and port number are included, then the default port
|
||||||
# the default port of 5000 will be used
|
# of 5000 will be used
|
||||||
#
|
#
|
||||||
# ZONE -- The zone of the physical interface through which
|
# ZONE -- The zone of the physical interface through which
|
||||||
# tunnel traffic passes. This is normally your internet
|
# tunnel traffic passes. This is normally your internet
|
||||||
|
@ -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=1.3.14Beta2
|
VERSION=1.3.14RC1
|
||||||
|
|
||||||
usage() # $1 = exit status
|
usage() # $1 = exit status
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user