Date: Mon, 04 May 2026 10:58:07 +0000 From: Piotr Kubaj <pkubaj@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d9fe892f3f0b - main - www/lighttpd: switch to mbedtls3 for MBEDTLS option Message-ID: <69f87bbf.30806.5c54cb70@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=d9fe892f3f0bb6283855abc17389313d30a45dc3 commit d9fe892f3f0bb6283855abc17389313d30a45dc3 Author: Piotr Kubaj <pkubaj@FreeBSD.org> AuthorDate: 2026-04-29 11:34:28 +0000 Commit: Piotr Kubaj <pkubaj@FreeBSD.org> CommitDate: 2026-05-04 10:40:14 +0000 www/lighttpd: switch to mbedtls3 for MBEDTLS option PR: 294608 Reported by: dizzy@ --- www/lighttpd/Makefile | 6 ++---- www/lighttpd/files/patch-src_CMakeLists.txt | 32 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile index ecbf780dfa25..b865b60f4baa 100644 --- a/www/lighttpd/Makefile +++ b/www/lighttpd/Makefile @@ -14,9 +14,7 @@ LIB_DEPENDS= libpcre2-8.so:devel/pcre2 USES= compiler:c11 cmake cpe localbase:ldflags pkgconfig tar:xz -GNU_CONFIGURE= yes - -CONFIGURE_ARGS= --libdir=${PREFIX}/lib/lighttpd +CMAKE_ARGS= -DLIB_INSTALL_DIR:PATH=${PREFIX}/lib/lighttpd TEST_TARGET= check @@ -64,7 +62,7 @@ LUA_CMAKE_ON= -DWITH_LUA_VERSION:STRING="lua-${LUA_VER}" MAXMINDDB_CMAKE_BOOL= WITH_MAXMINDDB MAXMINDDB_LIB_DEPENDS= libmaxminddb.so:net/libmaxminddb MBEDTLS_CMAKE_BOOL= WITH_MBEDTLS -MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls2 +MBEDTLS_LIB_DEPENDS= libmbedtls.so:security/mbedtls3 NETTLE_CMAKE_BOOL= WITH_NETTLE NETTLE_LIB_DEPENDS= libnettle.so:security/nettle NSS_CMAKE_BOOL= WITH_NSS diff --git a/www/lighttpd/files/patch-src_CMakeLists.txt b/www/lighttpd/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..e05853391df6 --- /dev/null +++ b/www/lighttpd/files/patch-src_CMakeLists.txt @@ -0,0 +1,32 @@ +--- src/CMakeLists.txt.orig 2024-03-11 00:00:00 UTC ++++ src/CMakeLists.txt +@@ -470,8 +470,9 @@ if(WITH_WOLFSSL) + if(WITH_MBEDTLS) + check_include_files(mbedtls/ssl.h HAVE_MBEDTLS_SSL_H) + if(HAVE_MBEDTLS_SSL_H) +- check_library_exists(tfpsacrypto mbedtls_base64_encode "" HAVE_LIBMBEDCRYPTO) +- if(HAVE_LIBMBEDCRYPTO) ++ check_library_exists(tfpsacrypto mbedtls_base64_encode "" HAVE_LIBTFPSACRYPTO_TMP) ++ if(HAVE_LIBTFPSACRYPTO_TMP) ++ set(HAVE_LIBMBEDCRYPTO TRUE) + set(CRYPTO_LIBRARY tfpsacrypto) + set(HAVE_LIBTFPSACRYPTO 1) + check_library_exists(mbedtls mbedtls_ssl_init "" HAVE_LIBMBEDTLS) +@@ -493,7 +494,7 @@ else() + unset(HAVE_MBEDTLS_SSL_H) + unset(HAVE_LIBMBEDCRYPTO) + unset(HAVE_LIBMBEDTLS) +- unset(HAVE_LIBMEDX509) ++ unset(HAVE_LIBMBEDX509) + endif() + + if(WITH_NSS) +@@ -1221,7 +1222,7 @@ if(HAVE_GNUTLS) + target_link_libraries(mod_gnutls gnutls) + endif() + +-if(HAVE_LIBMBEDTLS AND HAVE_LIBMEDCRYPTO AND HAVE_LIBMEDX509) ++if(HAVE_LIBMBEDTLS AND HAVE_LIBMBEDCRYPTO AND HAVE_LIBMBEDX509) + add_and_install_library(mod_mbedtls "mod_mbedtls.c") + if(HAVE_LIBTFPSACRYPTO) + set(L_MOD_MBEDTLS ${L_MOD_MBEDTLS} mbedtls mbedx509 tfpsacrypto)home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f87bbf.30806.5c54cb70>