download.lst | 4 +- external/openldap/0001-const-up-oids.patch.1 | 44 -------------------------- external/openldap/UnpackedTarball_openldap.mk | 1 3 files changed, 2 insertions(+), 47 deletions(-)
New commits: commit 0e38fd3a3f2453048b68a24c5af3dd0534ab5b66 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Jan 30 09:39:52 2026 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Jan 30 10:42:12 2026 +0100 openldap: upgrade to 2.6.12 * 0001-const-up-oids.patch.1 has been fixed upstream Downloaded from https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.6.12.tgz Change-Id: I253858a6f7b60218f30352ec751cd18fa6dfdf09 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198401 Reviewed-by: Xisco Fauli <[email protected]> Tested-by: Jenkins diff --git a/download.lst b/download.lst index 99f49ade6466..d635ce3f57ba 100644 --- a/download.lst +++ b/download.lst @@ -549,8 +549,8 @@ ONLINEUPDATE_TARBALL := onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2. # three static lines # so that git cherry-pick # will not run into conflicts -OPENLDAP_SHA256SUM := c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516 -OPENLDAP_TARBALL := openldap-2.6.10.tgz +OPENLDAP_SHA256SUM := 1716ad779e85d743694c3e3b05277fb71b6a5eadca43c7a958aa62683b22208e +OPENLDAP_TARBALL := openldap-2.6.12.tgz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/openldap/0001-const-up-oids.patch.1 b/external/openldap/0001-const-up-oids.patch.1 deleted file mode 100644 index 53d6df075325..000000000000 --- a/external/openldap/0001-const-up-oids.patch.1 +++ /dev/null @@ -1,44 +0,0 @@ -From c7571ffd4d17825a9054e2e204ee61127bedb0b0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <[email protected]> -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 a5b365535b2e..661d509187f9 100644 --- a/external/openldap/UnpackedTarball_openldap.mk +++ b/external/openldap/UnpackedTarball_openldap.mk @@ -24,7 +24,6 @@ $(eval $(call gb_UnpackedTarball_update_autoconf_configs,openldap,\ $(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:
