gentoo auto-resync : 31:05:2023 - 03:22:19

4 files changed, 43 insertions, 2 deletions

diff --git a/net-nds/openldap/Manifest b/net-nds/openldap/Manifest
index 0f57465d8af3..55e02498e145 100644
--- a/net-nds/openldap/Manifest
+++ b/net-nds/openldap/Manifest
@@ -21,6 +21,7 @@ AUX openldap-2.6.1-system-mdb.patch 3679 BLAKE2B 9d9eb3dad904564cb453424743091c4
 AUX openldap-2.6.3-clang16.patch 5305 BLAKE2B 17260d51fba82c6f898c3fa2234a1038228b4085027a5bae086309b330f73f64e468a0016b486861c6f92c47f0d19f6ad9279068ffc0789600f3f8b6a6b2a4cf SHA512 776423d8cb2ee594792c97dd233c2e645daab028a40e4ce53a793f7199ff9879defb480250b2ccc4cbdada43473268b1f2990edb2b923987f8740b1a89011de5
 AUX openldap-2.6.3-slapd-conf 2059 BLAKE2B 3a9a5f22e450c37625f9718dd7467f721fb9046792499563652933221a5a6e56577a487fc6c3b7336ce45b5b5ca6cab82f073c7f61b7493d0f8323b296a84d8d SHA512 76ac3d22389d2da94dec8e712ec8073d9ba8be4df69ae2443883ce8b5b24757b0999f756a14ea57cb9566d8dbf94859a239efabe990febb347b794ba5070914d
 AUX openldap-2.6.4-clang16.patch 6953 BLAKE2B f347857252d857c4d1d54a0be3a1d68fc33c3ab78645c29161e212976cc9e28aa0d46812ac87a0aa23a55612c30fe49f72cfe9c31c71e6ba7ed84c80cc202018 SHA512 7c84fe7841440d00925fcf08ffb9e6ef10d5626aeb9d24b794e59281a15e5a6da0d4a9939db860011402b8aef8bc34bc6a9c643806098f2453da64fb62e74e70
+AUX openldap-2.6.4-libressl.patch 1590 BLAKE2B 3af178ceb4d6eb5792f4fe160d42b2fa2e662d8158ff98e93bd91fa0aaa73cca20277da907129e4c2124ae4e11021a0cbc53de1cd5308ef76c8e2ac26850a5df SHA512 674b08b5e4db1216b94d51b2c973f5cd8607c5a8aefcbdf5f25b6e210a071089ea9896deb59151e0cad5a73d002f88a75179f381a8b611473035a7207fe0bbee
 AUX slapd-2.6.1.service 300 BLAKE2B 2d634f91f7f7c69894641b145bb280a1df8ac05d23eae64100c21470065c1347c7a7c8ab72f93083ff1151fe69b75be2a5f93bdc1a9a0776582fecf2b8169039 SHA512 c3833a61be028ddb9de8dbc66cff5651cbc2ed88e1b414965476862b6a223b91d20b773c9323f0c62cd690ecb9b0e6314f3eb37b2255f89f20d303a5025323b5
 AUX slapd-confd-2.4.28-r1 1072 BLAKE2B 9d4cef3614164e09e27cc681a2d37c126da6666715b1f3092751d036b42c70bb73f3b6cc51defac791c3f8e63e250d8c9d946ef0b84bc8e38c1504ac7ea239a4 SHA512 7426c04ee689bcfb29a9a3956367c571eac6bc9620efda938591d09382a05527454458f7a25bdc2fa2ac920f93bae516121e085408ffefbe8ace0c7d8c5da315
 AUX slapd-confd-2.6.1 1060 BLAKE2B 06f5f0e7b87eb4962f8413f3f5ea21a29b4e8174c016420c5f8c00bf6deb1b27929175a5cb8dc2db272147154ddb6006a2cf7ac5ee07a9652e047f23603923c7 SHA512 79d332fec5e6539106ae9f457194c31ede99e682f6cac89512d76c0f5831a7cbd01de5ea05ced4228f581ba1327091eaf5209fdbeeddb5048c6ca6ba7c5b38d5
