external/openldap/0001-const-up-oids.patch.1  |   44 ++++++++++++++++++++++++++
 external/openldap/UnpackedTarball_openldap.mk |    5 ++
 2 files changed, 49 insertions(+)

New commits:
commit bcbebf176d766cd3f7b83c267a605c5a38502a87
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 26 21:02:22 2025 +0100
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Jul 28 15:52:04 2025 +0200

    const up openldap
    
    Change-Id: If41fb35947c3f0a50313349997cd255bdc0a8cd4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188472
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/external/openldap/0001-const-up-oids.patch.1 
b/external/openldap/0001-const-up-oids.patch.1
new file mode 100644
index 000000000000..53d6df075325
--- /dev/null
+++ b/external/openldap/0001-const-up-oids.patch.1
@@ -0,0 +1,44 @@
+From c7571ffd4d17825a9054e2e204ee61127bedb0b0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caol...@gmail.com>
+Date: Sat, 26 Jul 2025 21:00:50 +0100
+Subject: [PATCH] const up oids
+
+to move it out of the .data section
+---
+ libraries/libldap/tls2.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libraries/libldap/tls2.c b/libraries/libldap/tls2.c
+index 1bda3fb2aa..1fb878aab8 100644
+--- a/libraries/libldap/tls2.c
++++ b/libraries/libldap/tls2.c
+@@ -51,7 +51,7 @@ typedef struct oid_name {
+       struct berval name;
+ } oid_name;
+ 
+-static oid_name oids[] = {
++static const oid_name oids[] = {
+       { BER_BVC("2.5.4.3"), BER_BVC("cn") },
+       { BER_BVC("2.5.4.4"), BER_BVC("sn") },
+       { BER_BVC("2.5.4.6"), BER_BVC("c") },
+@@ -1394,7 +1394,7 @@ ldap_start_tls_s ( LDAP *ld,
+ #define       LBER_TAG_UNIVERSAL      ((ber_tag_t) 0x1cUL)
+ #define       LBER_TAG_BMP            ((ber_tag_t) 0x1eUL)
+ 
+-static oid_name *
++static const oid_name *
+ find_oid( struct berval *oid )
+ {
+       int i;
+@@ -1519,7 +1519,7 @@ ldap_X509dn2bv( void *x509_name, struct berval *bv, 
LDAPDN_rewrite_func *func,
+       int csize;
+       ber_tag_t tag;
+       ber_len_t len;
+-      oid_name *oidname;
++      const oid_name *oidname;
+ 
+       struct berval   Oid, Val, oid2, *in = x509_name;
+ 
+-- 
+2.49.0
+
diff --git a/external/openldap/UnpackedTarball_openldap.mk 
b/external/openldap/UnpackedTarball_openldap.mk
index 61a083ddcd8a..a5b365535b2e 100644
--- a/external/openldap/UnpackedTarball_openldap.mk
+++ b/external/openldap/UnpackedTarball_openldap.mk
@@ -18,8 +18,13 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,openldap,\
        contrib/ldapc++ \
 ))
 
+# external/openldap/0001-const-up-oids.patch.1
+# effort at upstream as:
+# https://bugs.openldap.org/show_bug.cgi?id=10375
+
 $(eval $(call gb_UnpackedTarball_add_patches,openldap,\
        external/openldap/openldap-2.4.44.patch.1 \
+       external/openldap/0001-const-up-oids.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:

Reply via email to