commit: 66e4fb0294b78f893af6cb3b97d42bd66f63fe40 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Wed Feb 11 17:33:17 2026 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Feb 11 23:44:07 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66e4fb02
net-vpn/openvpn: migrate to use mbedtls:3 Closes: https://bugs.gentoo.org/969911 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/45759 Closes: https://github.com/gentoo/gentoo/pull/45759 Signed-off-by: Sam James <sam <AT> gentoo.org> .../openvpn/{openvpn-9999.ebuild => openvpn-2.6.17-r2.ebuild} | 11 +++++++++-- net-vpn/openvpn/openvpn-9999.ebuild | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-2.6.17-r2.ebuild similarity index 93% copy from net-vpn/openvpn/openvpn-9999.ebuild copy to net-vpn/openvpn/openvpn-2.6.17-r2.ebuild index 002b9f0b6bf7..846b63e3355f 100644 --- a/net-vpn/openvpn/openvpn-9999.ebuild +++ b/net-vpn/openvpn/openvpn-2.6.17-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools dot-a systemd linux-info tmpfiles +inherit autotools dot-a systemd linux-info tmpfiles toolchain-funcs DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes" HOMEPAGE="https://community.openvpn.net/ https://openvpn.net"; @@ -43,7 +43,7 @@ COMMON_DEPEND=" ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) - mbedtls? ( net-libs/mbedtls:0= ) + mbedtls? ( net-libs/mbedtls:3= ) openssl? ( >=dev-libs/openssl-1.0.2:0= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) @@ -95,10 +95,15 @@ src_configure() { # vary with and without tests) lto-guarantee-fat + local MBEDTLS_CFLAGS + local MBEDTLS_LIBS if ! use mbedtls; then myeconfargs+=( $(use_enable pkcs11) ) + else + MBEDTLS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags mbedtls-3 mbedcrypto-3 mbedx509-3)" + MBEDTLS_LIBS="$($(tc-getPKG_CONFIG) --libs mbedtls-3 mbedcrypto-3 mbedx509-3)" fi myeconfargs+=( @@ -117,6 +122,8 @@ src_configure() { SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ IPROUTE=$(usex iproute2 '/bin/ip' '') \ + MBEDTLS_CFLAGS="${MBEDTLS_CFLAGS}" \ + MBEDTLS_LIBS="${MBEDTLS_LIBS}" \ econf "${myeconfargs[@]}" } diff --git a/net-vpn/openvpn/openvpn-9999.ebuild b/net-vpn/openvpn/openvpn-9999.ebuild index 002b9f0b6bf7..846b63e3355f 100644 --- a/net-vpn/openvpn/openvpn-9999.ebuild +++ b/net-vpn/openvpn/openvpn-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools dot-a systemd linux-info tmpfiles +inherit autotools dot-a systemd linux-info tmpfiles toolchain-funcs DESCRIPTION="Robust and highly flexible tunneling application compatible with many OSes" HOMEPAGE="https://community.openvpn.net/ https://openvpn.net"; @@ -43,7 +43,7 @@ COMMON_DEPEND=" ) lz4? ( app-arch/lz4 ) lzo? ( >=dev-libs/lzo-1.07 ) - mbedtls? ( net-libs/mbedtls:0= ) + mbedtls? ( net-libs/mbedtls:3= ) openssl? ( >=dev-libs/openssl-1.0.2:0= ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/pkcs11-helper-1.11 ) @@ -95,10 +95,15 @@ src_configure() { # vary with and without tests) lto-guarantee-fat + local MBEDTLS_CFLAGS + local MBEDTLS_LIBS if ! use mbedtls; then myeconfargs+=( $(use_enable pkcs11) ) + else + MBEDTLS_CFLAGS="$($(tc-getPKG_CONFIG) --cflags mbedtls-3 mbedcrypto-3 mbedx509-3)" + MBEDTLS_LIBS="$($(tc-getPKG_CONFIG) --libs mbedtls-3 mbedcrypto-3 mbedx509-3)" fi myeconfargs+=( @@ -117,6 +122,8 @@ src_configure() { SYSTEMD_UNIT_DIR=$(systemd_get_systemunitdir) \ TMPFILES_DIR="/usr/lib/tmpfiles.d" \ IPROUTE=$(usex iproute2 '/bin/ip' '') \ + MBEDTLS_CFLAGS="${MBEDTLS_CFLAGS}" \ + MBEDTLS_LIBS="${MBEDTLS_LIBS}" \ econf "${myeconfargs[@]}" }
