openldap: upgrade 2.6.8 -> 2.6.9

ChangeLog:
https://www.openldap.org/software/release/changes.html

Drop 0001-fix-incompatible-pointer-type-error.patch as the issue has
been fixed upstream.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 1 insertions, 47 deletions

diff --git a/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch b/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch
deleted file mode 100644
index e6ab4e5a46..0000000000
--- a/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 634017950c1c920d0de63fffa5c52e621de1d603 Mon Sep 17 00:00:00 2001
-From: Wang Mingyu <wangmy@fujitsu.com>
-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 <wangmy@fujitsu.com>
----
- 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
-
diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.8.bb b/meta-oe/recipes-support/openldap/openldap_2.6.9.bb
index ca27ab23ec..6d76a727ba 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.6.8.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.6.9.bb
@@ -19,10 +19,9 @@ 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"
+SRC_URI[sha256sum] = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff"
 
 DEPENDS = "util-linux groff-native"
 
@@ -230,8 +229,3 @@ python populate_packages:prepend () {
 }
 
 BBCLASSEXTEND = "native"
-
-# This one is reproducible only on 32bit MACHINEs
-# http://errors.yoctoproject.org/Errors/Details/766968/
-# tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types]
-CFLAGS += "-Wno-error=incompatible-pointer-types"