15 files changed, 93 insertions, 66 deletions

diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile
index 736547f1402b..0133e3ae349b 100644
--- a/security/openvpn-devel/Makefile
+++ b/security/openvpn-devel/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	openvpn
 PORTVERSION=	2.0.5
 PORTREVISION=	1
-CATEGORIES=	security
+CATEGORIES=	security net
+# MASTER_SITES points to hosts in distinct data centers,
+# so just one MASTER_SITES entry should be OK.
 MASTER_SITES=	http://openvpn.net/release/
 
 MAINTAINER=	matthias.andree@gmx.de
diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo
index 2c54d23a080d..6c8c6c6314f3 100644
--- a/security/openvpn-devel/distinfo
+++ b/security/openvpn-devel/distinfo
@@ -1,2 +1,3 @@
 MD5 (openvpn-2.0.5.tar.gz) = 4bd7a42991c93db23842a0992debe53b
+SHA256 (openvpn-2.0.5.tar.gz) = d72d90ff9e915c3376c834ce33a0349de0a8eacb3f2b80be49696b72a1840a9f
 SIZE (openvpn-2.0.5.tar.gz) = 662647
diff --git a/security/openvpn-devel/files/patch-tests-for-jail b/security/openvpn-devel/files/patch-tests-for-jail
index dbd789e0e5f5..c7a2c0d203cb 100644
--- a/security/openvpn-devel/files/patch-tests-for-jail
+++ b/security/openvpn-devel/files/patch-tests-for-jail
@@ -1,7 +1,5 @@
-Index: t_lpback.sh
-===================================================================
---- t_lpback.sh	(revision 774)
-+++ t_lpback.sh	(working copy)
+--- t_lpback.sh~
++++ t_lpback.sh
 @@ -19,11 +19,13 @@
  # 02110-1301, USA.
  
@@ -18,15 +16,12 @@ Index: t_lpback.sh
 +rm key.$$ log.$$
 +trap 0
  exit $e
-Index: t_cltsrv.sh
-===================================================================
---- t_cltsrv.sh	(revision 774)
-+++ t_cltsrv.sh	(working copy)
-@@ -20,19 +20,33 @@
+--- t_cltsrv.sh~
++++ t_cltsrv.sh
+@@ -19,20 +19,41 @@
+ # 02110-1301, USA.
  
  set -e
- echo "the following test will run about two minutes..." >&2
--trap "rm -f log.$$ ; false" 1 2 3 15
 +trap "rm -f log.$$ log.$$.signal ; trap 0 ; exit 77" 1 2 15
 +trap "rm -f log.$$ log.$$.signal ; exit 1" 0 3
 +addopts=
@@ -34,11 +29,20 @@ Index: t_cltsrv.sh
 +    FreeBSD)
 +    # FreeBSD jails map the outgoing IP to the jail IP - we need to
 +    # allow the real IP unless we want the test to run forever.
-+    if test `sysctl -n security.jail.jailed` != 0 ; then
++    if test "`sysctl 2>/dev/null -n security.jail.jailed`" = 1 \
++    || `ps -ostate $$ | tail -n1 | grep >/dev/null J` ; then
 +	addopts="--float"
++	if test "x`ifconfig | grep inet`" = x ; then
++	    echo "###"
++	    echo "### To run the test in a FreeBSD jail, you MUST add an IP alias for the jail's IP."
++	    echo "###"
++	    exit 1
++	fi
 +    fi
 +    ;;
 +esac