@@ -34,7 +35,7 @@ DIST openldap-OPENLDAP_REL_ENG_2_6_3.tar.gz 6244895 BLAKE2B 97792a1b368de44867b0
 DIST openldap-OPENLDAP_REL_ENG_2_6_4.tar.bz2 5043227 BLAKE2B 9bec77dbace0e52d1607d9ac13a77349e7d0b8876aa81fa635893638d00db58ec6bf8412f11fd266bba0440887be1aa21eb4a876122152f7f6de9fd8f75b6b4c SHA512 bff11bf1ae125bcabbd307f6c4e1c102a8df6f1091f84f5e7053fdbaa89ccd6aa0c86cc8dcce4fb9b6ffd853b5f8d3c933733f5713aeb4d6a9d77ab145293b48
 DIST rfc2307bis.schema-20140524 12262 BLAKE2B 98031f49e9bde1e4821e637af3382364d8344ed7017649686a088070d96a632dffa6c661552352656b1b159c0fd962965580069a64c7f3d5bb6a3ed75f60fd99 SHA512 83b89a1deeefc8566b97e7e865b9b6d04541099cbdf719e24538a7d27d61b6209e87ab9003a9f140bd9afd018ec569e71721e3a24090e1902c8b6659d2ba103e
 EBUILD openldap-2.4.59-r2.ebuild 29099 BLAKE2B be552c17227006e6ed8a6a6e210fa8fa9d7cbe63c0d83281f22e8e9332befab4a75a9c9ad1d8fc64d1ae5db9af93a24bd0fd1381b1cbca2270e9df1fff266ee1 SHA512 ab5fd9b46ea56d1ac9a2182b154242c0aeb6c1e42ba3ab44aac3c1d3435b94a1793f0320ae3ad86231eada66c74efda3c17938a6b6772f75508fbb5454512f49
-EBUILD openldap-2.5.14.ebuild 27621 BLAKE2B cbf4da0553ce397cf1f7efd4e0e8cc509bac087e6b2c5f9542a9fe51b3b1ed510a641b2629227aa1cb9df977a569eb43935467364fc3d48a86f533e0041e0d77 SHA512 80603b5bf598ecd9807972abf37e8eff480204274ac928ddefdb1662f8d0face536d038336cf81736944a7330df07905d176b712d86941b52d853ca34e30fe8f
+EBUILD openldap-2.5.14.ebuild 27671 BLAKE2B 66f145288cf882b17ed8f2e009370e48fd10c318a0b7f83927836a9ef74d0d758b6f5306f103c05a4d3c1c790658431ed6c0941ceabb7982666865994f346e76 SHA512 9878bcca761b1992ba3abdf72ea28fe34d5d8daaf148edf4365f15bf021497f74eed88fa37c7855c7f51429cbd9cc78be8e873c330bec829360b1fda1d1e07ef
 EBUILD openldap-2.6.3-r7.ebuild 26516 BLAKE2B 913f12c8b7fbd09840064ab26da36d48a2276b6d3c6a059fa4b45605e2a91709dfd1bd88e6573ee248a644ef633173bb353b1bc7e68755eedadb7b63af9326dd SHA512 ccfba2143d370db383f2b613408591e6864f6cdc05b859d0448b2bbee36f7c691cfdf39db6ea3c9132acab6136e1ee6dc4ca2a4b40105d60318578d01144aca0
-EBUILD openldap-2.6.4-r1.ebuild 27677 BLAKE2B 2567bd13b2a7c693f9ce4748428cc94042c99ae7c2d833b4fa3b4b7c47f84e94957ffe7fb8826d3919e40de831780edf1ab24e1d57a70ee12e29086319e3f9ae SHA512 17b1822094966cc0d0aa5968557773c3186f857a938a37e860d344e507feda0cda2f80482bd4e82864f3a4b34048c45f28ca586dcf597952d71f638c133338d2
+EBUILD openldap-2.6.4-r1.ebuild 27727 BLAKE2B 124f98e2dbd3827df4c66afaa3f10ac32d7b17e064531e290c760d83287ea554028ca1d89be590667d8ef5a6479388371286792f09096eacdd8a8d862456c154 SHA512 5f27c554ad0b9f02d13a9ea73c2c5da336e1074af3a1d61e139df5a5ec33bac505bb110bdc5494b6cd85aaa7dfaf0a6cb770e06b3d54a968bc7fe9954c64b7d1
 MISC metadata.xml 1316 BLAKE2B 0635123aab1a5bed9a0da918501fc5e43affe0fbd0f83f8a7e42b0292f4d5ce8231bb9d5c343c67c1011c916e78d475398c1a744b11d6f7e041ac0caed35900e SHA512 818c412cd17d1c49c7f68452fb9e2715f4441a5ff85a4e27dcb7f264c1b4d89cfa46c9d9e506b087376224cd9839e040fe63ea4149323be5c7777b54ef81716d
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 <orbea@riseup.net>
+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() {