From owner-svn-ports-head@freebsd.org Wed Apr 25 21:09:12 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 333CAFB06F1; Wed, 25 Apr 2018 21:09:12 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D78C26B0BE; Wed, 25 Apr 2018 21:09:11 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CE2B86882; Wed, 25 Apr 2018 21:09:11 +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 w3PL9Bf2082096; Wed, 25 Apr 2018 21:09:11 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3PL9Bjr082091; Wed, 25 Apr 2018 21:09:11 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201804252109.w3PL9Bjr082091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Wed, 25 Apr 2018 21:09:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468306 - in head/security/openvpn: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/security/openvpn: . files X-SVN-Commit-Revision: 468306 X-SVN-Commit-Repository: ports 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.25 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: Wed, 25 Apr 2018 21:09:12 -0000 Author: mandree Date: Wed Apr 25 21:09:11 2018 New Revision: 468306 URL: https://svnweb.freebsd.org/changeset/ports/468306 Log: Update to new upstream bugfix release 2.4.6. While here, warn and sleep for 10 s when building against LibreSSL. Remove some cruft. Change summary: Changelog: Reported by: portscout Modified: head/security/openvpn/Makefile head/security/openvpn/distinfo head/security/openvpn/files/pkg-message.in Modified: head/security/openvpn/Makefile ============================================================================== --- head/security/openvpn/Makefile Wed Apr 25 21:01:51 2018 (r468305) +++ head/security/openvpn/Makefile Wed Apr 25 21:09:11 2018 (r468306) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= openvpn -DISTVERSION= 2.4.5 -PORTREVISION?= 1 +DISTVERSION= 2.4.6 +PORTREVISION?= 0 CATEGORIES= security net -MASTER_SITES= https://swupdate.openvpn.net/community/releases/ \ +MASTER_SITES= https://swupdate.openvpn.org/community/releases/ \ https://build.openvpn.net/downloads/releases/ MAINTAINER= mandree@FreeBSD.org @@ -87,12 +87,6 @@ PORTEXAMPLES= * TEST_ALL_TARGET= check TEST_TEST_TARGET_OFF= check -# XXX Please remove this compatibility wrapper after 2017Q2 is branched. -.ifdef(WITHOUT_CHECK) -WARNING+= "${.CURDIR}: WITHOUT_CHECK is deprecated, please use WITHOUT=TEST or OPTIONS_UNSET=TEST." -WITHOUT+= TEST -.endif - pre-configure: .ifdef (LOG_OPENVPN) @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" @@ -117,6 +111,15 @@ _tlslibs=libmbedtls libmbedx509 libmbedcrypto .else # OpenSSL _tlslibs=libssl libcrypto +.endif + +.if ${SSL_DEFAULT:Mlibressl*} && empty(PORT_OPTIONS:MMBEDTLS) +pre-everything:: + @${ECHO_CMD} "WARNING: OpenVPN does not officially support LibreSSL." + @${ECHO_CMD} "If things break, rebuild with OpenSSL or mbedTLS." + @${ECHO_CMD} "You may wish to change your default SSL library" + @${ECHO_CMD} "and press Ctrl+C within the next 10 seconds to abort." + @sleep 10 .endif # sanity check that we don't inherit incompatible SSL libs through, Modified: head/security/openvpn/distinfo ============================================================================== --- head/security/openvpn/distinfo Wed Apr 25 21:01:51 2018 (r468305) +++ head/security/openvpn/distinfo Wed Apr 25 21:09:11 2018 (r468306) @@ -1,3 +1,3 @@ -TIMESTAMP = 1520895770 -SHA256 (openvpn-2.4.5.tar.xz) = 43c0a363a332350f620d1cd93bb431e082bedbc93d4fb872f758650d53c1d29e -SIZE (openvpn-2.4.5.tar.xz) = 942696 +TIMESTAMP = 1524689930 +SHA256 (openvpn-2.4.6.tar.xz) = 4f6434fa541cc9e363434ea71a16a62cf2615fb2f16af5b38f43ab5939998c26 +SIZE (openvpn-2.4.6.tar.xz) = 943376 Modified: head/security/openvpn/files/pkg-message.in ============================================================================== --- head/security/openvpn/files/pkg-message.in Wed Apr 25 21:01:51 2018 (r468305) +++ head/security/openvpn/files/pkg-message.in Wed Apr 25 21:09:11 2018 (r468306) @@ -7,5 +7,7 @@ ### openvpn-client .ovpn ### ------------------------------------------------------------------------ ### For compatibility notes when interoperating with older OpenVPN -### versions, please, see +### versions, please see +### ------------------------------------------------------------------------ +### Note that OpenVPN does not officially support LibreSSL. ### ------------------------------------------------------------------------