commit: b6788868d80c10a3a37bb3cd6f24cbe3f45284e6 Author: orbea <orbea <AT> riseup <DOT> net> AuthorDate: Tue May 16 00:43:47 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue May 30 21:55:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6788868
net-nds/openldap: add upstream libressl patch This patch was merged upstream and fixes the configure with LibreSSL. The configure script checks for SSL_export_keying_material_early() which LibreSSL doesn't support, but OpenLDAP doesn't actually use this function and only does this to ensure modern OpenSSL APIs are available. As a compromise the configure script now checks for the SSL_CTX_set_ciohersuites() function which both OpenSSL and LibreSSL support and where currently the rest of the OpenLDAP build and tests otherwise work with LibreSSL 3.7.2. Bug: https://bugs.gentoo.org/903001 Upstream-Issue: https://bugs.openldap.org/show_bug.cgi?id=10039 Upstream-PR: https://git.openldap.org/openldap/openldap/-/merge_requests/613 Upstream-Commit: https://git.openldap.org/openldap/openldap/-/commit/cb73e60a49f85bf5207b2fd0f557013be29ac072 Signed-off-by: orbea <orbea <AT> riseup.net> Closes: https://github.com/gentoo/gentoo/pull/31050 Signed-off-by: Sam James <sam <AT> gentoo.org> .../openldap/files/openldap-2.6.4-libressl.patch | 38 ++++++++++++++++++++++ net-nds/openldap/openldap-2.5.14.ebuild | 1 + net-nds/openldap/openldap-2.6.4-r1.ebuild | 1 + 3 files changed, 40 insertions(+) diff --git a/net-nds/openldap/files/openldap-2.6.4-libressl.patch b/net-nds/openldap/files/openldap-2.6.4-libressl.patch new file mode 100644 index 000000000000..48a8a43e731a --- /dev/null +++ b/net-nds/openldap/files/openldap-2.6.4-libressl.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/903001 +https://bugs.openldap.org/show_bug.cgi?id=10039 +https://git.openldap.org/openldap/openldap/-/merge_requests/613 +https://git.openldap.org/openldap/openldap/-/commit/cb73e60a49f85bf5207b2fd0f557013be29ac072 + +From cb73e60a49f85bf5207b2fd0f557013be29ac072 Mon Sep 17 00:00:00 2001 +From: orbea <[email protected]> +Date: Wed, 12 Apr 2023 12:55:46 -0700 +Subject: [PATCH] ITS#10039 Test for SSL_CTX_set_ciphersuites() + +When configuring OpenLDAP using --with-tls=openssl with LibreSSL the +configure will fail to detect SSL_export_keyring_material_early() since +LibreSSL doesn't support this function yet. However OpenLDAP doesn't +actually use this function and only checks for it to ensure a modern +OpenSSL API is used. This can be easily solved by checking for an +equivalent modern OpenSSL function which both LibreSSL and OpenSSL both +support such as SSL_CTX_set_ciphersuites(). Doing this allows the build +and tests to succeed with modern LibreSSL versions. This was tested with +LibreSSL >= 3.6. + +Bug: https://bugs.openldap.org/show_bug.cgi?id=10039 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 2cf28ef346..c4e2a905e2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1243,7 +1243,7 @@ if test $ol_with_tls = openssl || test $ol_with_tls = auto ; then + [#endif]])], + , [AC_MSG_FAILURE([OpenSSL 1.1.1 or newer required])]) + +- AC_CHECK_LIB(ssl, SSL_export_keying_material_early, ++ AC_CHECK_LIB(ssl, SSL_CTX_set_ciphersuites, + [have_openssl=yes], [have_openssl=no], + [-lcrypto]) + diff --git a/net-nds/openldap/openldap-2.5.14.ebuild b/net-nds/openldap/openldap-2.5.14.ebuild index b4b51dae0731..8b5c4628b810 100644 --- a/net-nds/openldap/openldap-2.5.14.ebuild +++ b/net-nds/openldap/openldap-2.5.14.ebuild @@ -143,6 +143,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.1-cloak.patch "${FILESDIR}"/${PN}-2.6.1-flags.patch "${FILESDIR}"/${PN}-2.6.4-clang16.patch + "${FILESDIR}"/${PN}-2.6.4-libressl.patch #903001 ) openldap_filecount() { diff --git a/net-nds/openldap/openldap-2.6.4-r1.ebuild b/net-nds/openldap/openldap-2.6.4-r1.ebuild index 463f6d0f7130..2747bc015832 100644 --- a/net-nds/openldap/openldap-2.6.4-r1.ebuild +++ b/net-nds/openldap/openldap-2.6.4-r1.ebuild @@ -144,6 +144,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.1-flags.patch "${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch "${FILESDIR}"/${PN}-2.6.4-clang16.patch + "${FILESDIR}"/${PN}-2.6.4-libressl.patch #903001 ) openldap_filecount() {
