svn commit: r389128 - in head/security/openvpn: . files

[Matthias Andree]

Author: mandree
Date: Wed Jun 10 19:18:56 2015
New Revision: 389128
URL: https://svnweb.freebsd.org/changeset/ports/389128

Log:
  Update to new upstream release 2.3.7.
  
  Fixes
  PR:		194745

Deleted:
  head/security/openvpn/files/EF-subnet.patch
  head/security/openvpn/files/EF1.patch
  head/security/openvpn/files/EF2.patch
  head/security/openvpn/files/EF3.patch
Modified:
  head/security/openvpn/Makefile
  head/security/openvpn/distinfo

Modified: head/security/openvpn/Makefile
==============================================================================
--- head/security/openvpn/Makefile	Wed Jun 10 19:12:19 2015	(r389127)
+++ head/security/openvpn/Makefile	Wed Jun 10 19:18:56 2015	(r389128)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		openvpn
-DISTVERSION=		2.3.6
-PORTREVISION=		5
+DISTVERSION=		2.3.7
 CATEGORIES=		security net
 MASTER_SITES=		http://swupdate.openvpn.net/community/releases/ \
 			http://build.openvpn.net/downloads/releases/
@@ -28,8 +27,7 @@ LDFLAGS+=		-L${LOCALBASE}/lib
 # set PLUGIN_LIBDIR so that unqualified plugin paths are found:
 CPPFLAGS+=		-DPLUGIN_LIBDIR=\\\"${PREFIX}/lib/openvpn/plugins\\\"
 
-OPTIONS_DEFINE=		PW_SAVE PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \
-			ENGINEFIX2 SUBNETFIX
+OPTIONS_DEFINE=		PW_SAVE PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME
 OPTIONS_DEFAULT=	EASYRSA OPENSSL
 OPTIONS_SINGLE=		SSL
 OPTIONS_SINGLE_SSL=	OPENSSL POLARSSL
@@ -38,8 +36,6 @@ PKCS11_DESC=		Use security/pkcs11-helper
 EASYRSA_DESC=		Install security/easy-rsa RSA helper package
 POLARSSL_DESC=		SSL/TLS support via PolarSSL
 X509ALTUSERNAME_DESC=	Enable --x509-username-field (only with OpenSSL)
-ENGINEFIX2_DESC=	New EXPERIMENTAL patchset for SSL engine use (OpenSSL)
-SUBNETFIX_DESC=		EXPERIMENTAL patch to fix subnet mode (tkt \#481)
 
 EASYRSA_RUN_DEPENDS=	easy-rsa>=0:${PORTSDIR}/security/easy-rsa
 
@@ -52,18 +48,6 @@ X509ALTUSERNAME_CONFIGURE_ENABLE=	x509-a
 
 .include <bsd.port.options.mk>
 
-# patches to fix PR 195004, https://community.openvpn.net/openvpn/ticket/480
-.if ${PORT_OPTIONS:MENGINEFIX2}
-EXTRA_PATCHES+=		${FILESDIR}/EF1.patch:-p1 \
-			${FILESDIR}/EF2.patch:-p1 \
-			${FILESDIR}/EF3.patch:-p1
-.endif
-
-# patch to fix PR 194745, https://community.openvpn.net/openvpn/ticket/481
-.if ${PORT_OPTIONS:MSUBNETFIX}
-EXTRA_PATCHES+=		${FILESDIR}/EF-subnet.patch:-p1
-.endif
-
 .if ${PORT_OPTIONS:MPOLARSSL}
 . if ${PORT_OPTIONS:MX509ALTUSERNAME}
 BROKEN=	OpenVPN ${DISTVERSION} cannot use --x509-username-field with PolarSSL. Disable X509ALTUSERNAME, or use OpenSSL instead

Modified: head/security/openvpn/distinfo
==============================================================================
--- head/security/openvpn/distinfo	Wed Jun 10 19:12:19 2015	(r389127)
+++ head/security/openvpn/distinfo	Wed Jun 10 19:18:56 2015	(r389128)
@@ -1,2 +1,2 @@
-SHA256 (openvpn-2.3.6.tar.xz) = adae2ef34c9225347a844683b88caa87cde0979b7f2390fd1776db0eb51510ed
-SIZE (openvpn-2.3.6.tar.xz) = 809348
+SHA256 (openvpn-2.3.7.tar.xz) = 4062ce972500f98988e9c6e9dd1040be25582f0d49aa7e69f3f4cff96e9aebee
+SIZE (openvpn-2.3.7.tar.xz) = 812104