mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2024-09-20 11:23:16 +00:00
main/openldap: fix build with gcc 14
This commit is contained in:
parent
40610e9f29
commit
e6b6d19360
2 changed files with 70 additions and 1 deletions
|
@ -33,7 +33,7 @@
|
|||
#
|
||||
pkgname=openldap
|
||||
pkgver=2.6.7
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="LDAP Server"
|
||||
url="https://www.openldap.org/"
|
||||
arch="all"
|
||||
|
@ -89,6 +89,7 @@ source="https://www.openldap.org/software/download/OpenLDAP/openldap-release/ope
|
|||
0007-Use-correct-extension-for-slapd-modules.patch
|
||||
0008-Remove-pidfile-and-argsfile.patch
|
||||
0009-Include-more-schemas-in-default-config.patch
|
||||
Explicitly-cast-private-values.patch
|
||||
|
||||
lloadd.conf
|
||||
slapd.initd
|
||||
|
@ -391,6 +392,7 @@ f88de2f92a31f1b906e850daa1b518fc90822e668c9ca99c33934304d260237a1406cb845c2f4985
|
|||
30af37e70a53a55c56bb0e74eee770a00abe83d4b0a787845363ccff564b49b8ba20c907bb976442b4dc2278db7b0a039a11c85dd40a547af6de9a7f1591328f 0007-Use-correct-extension-for-slapd-modules.patch
|
||||
eaadec2a58a7f117c67b10673e26fe8c38e40ae4c1ae5fda9004c9bbebca81b6cd51cc482f28d94dacd8154ed800fd1e90f48807970f54652bfc021f8039806e 0008-Remove-pidfile-and-argsfile.patch
|
||||
1c2a18280ea06f8095f013c110f8b1b0779c3dc89aa19158cdedbe3a7e1019e7ea5a503cba4d3e3ae824423ded22b2ef334665d2281969ac3b0efb96de34e37e 0009-Include-more-schemas-in-default-config.patch
|
||||
33c79446aac66f6a080c6097b628de8e9eba772b95f4a21add32e0985160d72c5faa435965cfb7eafd8dc5636b0bdc14cb550d3b818761cadbacd9255e8b2106 Explicitly-cast-private-values.patch
|
||||
c47a415a2a9cd98bb448820b981f40df82b4825e0ebcc8a5fb3c604d15e8f57ea1578afca6b3aa90351fd13e7ddba7dc7452bdb669df4a402f02990ca154e34e lloadd.conf
|
||||
d8bd06f56a816851015488cccb352657df09f1aed9990fc2870208ffb1c5c499ac1d7592c42e8fa6e4a26a6bb2535f57e91d3a2aecfb38cf15d86de20e0e69a7 slapd.initd
|
||||
5898139481b3317b257ce1bfab401dd4e111a8f7ebb02262a8dcb165c6416fba1e5bb070cdf618918f018d2ad942d9514ce6a9b2ab1c57ac30ec75fb53b04af1 slapd.confd
|
||||
|
|
67
main/openldap/Explicitly-cast-private-values.patch
Normal file
67
main/openldap/Explicitly-cast-private-values.patch
Normal file
|
@ -0,0 +1,67 @@
|
|||
From fb9e6a81bbee880549e7ec18f0a74ddddbd2d1ab Mon Sep 17 00:00:00 2001
|
||||
From: Stephen Gallagher <sgallagh@redhat.com>
|
||||
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 <sgallagh@redhat.com>
|
||||
---
|
||||
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/servers/slapd/overlays/constraint.c b/servers/slapd/overlays/constraint.c
|
||||
index f939b37762..0d6156af4d 100644
|
||||
--- a/servers/slapd/overlays/constraint.c
|
||||
+++ b/servers/slapd/overlays/constraint.c
|
||||
@@ -557,7 +557,7 @@ done:;
|
||||
a2->restrict_filter = ap.restrict_filter;
|
||||
a2->restrict_val = ap.restrict_val;
|
||||
|
||||
- for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
|
||||
+ for ( app = (constraint **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
|
||||
/* Get to the end */ ;
|
||||
|
||||
a2->ap_next = *app;
|
||||
diff --git a/servers/slapd/overlays/dyngroup.c b/servers/slapd/overlays/dyngroup.c
|
||||
index 5d890d6650..e0e70af2d9 100644
|
||||
--- a/servers/slapd/overlays/dyngroup.c
|
||||
+++ b/servers/slapd/overlays/dyngroup.c
|
||||
@@ -111,7 +111,7 @@ static int dgroup_cf( ConfigArgs *c )
|
||||
*/
|
||||
a2 = ch_malloc( sizeof(adpair) );
|
||||
|
||||
- for ( app = &on->on_bi.bi_private; *app; app = &(*app)->ap_next )
|
||||
+ for ( app = (adpair **)&on->on_bi.bi_private; *app; app = &(*app)->ap_next )
|
||||
/* Get to the end */ ;
|
||||
|
||||
a2->ap_mem = ap.ap_mem;
|
||||
diff --git a/servers/slapd/overlays/valsort.c b/servers/slapd/overlays/valsort.c
|
||||
index 3d998e2fcb..e251500d0b 100644
|
||||
--- a/servers/slapd/overlays/valsort.c
|
||||
+++ b/servers/slapd/overlays/valsort.c
|
||||
@@ -201,7 +201,7 @@ valsort_cf_func(ConfigArgs *c) {
|
||||
return(1);
|
||||
}
|
||||
|
||||
- for ( vip = &on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
|
||||
+ for ( vip = (valsort_info **)&on->on_bi.bi_private; *vip; vip = &(*vip)->vi_next )
|
||||
/* Get to the end */ ;
|
||||
|
||||
vi = ch_malloc( sizeof(valsort_info) );
|
Loading…
Reference in a new issue