From owner-svn-ports-head@freebsd.org Fri Jan 8 09:03:50 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6982EA67BAC; Fri, 8 Jan 2016 09:03:50 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 29E8F1D1B; Fri, 8 Jan 2016 09:03:50 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0893nxS067201; Fri, 8 Jan 2016 09:03:49 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0893nro067199; Fri, 8 Jan 2016 09:03:49 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201601080903.u0893nro067199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Fri, 8 Jan 2016 09:03:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r405536 - head/security/openvpn X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2016 09:03:50 -0000 Author: mandree Date: Fri Jan 8 09:03:48 2016 New Revision: 405536 URL: https://svnweb.freebsd.org/changeset/ports/405536 Log: Upgrade to new upstream release 2.3.10. Now requires PolarSSL/mbedTLS 1.3.X with X >= 8, PolarSSL 1.2 is EOL. Match help text to the change. Make sure the build uses the local unpacked includes before the system includes, such that portmaster/portupgrade upgrades for PolarSSL work if 2.3.9 or older is pre-installed on the build system. Modified: head/security/openvpn/Makefile head/security/openvpn/distinfo Modified: head/security/openvpn/Makefile ============================================================================== --- head/security/openvpn/Makefile Fri Jan 8 09:02:01 2016 (r405535) +++ head/security/openvpn/Makefile Fri Jan 8 09:03:48 2016 (r405536) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openvpn -DISTVERSION= 2.3.9 +DISTVERSION= 2.3.10 CATEGORIES= security net MASTER_SITES= http://swupdate.openvpn.net/community/releases/ \ http://build.openvpn.net/downloads/releases/ @@ -20,8 +20,9 @@ SHEBANG_FILES= sample/sample-scripts/ve sample/sample-scripts/auth-pam.pl \ sample/sample-scripts/ucn.pl -# let OpenVPN's configure script pick up the requisite libraries: -CPPFLAGS+= -I${LOCALBASE}/include +# let OpenVPN's configure script pick up the requisite libraries, +# but do not break the plugin build if an older version is installed +CPPFLAGS+= -I${WRKSRC}/include -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib # set PLUGIN_LIBDIR so that unqualified plugin paths are found: @@ -36,7 +37,7 @@ OPTIONS_SINGLE_SSL= OPENSSL POLARSSL # PW_SAVE_DESC= Interactive passwords may be read from a file PKCS11_DESC= Use security/pkcs11-helper EASYRSA_DESC= Install security/easy-rsa RSA helper package -POLARSSL_DESC= SSL/TLS support via PolarSSL 1.2 +POLARSSL_DESC= SSL/TLS via PolarSSL (mbedTLS) 1.3.8+ (not 2.x) TUNNELBLICK_DESC= Tunnelblick XOR scramble patch (READ HELP!) X509ALTUSERNAME_DESC= Enable --x509-username-field (OpenSSL only) @@ -55,7 +56,10 @@ X509ALTUSERNAME_PREVENTS_MSG= OpenVPN ${ OPENSSL_USE= openssl=yes OPENSSL_CONFIGURE_ON= --with-crypto-library=openssl -POLARSSL_LIB_DEPENDS= libpolarssl.so:${PORTSDIR}/security/polarssl +# Pin the libmbedtls version because the 2.3.x port can't work with .so.10 or +# newer from the security/mbedtls package. Upstream works in progress +# for OpenVPN 2.4 to use mbedTLS 2.X. +POLARSSL_LIB_DEPENDS= libmbedtls.so.9:${PORTSDIR}/security/polarssl13 POLARSSL_CONFIGURE_ON= --with-crypto-library=polarssl USE_RC_SUBR= openvpn Modified: head/security/openvpn/distinfo ============================================================================== --- head/security/openvpn/distinfo Fri Jan 8 09:02:01 2016 (r405535) +++ head/security/openvpn/distinfo Fri Jan 8 09:03:48 2016 (r405536) @@ -1,2 +1,2 @@ -SHA256 (openvpn-2.3.9.tar.xz) = 52f16bef3a02369682f1464fbd2821070c98d0bd993f4c46c764e87375abdcc1 -SIZE (openvpn-2.3.9.tar.xz) = 816168 +SHA256 (openvpn-2.3.10.tar.xz) = c54dbf91d47b9533fac3b94d2b5719bdbe0d081fe8245184f91ef8a871d22003 +SIZE (openvpn-2.3.10.tar.xz) = 818152