svn commit: r464495 - in head/security/openvpn-devel: . files

[Steve Wills]

Author: swills
Date: Wed Mar 14 14:45:10 2018
New Revision: 464495
URL: https://svnweb.freebsd.org/changeset/ports/464495

Log:
  security/openvpn-devel: update to latest 2018-11 snapshot
  
  PR:		226588
  Submitted by:	ecrist at secure-computing.net (maintainer)

Modified:
  head/security/openvpn-devel/Makefile   (contents, props changed)
  head/security/openvpn-devel/distinfo   (contents, props changed)
  head/security/openvpn-devel/files/pkg-message.in   (contents, props changed)

Modified: head/security/openvpn-devel/Makefile
==============================================================================
--- head/security/openvpn-devel/Makefile	Wed Mar 14 14:37:03 2018	(r464494)
+++ head/security/openvpn-devel/Makefile	Wed Mar 14 14:45:10 2018	(r464495)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=		openvpn
-DISTVERSION=		201725
-PORTREVISION?=		2
+DISTVERSION=		201811
+PORTREVISION?=		0
 CATEGORIES=		security net
 MASTER_SITES=		https://secure-computing.net/files/openvpn/ \
 			ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/
@@ -111,6 +111,22 @@ post-configure:
 	${REINPLACE_CMD} '/^CFLAGS =/s/$$/ -fPIC/' \
 	    ${WRKSRC}/src/plugins/auth-pam/Makefile \
 	    ${WRKSRC}/src/plugins/down-root/Makefile
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MMBEDTLS}
+_tlslibs=libmbedtls libmbedx509 libmbedcrypto
+.else
+# OpenSSL
+_tlslibs=libssl libcrypto
+.endif
+
+# sanity check that we don't inherit incompatible SSL libs through,
+# for instance, pkcs11-helper:
+post-build:
+	   @a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \
+       |	${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\
+       if test "$$*" != "1" ; then ${ECHO_CMD} >&2 "${.CURDIR} FAILED: either of ${_tlslibs} libraries linked multiple times" ; ${PRINTF} '%s\n' "$$a"; ${RM} ${BUILD_COOKIE} ; exit 1 ; fi
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-auth-pam.so

Modified: head/security/openvpn-devel/distinfo
==============================================================================
--- head/security/openvpn-devel/distinfo	Wed Mar 14 14:37:03 2018	(r464494)
+++ head/security/openvpn-devel/distinfo	Wed Mar 14 14:45:10 2018	(r464495)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1498051791
-SHA256 (openvpn-201725.tar.xz) = 88a14036f933b52c5094923e3673748ed2e58836a1a6744c0c224523b688ce21
-SIZE (openvpn-201725.tar.xz) = 943804
+TIMESTAMP = 1520994513
+SHA256 (openvpn-201811.tar.xz) = e8235b3c86d29b5deabfc7d4bacaf32a1f8a76aad4c0872b14359a59db589015
+SIZE (openvpn-201811.tar.xz) = 946392

Modified: head/security/openvpn-devel/files/pkg-message.in
==============================================================================
--- head/security/openvpn-devel/files/pkg-message.in	Wed Mar 14 14:37:03 2018	(r464494)
+++ head/security/openvpn-devel/files/pkg-message.in	Wed Mar 14 14:45:10 2018	(r464495)
@@ -9,10 +9,3 @@
 ###  For compatibility notes when interoperating with older OpenVPN
 ###  versions, please, see <http://openvpn.net/relnotes.html>
 ### ------------------------------------------------------------------------
-###  
-###
-###              THIS IS AN UNSTABLE DEVELOPMENT VERSION!
-###
-###
-###  It may or may not be suitable for production. Use at your own risk.
-### ------------------------------------------------------------------------