From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D1ABD15806E for ; Wed, 31 May 2023 13:18:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12068E08A2; Wed, 31 May 2023 13:18:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBF48E08A2 for ; Wed, 31 May 2023 13:18:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1E8E2340FF0 for ; Wed, 31 May 2023 13:18:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71F9BA7F for ; Wed, 31 May 2023 13:18:47 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1685539010.74cff2ebe3f99bcbf115c77cf564591918e9ab54.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: net-nds/openldap/, net-nds/openldap/files/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: net-nds/openldap/files/openldap-2.6.4-libressl.patch net-nds/openldap/openldap-2.6.3-r7.ebuild X-VCS-Directories: net-nds/openldap/files/ net-nds/openldap/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: 74cff2ebe3f99bcbf115c77cf564591918e9ab54 X-VCS-Branch: master Date: Wed, 31 May 2023 13:18:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 478ff0c2-1148-412c-81de-bdabb28cab77 X-Archives-Hash: ac8b296ee48a135dc889350ed8c52e43 commit: 74cff2ebe3f99bcbf115c77cf564591918e9ab54 Author: orbea riseup net> AuthorDate: Wed May 31 13:16:50 2023 +0000 Commit: orbea riseup net> CommitDate: Wed May 31 13:16:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=74cff2eb net-nds/openldap: use upstream libressl patch Signed-off-by: orbea riseup.net> .../openldap/files/openldap-2.6.4-libressl.patch | 38 ++++++++++++++++++++++ net-nds/openldap/openldap-2.6.3-r7.ebuild | 6 +--- 2 files changed, 39 insertions(+), 5 deletions(-) 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 0000000..48a8a43 --- /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 +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.6.3-r7.ebuild b/net-nds/openldap/openldap-2.6.3-r7.ebuild index 1d206ef..7c5657c 100644 --- a/net-nds/openldap/openldap-2.6.3-r7.ebuild +++ b/net-nds/openldap/openldap-2.6.3-r7.ebuild @@ -144,6 +144,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.6.1-fix-missing-mapping.patch "${FILESDIR}"/${PN}-2.6.1-fix-bashism-configure.patch "${FILESDIR}"/${PN}-2.6.3-clang16.patch + "${FILESDIR}"/${PN}-2.6.4-libressl.patch ) openldap_filecount() { @@ -498,11 +499,6 @@ multilib_src_configure() { tc-export AR CC CXX - # Fix for libressl from OpenBSD: - # bypass autoconf check for OpenSSL 1.1.1+ function which is not - # actually used in OpenLDAP code - export ac_cv_lib_ssl_SSL_export_keying_material_early=yes - ECONF_SOURCE="${S}" econf \ --libexecdir="${EPREFIX}"/usr/$(get_libdir)/openldap \ --localstatedir="${EPREFIX}"/var \