+ echo "the following test will run about two minutes..." >&2
+-trap "rm -f log.$$ ; false" 1 2 3 15
  set +e
  (
 -./openvpn --cd "${srcdir}" --config sample-config-files/loopback-server &
diff --git a/security/openvpn-devel/files/pkg-message.in b/security/openvpn-devel/files/pkg-message.in
index 0bf579b261d3..7b6d0e6cbfa0 100644
--- a/security/openvpn-devel/files/pkg-message.in
+++ b/security/openvpn-devel/files/pkg-message.in
@@ -1,9 +1,9 @@
 ### ------------------------------------------------------------------------
-###  The OpenVPN port, since v2.0.1, uses rcNG to start OpenVPN.
+###  The OpenVPN FreeBSD port, since v2.0.1, uses rcNG to start OpenVPN.
 ###  Edit /etc/rc.conf to start OpenVPN automatically at system startup.
 ###  See %%PREFIX%%/etc/rc.d/openvpn.sh for details.
 ### ------------------------------------------------------------------------
-###  To get OpenVPN 2.0 to talk with the 1.5/1.6 versions, you may need to
+###  To get OpenVPN 1.X to talk with the new 2.0 version, you may need to
 ###  edit the 1.X configuration file by adding these lines:
 ###    tun-mtu 1500
 ###    tun-mtu-extra 32
@@ -13,6 +13,8 @@
 ###  WARNING: THE DEFAULT PORT HAS CHANGED AND IS NOW 1194!
 ###  OpenVPN 1.6 and older used 5000 rather than 1194 as their default
 ###  port, so add the proper port options to your configuration file!
-### ------------------------------------------------------------------------
+### - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ###  For further compatibility, see <http://openvpn.net/relnotes.html>
 ### ------------------------------------------------------------------------
+###  If you want to donate to OpenVPN: <http://openvpn.net/donate.html>
+### ------------------------------------------------------------------------
diff --git a/security/openvpn-devel/pkg-descr b/security/openvpn-devel/pkg-descr
index 4f835080cd33..b527fa8fa75e 100644
--- a/security/openvpn-devel/pkg-descr
+++ b/security/openvpn-devel/pkg-descr
@@ -1,10 +1,10 @@
-OpenVPN is a robust and highly configurable VPN (Virtual Private
-Network) daemon which can be used to securely link two or more private
-networks using an encrypted tunnel over the internet. It uses UDP as its
-transport, avoiding TCP-over-TCP retransmission congestion. SSL can be
-used to authenticate the sites, or they can use a pre-shared secret.
+OpenVPN is a robust, scalable and highly configurable VPN (Virtual Private
+Network) daemon which can be used to securely link two or more private networks
+using an encrypted tunnel over the internet. It can operate over UDP or TCP,
+can use SSL or a pre-shared secret to authenticate peers, and in SSL mode, one
+server can handle many clients.
 
-WWW: http://openvpn.sourceforge.net/
+WWW: http://openvpn.net/
 
 - Matthias Andree
 matthias.andree@gmx.de
diff --git a/security/openvpn/Makefile b/security/openvpn/Makefile
index 736547f1402b..0133e3ae349b 100644
--- a/security/openvpn/Makefile
+++ b/security/openvpn/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	openvpn
 PORTVERSION=	2.0.5
 PORTREVISION=	1
-CATEGORIES=	security
+CATEGORIES=	security net
+# MASTER_SITES points to hosts in distinct data centers,
+# so just one MASTER_SITES entry should be OK.
 MASTER_SITES=	http://openvpn.net/release/
 
 MAINTAINER=	matthias.andree@gmx.de
diff --git a/security/openvpn/distinfo b/security/openvpn/distinfo
index 2c54d23a080d..6c8c6c6314f3 100644
--- a/security/openvpn/distinfo
+++ b/security/openvpn/distinfo
@@ -1,2 +1,3 @@
 MD5 (openvpn-2.0.5.tar.gz) = 4bd7a42991c93db23842a0992debe53b
+SHA256 (openvpn-2.0.5.tar.gz) = d72d90ff9e915c3376c834ce33a0349de0a8eacb3f2b80be49696b72a1840a9f
 SIZE (openvpn-2.0.5.tar.gz) = 662647
diff --git a/security/openvpn/files/patch-tests-for-jail b/security/openvpn/files/patch-tests-for-jail
index dbd789e0e5f5..c7a2c0d203cb 100644
--- a/security/openvpn/files/patch-tests-for-jail
+++ b/security/openvpn/files/patch-tests-for-jail
@@ -1,7 +1,5 @@
-Index: t_lpback.sh
-===================================================================
---- t_lpback.sh	(revision 774)
-+++ t_lpback.sh	(working copy)
+--- t_lpback.sh~
++++ t_lpback.sh
 @@ -19,11 +19,13 @@
  # 02110-1301, USA.
  
@@ -18,15 +16,12 @@ Index: t_lpback.sh
 +rm key.$$ log.$$
 +trap 0
  exit $e
-Index: t_cltsrv.sh
-===================================================================
---- t_cltsrv.sh	(revision 774)
-+++ t_cltsrv.sh	(working copy)
-@@ -20,19 +20,33 @@
+--- t_cltsrv.sh~
++++ t_cltsrv.sh
+@@ -19,20 +19,41 @@
+ # 02110-1301, USA.
  
  set -e
- echo "the following test will run about two minutes..." >&2
--trap "rm -f log.$$ ; false" 1 2 3 15
 +trap "rm -f log.$$ log.$$.signal ; trap 0 ; exit 77" 1 2 15
 +trap "rm -f log.$$ log.$$.signal ; exit 1" 0 3
 +addopts=
@@ -34,11 +29,20 @@ Index: t_cltsrv.sh
 +    FreeBSD)
 +    # FreeBSD jails map the outgoing IP to the jail IP - we need to
 +    # allow the real IP unless we want the test to run forever.
