external/md4c/0001-const-up-scheme_map.patch.1 | 25 ++++++++++++++
external/md4c/UnpackedTarball_md4c.mk | 8 ++++
external/openldap/0001-const-up-oids.patch.1 | 44 +++++++++++++++++++++++++
external/openldap/UnpackedTarball_openldap.mk | 5 ++
4 files changed, 82 insertions(+)
New commits:
commit 3be2bcef795b893d8fd1b6a0e876699313e5c8ec
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 26 21:40:27 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Jul 28 15:48:11 2025 +0200
const up md4c
Change-Id: Ia37c2db3cd5b06f7d755b08d6d3b792a1bd6936e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188424
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/md4c/0001-const-up-scheme_map.patch.1
b/external/md4c/0001-const-up-scheme_map.patch.1
new file mode 100644
index 000000000000..ca2f1d4aaf51
--- /dev/null
+++ b/external/md4c/0001-const-up-scheme_map.patch.1
@@ -0,0 +1,25 @@
+From 66526366b67e3b42eb4c30cefa6f5efdff690c8e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com>
+Date: Sat, 26 Jul 2025 21:38:34 +0100
+Subject: [PATCH] const up scheme_map
+
+---
+ src/md4c.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/md4c.c b/src/md4c.c
+index e3f5cf9..947f5c9 100644
+--- a/src/md4c.c
++++ b/src/md4c.c
+@@ -3238,7 +3238,7 @@ md_collect_marks(MD_CTX* ctx, const MD_LINE* lines,
MD_SIZE n_lines, int table_m
+
+ /* A potential permissive URL autolink. */
+ if(ch == _T(':')) {
+- static struct {
++ static const struct {
+ const CHAR* scheme;
+ SZ scheme_size;
+ const CHAR* suffix;
+--
+2.49.0
+
diff --git a/external/md4c/UnpackedTarball_md4c.mk
b/external/md4c/UnpackedTarball_md4c.mk
index 0f66693d8e8e..d4ea369638f3 100644
--- a/external/md4c/UnpackedTarball_md4c.mk
+++ b/external/md4c/UnpackedTarball_md4c.mk
@@ -10,4 +10,12 @@
$(eval $(call gb_UnpackedTarball_UnpackedTarball,md4c))
$(eval $(call gb_UnpackedTarball_set_tarball,md4c,$(MD4C_TARBALL)))
+# 0001-const-up-scheme_map.patch.1 effort to upstream at:
+# https://github.com/mity/md4c/pull/291
+
+$(eval $(call gb_UnpackedTarball_add_patches,md4c,\
+ external/md4c/0001-const-up-scheme_map.patch.1 \
+))
+
+
# vim: set noet sw=4 ts=4:
commit aaf7a4e74f012a868f7138bf72fcb16ac4530ae2
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Jul 26 21:02:22 2025 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Mon Jul 28 15:47:57 2025 +0200
const up openldap
Change-Id: If41fb35947c3f0a50313349997cd255bdc0a8cd4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188422
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.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:
