Date: Tue, 13 Mar 2018 00:10:33 +0000 (UTC) From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464331 - head/security/openvpn Message-ID: <201803130010.w2D0AXM2013757@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mandree Date: Tue Mar 13 00:10:33 2018 New Revision: 464331 URL: https://svnweb.freebsd.org/changeset/ports/464331 Log: Update to new upstream bugfix release 2.4.5. Change summary: <https://github.com/OpenVPN/openvpn/blob/release/2.4/Changes.rst#version-245>; Changelog: <https://community.openvpn.net/openvpn/wiki/ChangesInOpenvpn24#OpenVPN2.4.5>; While here, add a sanity check that traps inconsistent linkage, if, for instance, the PKCS#11 helper has been built with a different OPENSSL library version than OpenVPN. Modified: head/security/openvpn/Makefile head/security/openvpn/distinfo Modified: head/security/openvpn/Makefile ============================================================================== --- head/security/openvpn/Makefile Mon Mar 12 22:16:44 2018 (r464330) +++ head/security/openvpn/Makefile Tue Mar 13 00:10:33 2018 (r464331) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= openvpn -DISTVERSION= 2.4.4 -PORTREVISION?= 2 +DISTVERSION= 2.4.5 +PORTREVISION?= 0 CATEGORIES= security net MASTER_SITES= https://swupdate.openvpn.net/community/releases/ \ https://build.openvpn.net/downloads/releases/ @@ -109,6 +109,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/distinfo ============================================================================== --- head/security/openvpn/distinfo Mon Mar 12 22:16:44 2018 (r464330) +++ head/security/openvpn/distinfo Tue Mar 13 00:10:33 2018 (r464331) @@ -1,3 +1,3 @@ -TIMESTAMP = 1506531327 -SHA256 (openvpn-2.4.4.tar.xz) = 96cd1b8fe1e8cb2920f07c3fd3985faea756e16fdeebd11d3e146d5bd2b04a80 -SIZE (openvpn-2.4.4.tar.xz) = 924172 +TIMESTAMP = 1520895770 +SHA256 (openvpn-2.4.5.tar.xz) = 43c0a363a332350f620d1cd93bb431e082bedbc93d4fb872f758650d53c1d29e +SIZE (openvpn-2.4.5.tar.xz) = 942696
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803130010.w2D0AXM2013757>