-+    if test `sysctl -n security.jail.jailed` != 0 ; then
++    if test "`sysctl 2>/dev/null -n security.jail.jailed`" = 1 \
++    || `ps -ostate $$ | tail -n1 | grep >/dev/null J` ; then
 +	addopts="--float"
++	if test "x`ifconfig | grep inet`" = x ; then
++	    echo "###"
++	    echo "### To run the test in a FreeBSD jail, you MUST add an IP alias for the jail's IP."
++	    echo "###"
++	    exit 1
++	fi
 +    fi
 +    ;;
 +esac
+ echo "the following test will run about two minutes..." >&2
+-trap "rm -f log.$$ ; false" 1 2 3 15
  set +e
  (
 -./openvpn --cd "${srcdir}" --config sample-config-files/loopback-server &
diff --git a/security/openvpn/files/pkg-message.in b/security/openvpn/files/pkg-message.in
index 0bf579b261d3..7b6d0e6cbfa0 100644
--- a/security/openvpn/files/pkg-message.in
+++ b/security/openvpn/files/pkg-message.in
@@ -1,9 +1,9 @@
 ### ------------------------------------------------------------------------
-###  The OpenVPN port, since v2.0.1, uses rcNG to start OpenVPN.
+###  The OpenVPN FreeBSD port, since v2.0.1, uses rcNG to start OpenVPN.
 ###  Edit /etc/rc.conf to start OpenVPN automatically at system startup.
 ###  See %%PREFIX%%/etc/rc.d/openvpn.sh for details.
 ### ------------------------------------------------------------------------
-###  To get OpenVPN 2.0 to talk with the 1.5/1.6 versions, you may need to
+###  To get OpenVPN 1.X to talk with the new 2.0 version, you may need to
 ###  edit the 1.X configuration file by adding these lines:
 ###    tun-mtu 1500
 ###    tun-mtu-extra 32
@@ -13,6 +13,8 @@
 ###  WARNING: THE DEFAULT PORT HAS CHANGED AND IS NOW 1194!
 ###  OpenVPN 1.6 and older used 5000 rather than 1194 as their default
 ###  port, so add the proper port options to your configuration file!
-### ------------------------------------------------------------------------
+### - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ###  For further compatibility, see <http://openvpn.net/relnotes.html>
 ### ------------------------------------------------------------------------
+###  If you want to donate to OpenVPN: <http://openvpn.net/donate.html>
+### ------------------------------------------------------------------------
diff --git a/security/openvpn/pkg-descr b/security/openvpn/pkg-descr
index 4f835080cd33..b527fa8fa75e 100644
--- a/security/openvpn/pkg-descr
+++ b/security/openvpn/pkg-descr
@@ -1,10 +1,10 @@
-OpenVPN is a robust and highly configurable VPN (Virtual Private
-Network) daemon which can be used to securely link two or more private
-networks using an encrypted tunnel over the internet. It uses UDP as its
-transport, avoiding TCP-over-TCP retransmission congestion. SSL can be
-used to authenticate the sites, or they can use a pre-shared secret.
+OpenVPN is a robust, scalable and highly configurable VPN (Virtual Private
+Network) daemon which can be used to securely link two or more private networks
+using an encrypted tunnel over the internet. It can operate over UDP or TCP,
+can use SSL or a pre-shared secret to authenticate peers, and in SSL mode, one
+server can handle many clients.
 
-WWW: http://openvpn.sourceforge.net/
+WWW: http://openvpn.net/
 
 - Matthias Andree
 matthias.andree@gmx.de
diff --git a/security/openvpn20/Makefile b/security/openvpn20/Makefile
index 736547f1402b..0133e3ae349b 100644
--- a/security/openvpn20/Makefile
+++ b/security/openvpn20/Makefile
@@ -8,7 +8,9 @@
 PORTNAME=	openvpn
 PORTVERSION=	2.0.5
 PORTREVISION=	1
-CATEGORIES=	security
+CATEGORIES=	security net
+# MASTER_SITES points to hosts in distinct data centers,
+# so just one MASTER_SITES entry should be OK.
 MASTER_SITES=	http://openvpn.net/release/
 
 MAINTAINER=	matthias.andree@gmx.de
diff --git a/security/openvpn20/distinfo b/security/openvpn20/distinfo
index 2c54d23a080d..6c8c6c6314f3 100644
--- a/security/openvpn20/distinfo
+++ b/security/openvpn20/distinfo
@@ -1,2 +1,3 @@
 MD5 (openvpn-2.0.5.tar.gz) = 4bd7a42991c93db23842a0992debe53b
+SHA256 (openvpn-2.0.5.tar.gz) = d72d90ff9e915c3376c834ce33a0349de0a8eacb3f2b80be49696b72a1840a9f
 SIZE (openvpn-2.0.5.tar.gz) = 662647
diff --git a/security/openvpn20/files/patch-tests-for-jail b/security/openvpn20/files/patch-tests-for-jail
index dbd789e0e5f5..c7a2c0d203cb 100644
--- a/security/openvpn20/files/patch-tests-for-jail
+++ b/security/openvpn20/files/patch-tests-for-jail
@@ -1,7 +1,5 @@
-Index: t_lpback.sh
-===================================================================
---- t_lpback.sh	(revision 774)
-+++ t_lpback.sh	(working copy)
+--- t_lpback.sh~
++++ t_lpback.sh
 @@ -19,11 +19,13 @@
  # 02110-1301, USA.
  
@@ -18,15 +16,12 @@ Index: t_lpback.sh
 +rm key.$$ log.$$
 +trap 0
  exit $e
-Index: t_cltsrv.sh
-===================================================================
---- t_cltsrv.sh	(revision 774)
-+++ t_cltsrv.sh	(working copy)
-@@ -20,19 +20,33 @@
+--- t_cltsrv.sh~
++++ t_cltsrv.sh
+@@ -19,20 +19,41 @@
+ # 02110-1301, USA.
  
  set -e
- echo "the following test will run about two minutes..." >&2
--trap "rm -f log.$$ ; false" 1 2 3 15
 +trap "rm -f log.$$ log.$$.signal ; trap 0 ; exit 77" 1 2 15
 +trap "rm -f log.$$ log.$$.signal ; exit 1" 0 3
 +addopts=
@@ -34,11 +29,20 @@ Index: t_cltsrv.sh
 +    FreeBSD)
 +    # FreeBSD jails map the outgoing IP to the jail IP - we need to
 +    # allow the real IP unless we want the test to run forever.
