From owner-svn-ports-all@freebsd.org Fri Jun 23 16:37:43 2017 Return-Path: Delivered-To: svn-ports-all@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 379D3DA7D85; Fri, 23 Jun 2017 16:37:43 +0000 (UTC) (envelope-from jpaetzel@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 1389166BE0; Fri, 23 Jun 2017 16:37:43 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5NGbgej014913; Fri, 23 Jun 2017 16:37:42 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5NGbgXG014911; Fri, 23 Jun 2017 16:37:42 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <201706231637.v5NGbgXG014911@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Fri, 23 Jun 2017 16:37:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r444182 - branches/2017Q2/security/openvpn-devel X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jun 2017 16:37:43 -0000 Author: jpaetzel Date: Fri Jun 23 16:37:41 2017 New Revision: 444182 URL: https://svnweb.freebsd.org/changeset/ports/444182 Log: MFH: r440983 Update to new snapshot. Note I didn't take the original patch because it needed to NOT conflict with itself, and I had to fix indentation - be sure to use TAB, not blanks, after the VARIABLE= part. PR: 219305 Submitted by: ecrist@secure-computing.net (maintainer) Approved by: ports-secteam (delphij) Modified: branches/2017Q2/security/openvpn-devel/Makefile branches/2017Q2/security/openvpn-devel/distinfo Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/security/openvpn-devel/Makefile ============================================================================== --- branches/2017Q2/security/openvpn-devel/Makefile Fri Jun 23 15:36:51 2017 (r444181) +++ branches/2017Q2/security/openvpn-devel/Makefile Fri Jun 23 16:37:41 2017 (r444182) @@ -1,12 +1,12 @@ # Created by: Matthias Andree # $FreeBSD$ -PORTNAME= openvpn -DISTVERSION= 201652 +PORTNAME= openvpn +DISTVERSION= 201719 PORTREVISION?= 0 -CATEGORIES= security net +CATEGORIES= security net MASTER_SITES= https://secure-computing.net/files/openvpn/ \ - ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/ + ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/ PKGNAMESUFFIX= -devel MAINTAINER= ecrist@secure-computing.net @@ -17,11 +17,11 @@ LICENSE= GPLv2 CONFLICTS_INSTALL= openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* GNU_CONFIGURE= yes -WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX} -USES= cpe libtool pkgconfig shebangfix tar:xz +WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX} +USES= cpe libtool pkgconfig shebangfix tar:xz SHEBANG_FILES= sample/sample-scripts/verify-cn \ - sample/sample-scripts/auth-pam.pl \ - sample/sample-scripts/ucn.pl + sample/sample-scripts/auth-pam.pl \ + sample/sample-scripts/ucn.pl CONFIGURE_ARGS+= --enable-strict # avoid picking up CMAKE, we don't have cmocka in the tarballs.. CONFIGURE_ENV+= ac_cv_prog_CMAKE= CMAKE= @@ -35,13 +35,14 @@ LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -DPLUGIN_LIBDIR=\\\"${PREFIX}/lib/openvpn/plugins\\\" OPTIONS_DEFINE= PKCS11 EASYRSA DOCS EXAMPLES X509ALTUSERNAME \ - TEST LZ4 SMALL + TEST LZ4 SMALL TUNNELBLICK OPTIONS_DEFAULT= EASYRSA OPENSSL TEST LZ4 OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= OPENSSL MBEDTLS PKCS11_DESC= Use security/pkcs11-helper EASYRSA_DESC= Install security/easy-rsa RSA helper package MBEDTLS_DESC= SSL/TLS via mbedTLS +TUNNELBLICK_DESC= Tunnelblick XOR scramble patch (READ HELP!) X509ALTUSERNAME_DESC= Enable --x509-username-field (OpenSSL only) SMALL_DESC= Build a smaller executable with fewer features @@ -49,6 +50,10 @@ EASYRSA_RUN_DEPENDS= easy-rsa>=0:security/easy-rsa PKCS11_LIB_DEPENDS= libpkcs11-helper.so:security/pkcs11-helper PKCS11_CONFIGURE_ENABLE= pkcs11 +PKCS11_PREVENTS= MBEDTLS +PKCS11_PREVENTS_MSG= OpenVPN cannot use pkcs11-helper with mbedTLS. Disable PKCS11, or use OpenSSL instead + +TUNNELBLICK_EXTRA_PATCHES= ${FILESDIR}/extra-tunnelblick-openvpn_xorpatch X509ALTUSERNAME_CONFIGURE_ENABLE= x509-alt-username Modified: branches/2017Q2/security/openvpn-devel/distinfo ============================================================================== --- branches/2017Q2/security/openvpn-devel/distinfo Fri Jun 23 15:36:51 2017 (r444181) +++ branches/2017Q2/security/openvpn-devel/distinfo Fri Jun 23 16:37:41 2017 (r444182) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483453128 -SHA256 (openvpn-201652.tar.xz) = 783c3d5200bd286cc83e5accec075ef7f896a401b9bf550801606d1b76a1d797 -SIZE (openvpn-201652.tar.xz) = 928316 +TIMESTAMP = 1494853427 +SHA256 (openvpn-201719.tar.xz) = 26724017c6a79f4936f473c8c03760037045cdea3b3f312f32dc0daeaa6ede93 +SIZE (openvpn-201719.tar.xz) = 935492