diff --git a/openldap2-fb9e6a81bbee.patch b/openldap2-fb9e6a81bbee.patch new file mode 100644 index 0000000..e55dd62 --- /dev/null +++ b/openldap2-fb9e6a81bbee.patch @@ -0,0 +1,28 @@ +From fb9e6a81bbee880549e7ec18f0a74ddddbd2d1ab Mon Sep 17 00:00:00 2001 +From: Stephen Gallagher +Date: Tue, 6 Feb 2024 21:38:24 -0500 +Subject: [PATCH] ITS#10171 - Explicitly cast private values + +Fixes issues with -Werror=incompatible-pointer-types + +Signed-off-by: Stephen Gallagher +--- + servers/slapd/config.c | 2 +- + servers/slapd/overlays/constraint.c | 2 +- + servers/slapd/overlays/dyngroup.c | 2 +- + servers/slapd/overlays/valsort.c | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/servers/slapd/config.c b/servers/slapd/config.c +index 80333f359c..987c862d91 100644 +--- a/servers/slapd/config.c ++++ b/servers/slapd/config.c +@@ -151,7 +151,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) { + int rc, arg_user, arg_type, arg_syn, iarg; + unsigned uiarg; + long larg; +- size_t ularg; ++ unsigned long ularg; + ber_len_t barg; + + if(Conf->arg_type == ARG_IGNORED) { diff --git a/openldap2.changes b/openldap2.changes index 995bf18..2909b6c 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Jul 29 17:06:34 UTC 2024 - Martin Jambor + +- Backported one hunk from upstream commit fb9e6a81bbee as + openldap2-fb9e6a81bbee.patch to fix incompatible pointer type being + passed to a function which is diagnosed as an error by GCC 14. + ------------------------------------------------------------------- Sat May 25 07:46:05 UTC 2024 - Jan Engelhardt diff --git a/openldap2.spec b/openldap2.spec index 8c6892c..f4baba5 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -57,6 +57,7 @@ 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.patch +Patch18: openldap2-fb9e6a81bbee.patch BuildRequires: argon2-devel BuildRequires: cyrus-sasl-devel BuildRequires: db-devel