-+    if test `sysctl -n security.jail.jailed` != 0 ; then
++    if test "`sysctl 2>/dev/null -n security.jail.jailed`" = 1 \
++    || `ps -ostate $$ | tail -n1 | grep >/dev/null J` ; then
 +	addopts="--float"
++	if test "x`ifconfig | grep inet`" = x ; then
++	    echo "###"
++	    echo "### To run the test in a FreeBSD jail, you MUST add an IP alias for the jail's IP."
++	    echo "###"
++	    exit 1
++	fi
 +    fi
 +    ;;
 +esac
+ echo "the following test will run about two minutes..." >&2
+-trap "rm -f log.$$ ; false" 1 2 3 15
  set +e
  (
 -./openvpn --cd "${srcdir}" --config sample-config-files/loopback-server &
diff --git a/security/openvpn20/files/pkg-message.in b/security/openvpn20/files/pkg-message.in
index 0bf579b261d3..7b6d0e6cbfa0 100644
--- a/security/openvpn20/files/pkg-message.in
+++ b/security/openvpn20/files/pkg-message.in
@@ -1,9 +1,9 @@
 ### ------------------------------------------------------------------------
-###  The OpenVPN port, since v2.0.1, uses rcNG to start OpenVPN.
+###  The OpenVPN FreeBSD port, since v2.0.1, uses rcNG to start OpenVPN.
 ###  Edit /etc/rc.conf to start OpenVPN automatically at system startup.
 ###  See %%PREFIX%%/etc/rc.d/openvpn.sh for details.
 ### ------------------------------------------------------------------------
-###  To get OpenVPN 2.0 to talk with the 1.5/1.6 versions, you may need to
+###  To get OpenVPN 1.X to talk with the new 2.0 version, you may need to
 ###  edit the 1.X configuration file by adding these lines:
 ###    tun-mtu 1500
 ###    tun-mtu-extra 32
@@ -13,6 +13,8 @@
 ###  WARNING: THE DEFAULT PORT HAS CHANGED AND IS NOW 1194!
 ###  OpenVPN 1.6 and older used 5000 rather than 1194 as their default
 ###  port, so add the proper port options to your configuration file!
-### ------------------------------------------------------------------------
+### - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ###  For further compatibility, see <http://openvpn.net/relnotes.html>
 ### ------------------------------------------------------------------------
+###  If you want to donate to OpenVPN: <http://openvpn.net/donate.html>
+### ------------------------------------------------------------------------
diff --git a/security/openvpn20/pkg-descr b/security/openvpn20/pkg-descr
index 4f835080cd33..b527fa8fa75e 100644
--- a/security/openvpn20/pkg-descr
+++ b/security/openvpn20/pkg-descr
@@ -1,10 +1,10 @@
-OpenVPN is a robust and highly configurable VPN (Virtual Private
-Network) daemon which can be used to securely link two or more private
-networks using an encrypted tunnel over the internet. It uses UDP as its
-transport, avoiding TCP-over-TCP retransmission congestion. SSL can be
-used to authenticate the sites, or they can use a pre-shared secret.
+OpenVPN is a robust, scalable and highly configurable VPN (Virtual Private
+Network) daemon which can be used to securely link two or more private networks
+using an encrypted tunnel over the internet. It can operate over UDP or TCP,
+can use SSL or a pre-shared secret to authenticate peers, and in SSL mode, one
+server can handle many clients.
 
-WWW: http://openvpn.sourceforge.net/
+WWW: http://openvpn.net/
 
 - Matthias Andree
 matthias.andree@gmx.de