diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile index d4c9b606c168..1a33d141d54c 100644 --- a/security/openvpn-devel/Makefile +++ b/security/openvpn-devel/Makefile @@ -1,156 +1,156 @@ PORTNAME= openvpn -DISTVERSION= g20270422 -PORTREVISION= 0 # leave in even if 0 to avoid accidental PORTEPOCH bumps -PORTEPOCH= 1 +DISTVERSION= g20260721 +#PORTREVISION= 0 # leave in even if 0 to avoid accidental PORTEPOCH bumps +PORTEPOCH= 2 CATEGORIES= security net net-vpn PKGNAMESUFFIX= -devel MAINTAINER= gert@greenie.muc.de -# let's use ?= in spite of portlint WARNings because this might become -# security/openvpn one day which would then have a slave port: -COMMENT?= Secure IP/Ethernet tunnel daemon +COMMENT= Secure IP/Ethernet tunnel daemon WWW= https://openvpn.net/community/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYRIGHT.GPL BUILD_DEPENDS+= cmocka>=0:sysutils/cmocka \ rst2man:textproc/py-docutils@${PY_FLAVOR} LIB_DEPENDS+= liblzo2.so:archivers/lzo2 USES= autoreconf cpe libtool pkgconfig python:build shebangfix tar:xz IGNORE_SSL= libressl libressl-devel USE_GITLAB= yes -GL_TAGNAME= 64fae9d82989ede6c92e230c594ab9335c05df8d +GL_TAGNAME= 4ad3c71ec4bdad706332d0281a3bb3bba0234288 USE_RC_SUBR= openvpn -SHEBANG_FILES= sample/sample-scripts/auth-pam.pl \ - sample/sample-scripts/totpauth.py sample/sample-scripts/ucn.pl \ +SHEBANG_FILES= sample/sample-plugins/keying-material-exporter-demo/http-client.py \ + sample/sample-plugins/keying-material-exporter-demo/http-server.py \ + sample/sample-scripts/auth-pam.pl \ + sample/sample-scripts/totpauth.py \ + sample/sample-scripts/ucn.pl \ sample/sample-scripts/verify-cn GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -CONFIGURE_ARGS+= --enable-strict # set PLUGIN_LIBDIR so that unqualified plugin paths are found: CONFIGURE_ENV+= PLUGINDIR="${PREFIX}/lib/openvpn/plugins" # let OpenVPN's configure script pick up the requisite libraries, # but do not break the plugin build if an older version is installed .ifdef (LOG_OPENVPN) CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} .endif CPPFLAGS+= -DCONFIGURE_GIT_REVISION='\"${GL_TAGNAME}\"' \ -DCONFIGURE_GIT_FLAGS= CONFLICTS_INSTALL?= openvpn-2.* SUB_FILES= openvpn-client pkg-message PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= ASYNC_PUSH DCO DOCS EASYRSA EXAMPLES LZ4 PKCS11 SMALL OPTIONS_DEFINE+= TEST UNITTESTS OPTIONS_DEFAULT= DCO EASYRSA LZ4 OPENSSL TEST OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= MBEDTLS OPENSSL # option descriptions and interdependencies ASYNC_PUSH_DESC= Enable async-push support DCO_DESC= Build with Data Channel Offload (ovpn(4)) support EASYRSA_DESC= Install security/easy-rsa RSA helper package PKCS11_DESC= Use security/pkcs11-helper SMALL_DESC= Build a smaller executable with fewer features UNITTESTS_DESC= Enable unit tests # option implementations ASYNC_PUSH_CONFIGURE_ENABLE= async-push DCO_CONFIGURE_OFF= --disable-dco EASYRSA_RUN_DEPENDS= easy-rsa>=0:security/easy-rsa LZ4_LIB_DEPENDS+= liblz4.so:archivers/liblz4 LZ4_CONFIGURE_OFF= --disable-lz4 MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls3 MBEDTLS_CONFIGURE_ON= --with-crypto-library=mbedtls OPENSSL_USES= ssl OPENSSL_CONFIGURE_ON= --with-crypto-library=openssl PKCS11_PREVENTS= MBEDTLS PKCS11_PREVENTS_MSG= OpenVPN cannot use pkcs11-helper with mbedTLS. \ Disable PKCS11, or use OpenSSL instead PKCS11_LIB_DEPENDS= libpkcs11-helper.so:security/pkcs11-helper PKCS11_CONFIGURE_ENABLE= pkcs11 SMALL_CONFIGURE_ON= --enable-small TEST_ALL_TARGET= check TEST_TEST_TARGET_OFF= check UNITTESTS_BUILD_DEPENDS= cmocka>=0:sysutils/cmocka UNITTESTS_CONFIGURE_ENABLE= unit-tests pre-configure: .ifdef (LOG_OPENVPN) @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" .else @${ECHO} "" @${ECHO} "You may use the following build options:" @${ECHO} "" @${ECHO} " LOG_OPENVPN={Valid syslog facility, default LOG_DAEMON}" @${ECHO} " EXAMPLE: make LOG_OPENVPN=LOG_LOCAL6" @${ECHO} "" .endif post-configure: ${REINPLACE_CMD} '/^CFLAGS =/s/$$/ -fPIC/' \ ${WRKSRC}/src/plugins/auth-pam/Makefile \ ${WRKSRC}/src/plugins/down-root/Makefile .include .if ${PORT_OPTIONS:MMBEDTLS} _tlslibs= libmbedtls libmbedx509 libmbedcrypto .else # OpenSSL _tlslibs= libssl libcrypto .endif # FreeBSD 15 added Linux-compatible inotify support .if ${PORT_OPTIONS:MASYNC_PUSH} . if "${OPSYS}" != "FreeBSD" || ${OSVERSION} < 1500068 LIB_DEPENDS+= libinotify.so:devel/libinotify . endif .endif # sanity check that we don't inherit incompatible SSL libs through, # for instance, pkcs11-helper: post-build: @a=$$(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 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/openvpn/plugins/openvpn-plugin-down-root.so ${INSTALL_SCRIPT} ${WRKDIR}/openvpn-client ${STAGEDIR}${PREFIX}/sbin/openvpn-client ${MKDIR} ${STAGEDIR}${PREFIX}/include post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/ .for i in AUTHORS ChangeLog PORTS ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ .endfor post-install-EXAMPLES-on: - (cd ${WRKSRC}/sample && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/) - ${CHMOD} ${BINMODE} ${STAGEDIR}${EXAMPLESDIR}/sample-scripts/* - ${RM} ${STAGEDIR}${EXAMPLESDIR}/sample-config-files/*.orig + (cd ${WRKSRC}/sample && \ + ${COPYTREE_SHARE} "sample-config-files sample-keys sample-plugins" \ + ${STAGEDIR}${EXAMPLESDIR}/ '! -name "*.orig"' && \ + ${COPYTREE_BIN} sample-scripts ${STAGEDIR}${EXAMPLESDIR}/ '! -name "*.orig"') .include diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo index 391cf9d68d36..98e0fdaf1ae5 100644 --- a/security/openvpn-devel/distinfo +++ b/security/openvpn-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1776872343 -SHA256 (openvpn-openvpn-64fae9d82989ede6c92e230c594ab9335c05df8d_GL0.tar.gz) = 799aea2ab9d4d42784402e4438a465f86e94f61884b0b54e81ede3e89c2ca08b -SIZE (openvpn-openvpn-64fae9d82989ede6c92e230c594ab9335c05df8d_GL0.tar.gz) = 1343378 +TIMESTAMP = 1784638473 +SHA256 (openvpn-openvpn-4ad3c71ec4bdad706332d0281a3bb3bba0234288_GL0.tar.gz) = c4476333e7f6e7b928ed49979d1746d2cf4104fae8f2c612556eb62f8feab7d8 +SIZE (openvpn-openvpn-4ad3c71ec4bdad706332d0281a3bb3bba0234288_GL0.tar.gz) = 1352110