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

[Matthias Andree]

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:
  <https://github.com/OpenVPN/openvpn/blob/release/2.4/Changes.rst#version-246>
  
  Changelog:
  <https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24#OpenVPN2.4.6>
  
  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 at 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 <spec>.ovpn
 ### ------------------------------------------------------------------------
 ###  For compatibility notes when interoperating with older OpenVPN
-###  versions, please, see <http://openvpn.net/relnotes.html>
+###  versions, please see <http://openvpn.net/relnotes.html>
+### ------------------------------------------------------------------------
+###  Note that OpenVPN does not officially support LibreSSL.
 ### ------------------------------------------------------------------------