Skip to contentSkip to conversation

openldap: upgrade 2.6.7 -> 2.6.8

PATCH New [email protected] 1 participant 2 messages Jun 26, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 openldap: upgrade 2.6.7 -> 2.6.8

From: Wang Mingyu <[email protected]>

Changelog:
===========
- Fixed libldap exit handling with OpenSSL3 again (ITS#9952)
- Fixed libldap OpenSSL channel binding digest (ITS#10216)
- Fixed slapd handling of large uid/gids peercred auth (ITS#10211)
- Fixed slapd-asyncmeta/meta target structure allocations (ITS#10197)
- Fixed slapd-meta with dynlist (ITS#10164)
- Fixed slapd-meta binds when proxying internal op (ITS#10165)
- Added slapo-nestgroup overlay (ITS#10161)
- Added slapo-memberof 'addcheck' option (ITS#10167)
- Fixed slapo-accesslog startup initialization (ITS#10170)
- Fixed slapo-constraint double free on invalid attr (ITS#10204)
- Fixed slapo-dynlist with abandoned operations (ITS#10044)
- Fixed build with gcc14.x (ITS#10166)
- Fixed back-perl with clang15 (ITS#10177)
- Fixed to reduce systemd dependencies (ITS#10214)
- Added slapo-alias contrib module (ITS#10104, ITS#10182)
- Fixed slapo-autogroup to work with slapo-dynlist (ITS#10185)
- Fixed smbk5pwd implicit function declaration (ITS#10206)
- Fixed slapo-memberof exattr requirements (ITS#7400)
- Fixed slapo-memberof is no longer deprecated (ITS#7400)

License-Update: Copyright year updated to 2024.

---
 .../openldap/{openldap_2.6.7.bb => openldap_2.6.8.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/openldap/{openldap_2.6.7.bb => openldap_2.6.8.bb} (98%)
meta-oe/recipes-support/openldap/openldap_2.6.8.bb renamed from meta-oe/recipes-support/openldap/openldap_2.6.7.bb +2 -2
similarity index 98%
rename from meta-oe/recipes-support/openldap/openldap_2.6.7.bb
rename to meta-oe/recipes-support/openldap/openldap_2.6.8.bb
index c229667d6..38ee76ba2 100644
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
 # basically BSD.  opensource.org does not record this license
 # at present (so it is apparently not OSI certified).
 LICENSE = "OpenLDAP"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a41b4ed95ab4a20f366a8d82536afe4 \
                     file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
                     "
 SECTION = "libs"
@@ -21,7 +21,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
     file://0001-build-top.mk-unset-STRIP_OPTS.patch \
 "
 
-SRC_URI[sha256sum] = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930"
+SRC_URI[sha256sum] = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e"
 
 DEPENDS = "util-linux groff-native"
 
Signature · 1 line
2.34.1
#1 lore raw

PATCH 2/2 openldap: fix lib32-openldap build failure with gcc-14

From: Wang Mingyu <[email protected]>

---
 ...-fix-incompatible-pointer-type-error.patch | 40 +++++++++++++++++++
 .../openldap/openldap_2.6.8.bb                |  1 +
 2 files changed, 41 insertions(+)
 create mode 100644 meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch
meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch new file +40 -0
new file mode 100644
index 000000000..e6ab4e5a4
@@ -0,0 +1,40 @@
+From 634017950c1c920d0de63fffa5c52e621de1d603 Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <[email protected]>
+Date: Wed, 26 Jun 2024 07:41:01 +0000
+Subject: Fix incompatible pointer type error with gcc option
+ -Wincompatible-pointer-types
+
+lib32-openldap do_compile failure with gcc-14:
+| tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types]
+|   971 |                                         keyhash.bv_val, &keyhash.bv_len ) < 0 ) {
+|       |                                                         ^~~~~~~~~~~~~~~
+|       |                                                         |
+|       |                                                         ber_len_t * {aka long unsigned int *}
+| In file included from tls_g.c:44:
+| /usr/include/gnutls/gnutls.h:2406:32: note: expected 'size_t *' {aka 'unsigned int *'} but argument is of type 'ber_len_t *' {aka 'long unsigned int *'}
+|  2406 |                        size_t *result_size);
+|       |                        ^~~
+
+Upstream-Status: Submitted
+
+Signed-off-by: Wang Mingyu <[email protected]>
+---
+ libraries/libldap/tls_g.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c
+index 7c23875..b4b487d 100644
+--- a/libraries/libldap/tls_g.c
++++ b/libraries/libldap/tls_g.c
+@@ -968,7 +968,7 @@ tlsg_session_pinning( LDAP *ld, tls_session *sess, char *hashalg, struct berval
+ 		keyhash.bv_len = gnutls_hash_get_len( alg );
+ 		keyhash.bv_val = LDAP_MALLOC( keyhash.bv_len );
+ 		if ( !keyhash.bv_val || gnutls_fingerprint( alg, &key,
+-					keyhash.bv_val, &keyhash.bv_len ) < 0 ) {
++					keyhash.bv_val, (size_t *)&keyhash.bv_len ) < 0 ) {
+ 			goto done;
+ 		}
+ 	} else {
+-- 
+2.34.1
+
meta-oe/recipes-support/openldap/openldap_2.6.8.bb +1 -0
index 38ee76ba2..330636b83 100644
@@ -19,6 +19,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
     file://slapd.service \
     file://remove-user-host-pwd-from-version.patch \
     file://0001-build-top.mk-unset-STRIP_OPTS.patch \
+    file://0001-fix-incompatible-pointer-type-error.patch \
 "
 
 SRC_URI[sha256sum] = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e"
Signature · 1 line
2.34.1