Accepting request 1192647 from network:ldap

- Add back two hunks from gcc14.patch as gcc14-v2.patch.  Not all
  bugs that gcc14.patch fixed were dealt with in the upstream --
  one bug is caused by
  0016-Clear-shared-key-only-in-close-function.patch and one bug
  still remains in the upstream.

OBS-URL: https://build.opensuse.org/request/show/1192647
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openldap2?expand=0&rev=186

_scmsync.obsinfo

@@ -1,4 +1,4 @@
-mtime: 1722414979
+mtime: 1723031454
-commit: 8f998cd85104beab1c2213b0cf5f7feef907d8925abdcf712f80fea621e003a1
+commit: 4029e81ba39bc3ad0647ae62172b9493d12e854b52820d5370ac5771cabae5ba
 url: https://src.opensuse.org/jengelh/openldap2
 revision: master

build.specials.obscpio

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:55be6e9703d024074ec67c7f870033c7c063ae4f846bfcc5ca6e07dbb10caab1
+oid sha256:f13c93beb5fe49e16842ab9afd8031be97944b67cd26bafb180d924c86398b0d
 size 256

gcc14-v2.patch

@@ -0,0 +1,25 @@
+Index: openldap-2.6.7/contrib/slapd-modules/cloak/cloak.c
+===================================================================
+--- openldap-2.6.7.orig/contrib/slapd-modules/cloak/cloak.c
++++ openldap-2.6.7/contrib/slapd-modules/cloak/cloak.c
+@@ -242,6 +242,7 @@ cloak_search_response_cb( Operation *op,
+ 			else
+ 				me->e_attrs = a->a_next;
+ 
++			extern void attr_clean(Attribute *);
+ 			attr_clean( a );
+ 		}
+
+Index: openldap-2.6.7/libraries/liblmdb/mdb.c
+===================================================================
+--- openldap-2.6.7.orig/libraries/liblmdb/mdb.c
++++ openldap-2.6.7/libraries/liblmdb/mdb.c
+@@ -5161,7 +5161,7 @@ mdb_env_close0(MDB_env *env, int excl)
+ 
+ 		// No need to call desctructor anymore, as all pid
+ 		// values are cleared below.
+-		env->me_txkey = NULL;
++		memset(&env->me_txkey, 0, sizeof(env->me_txkey));
+ 
+ #ifdef _WIN32
+ 		/* Delete our key from the global list */

openldap2.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Aug  7 11:42:49 UTC 2024 - Filip Kastl <filip.kastl@suse.com>
+
+- Add back two hunks from gcc14.patch as gcc14-v2.patch.  Not all
+  bugs that gcc14.patch fixed were dealt with in the upstream --
+  one bug is caused by
+  0016-Clear-shared-key-only-in-close-function.patch and one bug
+  still remains in the upstream.
+
 -------------------------------------------------------------------
 Wed Jul 31 05:11:48 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

openldap2.spec

@@ -56,6 +56,7 @@ Patch3:         0003-LDAPI-socket-location.dif
 Patch5:         0005-pie-compile.dif
 Patch8:         0008-In-monitor-backend-do-not-return-Connection0-entries.patch
 Patch16:        0016-Clear-shared-key-only-in-close-function.patch
+Patch17:        gcc14-v2.patch
 BuildRequires:  argon2-devel
 BuildRequires:  cyrus-sasl-devel
 BuildRequires:  db-devel