fkastl/openldap2
SHA256
1
0
Fork 0
forked from jengelh/openldap2
Code Pull Requests Activity

Add back two hunks from gcc14.patch as gcc14-v2.patch

Browse Source 
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.
This commit is contained in:
Filip Kastl 2024-08-07 13:47:20 +02:00
parent 8f998cd851
commit 4029e81ba3
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gcc14-v2.patch Normal file
View File

@ -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 */

9
openldap2.changes
View File

@ -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>

1
openldap2.spec
View File

@ -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