From f28a859912bcb57ff2565a5054d3c34472ded66f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Jul 2026 08:04:23 +0000 Subject: [PATCH 01/15] Updated dependency 'git' from version 2.54.0 to 2.55.0 --- deps-packaging/git/cfbuild-git.spec | 2 +- deps-packaging/git/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec index 6bd8ab7c0..452a011b9 100644 --- a/deps-packaging/git/cfbuild-git.spec +++ b/deps-packaging/git/cfbuild-git.spec @@ -1,4 +1,4 @@ -%define git_version 2.54.0 +%define git_version 2.55.0 Summary: CFEngine Build Automation -- git Name: cfbuild-git diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles index b02e4b46a..02b67c815 100644 --- a/deps-packaging/git/distfiles +++ b/deps-packaging/git/distfiles @@ -1 +1 @@ -45e8107643a44e3ce46f5665beb35af3932fb0d70017687905ab5d4e3aafa8eb git-2.54.0.tar.gz +0842dc384a23ac33ba3e570c4f3a8ded85963ee4713b1cd21153c3db41813d1e git-2.55.0.tar.gz From 864c921443321339e073118ddb6a2c68ce0255ae Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Jul 2026 08:04:24 +0000 Subject: [PATCH 02/15] Updated dependency 'libacl' from version 2.3.2 to 2.4.0 --- deps-packaging/libacl/cfbuild-libacl.spec | 2 +- deps-packaging/libacl/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libacl/cfbuild-libacl.spec b/deps-packaging/libacl/cfbuild-libacl.spec index 3203c1310..e952c7107 100644 --- a/deps-packaging/libacl/cfbuild-libacl.spec +++ b/deps-packaging/libacl/cfbuild-libacl.spec @@ -1,4 +1,4 @@ -%define acl_version 2.3.2 +%define acl_version 2.4.0 Summary: CFEngine Build Automation -- libacl Name: cfbuild-libacl diff --git a/deps-packaging/libacl/distfiles b/deps-packaging/libacl/distfiles index 52b29d6b3..e2f6bcd6c 100644 --- a/deps-packaging/libacl/distfiles +++ b/deps-packaging/libacl/distfiles @@ -1 +1 @@ -5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c acl-2.3.2.tar.gz +73c853c3d44e1f693e5a96a986f1bd19d3d0dac2c7d453e796177774bc4e5f6a acl-2.4.0.tar.gz From 288d2b48d5213c48dd88c44aee16e0fe8222b574 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Jul 2026 08:04:25 +0000 Subject: [PATCH 03/15] Updated dependency 'libattr' from version 2.5.2 to 2.6.0 --- deps-packaging/libattr/cfbuild-libattr.spec | 2 +- deps-packaging/libattr/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libattr/cfbuild-libattr.spec b/deps-packaging/libattr/cfbuild-libattr.spec index e594af1b5..9a0217ee7 100644 --- a/deps-packaging/libattr/cfbuild-libattr.spec +++ b/deps-packaging/libattr/cfbuild-libattr.spec @@ -1,4 +1,4 @@ -%define attr_version 2.5.2 +%define attr_version 2.6.0 Summary: CFEngine Build Automation -- libattr Name: cfbuild-libattr diff --git a/deps-packaging/libattr/distfiles b/deps-packaging/libattr/distfiles index f1227f1e2..2c86d2e1f 100644 --- a/deps-packaging/libattr/distfiles +++ b/deps-packaging/libattr/distfiles @@ -1 +1 @@ -39bf67452fa41d0948c2197601053f48b3d78a029389734332a6309a680c6c87 attr-2.5.2.tar.gz +d42fa374513180bb48cb11a46696f488240e5124ff1e6ad88b0abff706985612 attr-2.6.0.tar.gz From 42bbbaac84d1f295224b178165875d5499f190f2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Jul 2026 08:04:26 +0000 Subject: [PATCH 04/15] Updated dependency 'libcurl' from version 8.20.0 to 8.21.0 --- deps-packaging/libcurl/cfbuild-libcurl.spec | 2 +- deps-packaging/libcurl/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libcurl/cfbuild-libcurl.spec b/deps-packaging/libcurl/cfbuild-libcurl.spec index 90e6d8585..854ac4ef5 100644 --- a/deps-packaging/libcurl/cfbuild-libcurl.spec +++ b/deps-packaging/libcurl/cfbuild-libcurl.spec @@ -1,4 +1,4 @@ -%define curl_version 8.20.0 +%define curl_version 8.21.0 Summary: CFEngine Build Automation -- libcurl Name: cfbuild-libcurl diff --git a/deps-packaging/libcurl/distfiles b/deps-packaging/libcurl/distfiles index 024e5bcdd..99e2a1bd5 100644 --- a/deps-packaging/libcurl/distfiles +++ b/deps-packaging/libcurl/distfiles @@ -1 +1 @@ -fc5819cad3f9f5482669adcdc49a782c15f36d2a0715b395b06d9173593d2dc0 curl-8.20.0.tar.gz +d9b327997999045a24cda50f3983e69e51c516bd8be6ef9842fc7f99135e33bb curl-8.21.0.tar.gz From 3c631cb010255a620336cc7e13c0d4c43f73123c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Jul 2026 08:04:26 +0000 Subject: [PATCH 05/15] Updated dependency 'libcurl-hub' from version 8.20.0 to 8.21.0 --- deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec | 2 +- deps-packaging/libcurl-hub/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec b/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec index bdf2e2a9f..aa90997a6 100644 --- a/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec +++ b/deps-packaging/libcurl-hub/cfbuild-libcurl-hub.spec @@ -1,4 +1,4 @@ -%define curl_version 8.20.0 +%define curl_version 8.21.0 Summary: CFEngine Build Automation -- libcurl Name: cfbuild-libcurl-hub diff --git a/deps-packaging/libcurl-hub/distfiles b/deps-packaging/libcurl-hub/distfiles index 024e5bcdd..99e2a1bd5 100644 --- a/deps-packaging/libcurl-hub/distfiles +++ b/deps-packaging/libcurl-hub/distfiles @@ -1 +1 @@ -fc5819cad3f9f5482669adcdc49a782c15f36d2a0715b395b06d9173593d2dc0 curl-8.20.0.tar.gz +d9b327997999045a24cda50f3983e69e51c516bd8be6ef9842fc7f99135e33bb curl-8.21.0.tar.gz From 2cfb1fe4a5b00470f5e1b238453ff7e895cbff16 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Jul 2026 08:04:26 +0000 Subject: [PATCH 06/15] Updated dependency 'libexpat' from version 2.8.1 to 2.8.2 --- deps-packaging/libexpat/cfbuild-libexpat.spec | 2 +- deps-packaging/libexpat/distfiles | 2 +- deps-packaging/libexpat/source | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps-packaging/libexpat/cfbuild-libexpat.spec b/deps-packaging/libexpat/cfbuild-libexpat.spec index a0e177fd9..c9b4b0826 100644 --- a/deps-packaging/libexpat/cfbuild-libexpat.spec +++ b/deps-packaging/libexpat/cfbuild-libexpat.spec @@ -1,4 +1,4 @@ -%define expat_version 2.8.1 +%define expat_version 2.8.2 Summary: CFEngine Build Automation -- libexpat Name: cfbuild-libexpat diff --git a/deps-packaging/libexpat/distfiles b/deps-packaging/libexpat/distfiles index c2bb242b7..ef8b42fa2 100644 --- a/deps-packaging/libexpat/distfiles +++ b/deps-packaging/libexpat/distfiles @@ -1 +1 @@ -10b195ee78160a908388180a8fe3603d4e9a12f4755fbf5f3816b23a9d750da0 expat-2.8.1.tar.xz +3ad89b8588e6644bd4e49981480d48b21289eebbcd4f0a1a4afb1c29f99b6ab4 expat-2.8.2.tar.xz diff --git a/deps-packaging/libexpat/source b/deps-packaging/libexpat/source index 9d573df43..af4c6bfc3 100644 --- a/deps-packaging/libexpat/source +++ b/deps-packaging/libexpat/source @@ -1 +1 @@ -https://github.com/libexpat/libexpat/releases/download/R_2_8_1/ +https://github.com/libexpat/libexpat/releases/download/R_2_8_2/ From 2f31900a81a169bfa35aa65a36445d286b53a9a7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Jul 2026 08:04:27 +0000 Subject: [PATCH 07/15] Updated dependency 'lmdb' from version 0.9.35 to 1.0.0 --- deps-packaging/lmdb/cfbuild-lmdb.spec | 2 +- deps-packaging/lmdb/distfiles | 2 +- deps-packaging/lmdb/source | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps-packaging/lmdb/cfbuild-lmdb.spec b/deps-packaging/lmdb/cfbuild-lmdb.spec index 1fe9dc9e6..0387ab844 100644 --- a/deps-packaging/lmdb/cfbuild-lmdb.spec +++ b/deps-packaging/lmdb/cfbuild-lmdb.spec @@ -1,4 +1,4 @@ -%define lmdb_version 0.9.35 +%define lmdb_version 1.0.0 Summary: CFEngine Build Automation -- lmdb Name: cfbuild-lmdb diff --git a/deps-packaging/lmdb/distfiles b/deps-packaging/lmdb/distfiles index 0ced69b1f..f3c975d59 100644 --- a/deps-packaging/lmdb/distfiles +++ b/deps-packaging/lmdb/distfiles @@ -1 +1 @@ -0d090c6a7c85a4f31a2ab0d734554c21097f24752393a190b0e51996b08f48c4 openldap-LMDB_0.9.35.tar.gz +a61ded12bd9c670038b77483dda13b50684a93a111e53421dfb979624ae9f72e openldap-LMDB_1.0.0.tar.gz diff --git a/deps-packaging/lmdb/source b/deps-packaging/lmdb/source index 94726e992..251867b28 100644 --- a/deps-packaging/lmdb/source +++ b/deps-packaging/lmdb/source @@ -1 +1 @@ -https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.35/ +https://git.openldap.org/openldap/openldap/-/archive/LMDB_1.0.0/ From 6702a576bf4b500ecb58fcbce3cfe2c158ebdefa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Jul 2026 08:04:34 +0000 Subject: [PATCH 08/15] Updated dependency 'php' from version 8.5.7 to 8.5.8 --- deps-packaging/php/cfbuild-php.spec | 2 +- deps-packaging/php/distfiles | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps-packaging/php/cfbuild-php.spec b/deps-packaging/php/cfbuild-php.spec index d153c462d..d2b920b09 100644 --- a/deps-packaging/php/cfbuild-php.spec +++ b/deps-packaging/php/cfbuild-php.spec @@ -1,4 +1,4 @@ -%define php_version 8.5.7 +%define php_version 8.5.8 Summary: CFEngine Build Automation -- php Name: cfbuild-php diff --git a/deps-packaging/php/distfiles b/deps-packaging/php/distfiles index a6bc2db63..fa44db9a7 100644 --- a/deps-packaging/php/distfiles +++ b/deps-packaging/php/distfiles @@ -1 +1 @@ -e5eba93fd6dd3241d0e61e932eb99a3783b40568553fb0e511b660ecd863a049 php-8.5.7.tar.gz +6ebc55e52af4396385e689f7af0f28944fbbf966843433b573e9dc1dc03df539 php-8.5.8.tar.gz From 3a6af68df8fedbca45c7b6dbf5f69b87118bc83f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Jul 2026 08:04:35 +0000 Subject: [PATCH 09/15] Updated dependency 'leech2' from version 5.2.0 to 5.3.0 --- deps-packaging/leech2/cfbuild-leech2.spec | 2 +- deps-packaging/leech2/distfiles | 2 +- deps-packaging/leech2/source | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps-packaging/leech2/cfbuild-leech2.spec b/deps-packaging/leech2/cfbuild-leech2.spec index 7ae7fdd22..1cedc3125 100644 --- a/deps-packaging/leech2/cfbuild-leech2.spec +++ b/deps-packaging/leech2/cfbuild-leech2.spec @@ -1,4 +1,4 @@ -%define leech2_version 5.2.0 +%define leech2_version 5.3.0 Summary: CFEngine Build Automation -- leech2 Name: cfbuild-leech2 diff --git a/deps-packaging/leech2/distfiles b/deps-packaging/leech2/distfiles index 694a54cbb..3ffaa002e 100644 --- a/deps-packaging/leech2/distfiles +++ b/deps-packaging/leech2/distfiles @@ -1 +1 @@ -b33711aeadf592c3b56dceda683191d83d23d9b0dbb2ef9b690004bcc5ed908d leech2-5.2.0.tar.gz +570d7c002fa05fe1dbccfdcbf8592823b303341844763d898a0d7ed3183c971f leech2-5.3.0.tar.gz diff --git a/deps-packaging/leech2/source b/deps-packaging/leech2/source index 2e0dd3cf8..38f3263c8 100644 --- a/deps-packaging/leech2/source +++ b/deps-packaging/leech2/source @@ -1 +1 @@ -https://github.com/larsewi/leech2/releases/download/v5.2.0/ +https://github.com/larsewi/leech2/releases/download/v5.3.0/ From 45a5b3a073147b6d758922a0534b442ddb763741 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 13 Jul 2026 08:04:38 +0000 Subject: [PATCH 10/15] Updated Rust toolchain to 1.97.0 --- ci/linux-install-rust.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ci/linux-install-rust.sh b/ci/linux-install-rust.sh index 041a5a657..beb6c4213 100755 --- a/ci/linux-install-rust.sh +++ b/ci/linux-install-rust.sh @@ -17,7 +17,7 @@ install_rust() { # Windows is the only cross-compilation target, and only on MinGW build # hosts, so the caller passes "x86_64-pc-windows-gnu" as an argument there. baseurl="https://static.rust-lang.org/dist" - version=1.96.0 + version=1.97.0 prefix=/opt/rust extra_targets="$@" @@ -28,24 +28,24 @@ install_rust() { if uname -m | grep aarch64; then host=aarch64-unknown-linux-gnu # checksum from $baseurl/rustc-${version}-aarch64-unknown-linux-gnu.tar.gz.sha256 - rustc_sha=ba3c19a8e3a54efce3bd8d6c8ceb21173c8c64a100dd84e62fdfd8313c1ea7ed + rustc_sha=f91c23ade7e7b4ac173f12593eb1dcf1a37189d4e545ca2f64e3c14090ff6c0c # checksum from $baseurl/cargo-${version}-aarch64-unknown-linux-gnu.tar.gz.sha256 - cargo_sha=aff68544337c835a58ff303c47fc1ddb0a1a0bd9df332e37c8d466d8f78eaa32 + cargo_sha=655cc1c9f1e7cb65cd5fa82de31e1adf2d8ba2011a8b5e28ca3e9529898e64bb else host=x86_64-unknown-linux-gnu # checksum from $baseurl/rustc-${version}-x86_64-unknown-linux-gnu.tar.gz.sha256 - rustc_sha=71143d6075582b7e65233992c77e375aadbec4dfda6df2675160bf05b89410f9 + rustc_sha=ca0439140d02e91420f4755cc4681a6444a2dbe8e9a6f685f403946ed3efd995 # checksum from $baseurl/cargo-${version}-x86_64-unknown-linux-gnu.tar.gz.sha256 - cargo_sha=b691a9e31b1e5498017be91155a1e7501eccf6437e7dc9ff1896e38aa1584dbf + cargo_sha=0214406b145a134463149b0dcc8cdd7a0882e181d2ad2cf893723bbd576d4a44 fi # rust-std checksums per target. These are host-architecture independent. # checksum from $baseurl/rust-std-${version}-x86_64-unknown-linux-gnu.tar.gz.sha256 - std_x86_64_linux_sha=36e577b66f7b2f8fc6493f97f81329e5f6e1514360d0c6c31d5d8463184e6773 + std_x86_64_linux_sha=26abd06b9c4221811af1baec86dfb6de9535862fc853b85388dcc314c96cea6d # checksum from $baseurl/rust-std-${version}-aarch64-unknown-linux-gnu.tar.gz.sha256 - std_aarch64_linux_sha=66ad5d73e79dd44b93c260ee61752abce3ce5ccb5031832beaccd1c248b88586 + std_aarch64_linux_sha=ae6c76b70be4768ecf2f320f1e6fa28525730b7fd7d6cfc822a3a23e0c07fcc2 # checksum from $baseurl/rust-std-${version}-x86_64-pc-windows-gnu.tar.gz.sha256 - std_x86_64_windows_sha=6951de999a0926aa8e35046017473a1912274cc34e800887eb3bfba4ddae12c9 + std_x86_64_windows_sha=7ef19232b379616509007c7a8db45c4ee7031c22d9614fa2b7f18b2a30ff85fa # Download, verify, extract and install a single component tarball, then # remove both the tarball and its extracted tree before moving on. From f882a56fcbb699fed11ca3b2d0673414cc99aa4b Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Thu, 9 Jul 2026 18:44:33 +0000 Subject: [PATCH 11/15] Fixed lmdb autoconf patches for lmdb 1.0.0 Ticket: none Changelog: none --- deps-packaging/lmdb/0003-Autoconf-files.patch | 94 +++++++++++++++---- .../lmdb/0005-Generated-autoconf-files.patch | 6 +- ...Added-mdb_dump-and-mdb_load-to-build.patch | 5 +- 3 files changed, 83 insertions(+), 22 deletions(-) diff --git a/deps-packaging/lmdb/0003-Autoconf-files.patch b/deps-packaging/lmdb/0003-Autoconf-files.patch index 02be4fd9e..1b4ff45f8 100644 --- a/deps-packaging/lmdb/0003-Autoconf-files.patch +++ b/deps-packaging/lmdb/0003-Autoconf-files.patch @@ -15,10 +15,10 @@ Subject: [PATCH 03/10] Autoconf files. diff --git a/libraries/liblmdb/Makefile b/libraries/liblmdb/Makefile deleted file mode 100644 -index f254511..0000000 ---- a/libraries/liblmdb/Makefile +index 9fd819b..0000000 +--- a/Makefile +++ /dev/null -@@ -1,118 +0,0 @@ +@@ -1,177 +0,0 @@ -# Makefile for liblmdb (Lightning memory-mapped database library). - -######################################################################## @@ -29,7 +29,7 @@ index f254511..0000000 -# platforms; you should not need to change any of these. -# Read their descriptions in mdb.c if you do: -# --# - MDB_USE_POSIX_SEM +-# - MDB_USE_POSIX_MUTEX, MDB_USE_POSIX_SEM, MDB_USE_SYSV_SEM -# - MDB_DSYNC -# - MDB_FDATASYNC -# - MDB_FDATASYNC_WORKS @@ -45,9 +45,18 @@ index f254511..0000000 -THREADS = -pthread -OPT = -O2 -g -CFLAGS = $(THREADS) $(OPT) $(W) $(XCFLAGS) --LDLIBS = --SOLIBS = +-LDFLAGS = $(THREADS) +-LDLIBS = +-SOLIBS = -SOEXT = .so +-LDL = -ldl +- +-LIBVER = 1 +-ABIVER = 0 +-VEREXT = $(LIBVER).$(ABIVER) +-LMDB_VERSION = 1.0.0 +-SOFULL = $(SOEXT).$(VEREXT) +- -prefix = /usr/local -exec_prefix = $(prefix) -bindir = $(exec_prefix)/bin @@ -59,11 +68,20 @@ index f254511..0000000 -######################################################################## - -IHDRS = lmdb.h --ILIBS = liblmdb.a liblmdb$(SOEXT) --IPROGS = mdb_stat mdb_copy mdb_dump mdb_load --IDOCS = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1 +-ILIBS = liblmdb.a +-ILIBS2 = liblmdb$(SOFULL) +-IPROGS = mdb_stat mdb_copy mdb_dump mdb_load mdb_drop +-IDOCS = mdb_stat.1 mdb_copy.1 mdb_dump.1 mdb_load.1 mdb_drop.1 -PROGS = $(IPROGS) mtest mtest2 mtest3 mtest4 mtest5 --all: $(ILIBS) $(PROGS) +-RPROGS = mtest_remap mtest_enc mtest_enc2 +-SOVER = liblmdb$(SOEXT).$(LIBVER) +-VERSION_OPT = -Wl,-soname,$(SOVER) +-# For MacOSX: +-#VERSION_OPT = -Wl,-current_version,$(VEREXT) +- +-all: $(ILIBS) $(ILIBS2) $(PROGS) lmdb.pc +-# Requires CPPFLAGS=-DMDB_VL32 and/or -DMDB_RPAGE_CACHE +-rall: all $(RPROGS) - -install: $(ILIBS) $(IPROGS) $(IHDRS) - mkdir -p $(DESTDIR)$(bindir) @@ -72,35 +90,60 @@ index f254511..0000000 - mkdir -p $(DESTDIR)$(mandir)/man1 - for f in $(IPROGS); do cp $$f $(DESTDIR)$(bindir); done - for f in $(ILIBS); do cp $$f $(DESTDIR)$(libdir); done +- for f in $(ILIBS2); do cp $$f $(DESTDIR)$(libdir); \ +- i=`basename -s .$(ABIVER) $$f`; rm -f $(DESTDIR)$(libdir)/$$i; \ +- ln -s $$f $(DESTDIR)$(libdir)/$$i; \ +- i=`basename -s .$(LIBVER) $$i`; rm -f $(DESTDIR)$(libdir)/$$i; \ +- ln -s $$f $(DESTDIR)$(libdir)/$$i; done - for f in $(IHDRS); do cp $$f $(DESTDIR)$(includedir); done - for f in $(IDOCS); do cp $$f $(DESTDIR)$(mandir)/man1; done - -clean: -- rm -rf $(PROGS) *.[ao] *.[ls]o *~ testdb +- rm -rf $(PROGS) $(RPROGS) *.[ao] *.[ls]o *.so.* *~ testdb - -test: all - rm -rf testdb && mkdir testdb - ./mtest && ./mdb_stat testdb - --liblmdb.a: mdb.o midl.o -- $(AR) rs $@ mdb.o midl.o +-liblmdb.a: mdb.o midl.o module.o +- $(AR) rs $@ mdb.o midl.o module.o - --liblmdb$(SOEXT): mdb.lo midl.lo +-liblmdb$(SOFULL): mdb.lo midl.lo module.lo -# $(CC) $(LDFLAGS) -pthread -shared -Wl,-Bsymbolic -o $@ mdb.o midl.o $(SOLIBS) -- $(CC) $(LDFLAGS) -pthread -shared -o $@ mdb.lo midl.lo $(SOLIBS) +- $(CC) $(LDFLAGS) -shared $(VERSION_OPT) -o $@ mdb.lo midl.lo module.lo $(SOLIBS) $(LDL) +- rm -f liblmdb$(SOEXT); ln -s $@ liblmdb$(SOEXT) +- rm -f $(SOVER); ln -s $@ $(SOVER) - -mdb_stat: mdb_stat.o liblmdb.a +- $(CC) $(LDFLAGS) -o $@ $^ $(LDL) -mdb_copy: mdb_copy.o liblmdb.a +- $(CC) $(LDFLAGS) -o $@ $^ $(LDL) -mdb_dump: mdb_dump.o liblmdb.a +- $(CC) $(LDFLAGS) -o $@ $^ $(LDL) -mdb_load: mdb_load.o liblmdb.a +- $(CC) $(LDFLAGS) -o $@ $^ $(LDL) +-mdb_drop: mdb_drop.o liblmdb.a +- $(CC) $(LDFLAGS) -o $@ $^ $(LDL) -mtest: mtest.o liblmdb.a -mtest2: mtest2.o liblmdb.a -mtest3: mtest3.o liblmdb.a -mtest4: mtest4.o liblmdb.a -mtest5: mtest5.o liblmdb.a -mtest6: mtest6.o liblmdb.a +-mtest_remap: mtest_remap.o liblmdb.a +-mtest_enc: mtest_enc.o chacha8.o liblmdb.a +-mtest_enc2: mtest_enc2.o liblmdb.a crypto.lm +- $(CC) $(LDFLAGS) -pthread -o $@ $@.o liblmdb.a $(LDL) +-mtest_enc3: mtest_enc3.o liblmdb.a crypto.lm +- $(CC) $(LDFLAGS) -pthread -o $@ $@.o liblmdb.a $(LDL) +-mtest_enc4: mtest_enc4.o liblmdb.a crypto.lm +- $(CC) $(LDFLAGS) -pthread -o $@ $@.o liblmdb.a $(LDL) +- -mplay: mplay.o liblmdb.a - +-crypto.lm: crypto.c +- $(CC) -shared $(CFLAGS) -o $@ $^ -lsodium +- -mdb.o: mdb.c lmdb.h midl.h - $(CC) $(CFLAGS) $(CPPFLAGS) -c mdb.c - @@ -113,12 +156,28 @@ index f254511..0000000 -midl.lo: midl.c midl.h - $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c midl.c -o $@ - +-module.lo: module.c lmdb.h +- $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) -c module.c -o $@ +- -%: %.o - $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LDLIBS) -o $@ - -%.o: %.c lmdb.h - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - +-lmdb.pc: Makefile +- @echo "prefix=$(prefix)" > $@ +- @echo "exec_prefix=$(exec_prefix)" >>$@ +- @echo "includedir=$(includedir)" >>$@ +- @echo "libdir=$(libdir)" >>$@ +- @echo >>$@ +- @echo "Name: lmdb (OpenLDAP)" >>$@ +- @echo "Description: OpenLDAP Lightning Memory Mapped Database library" >>$@ +- @echo "URL: https://www.openldap.org" >>$@ +- @echo "Version: $(LMDB_VERSION)" >>$@ +- @echo "Cflags: $(THREADS) $(XCFLAGS)" >>$@ +- @echo "Libs: -llmdb $(LDL) $(THREADS)" >>$@ +- -COV_FLAGS=-fprofile-arcs -ftest-coverage -COV_OBJS=xmdb.o xmidl.o - @@ -146,9 +205,10 @@ index 0000000..e331a15 +AM_CPPFLAGS = -D_POSIX_PTHREAD_SEMANTICS + +lib_LTLIBRARIES = liblmdb.la -+liblmdb_la_SOURCES = mdb.c midl.c -+liblmdb_la_LDFLAGS=-no-undefined -avoid-version ++liblmdb_la_SOURCES = mdb.c midl.c module.c ++liblmdb_la_LDFLAGS=-no-undefined -avoid-version -ldl + ++AM_LDFLAGS = -ldl +bin_PROGRAMS = mdb_stat mdb_copy lmdump lmmgr +mdb_stat_LDADD = liblmdb.la +mdb_copy_LDADD = liblmdb.la diff --git a/deps-packaging/lmdb/0005-Generated-autoconf-files.patch b/deps-packaging/lmdb/0005-Generated-autoconf-files.patch index 6d924a454..e411d1d9e 100644 --- a/deps-packaging/lmdb/0005-Generated-autoconf-files.patch +++ b/deps-packaging/lmdb/0005-Generated-autoconf-files.patch @@ -180,7 +180,7 @@ index 0000000..b59f606 + "$(DESTDIR)$(includedir)" +LTLIBRARIES = $(lib_LTLIBRARIES) +liblmdb_la_LIBADD = -+am_liblmdb_la_OBJECTS = mdb.lo midl.lo ++am_liblmdb_la_OBJECTS = mdb.lo midl.lo module.lo +liblmdb_la_OBJECTS = $(am_liblmdb_la_OBJECTS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -407,8 +407,8 @@ index 0000000..b59f606 +top_srcdir = @top_srcdir@ +AM_CPPFLAGS = -D_POSIX_PTHREAD_SEMANTICS +lib_LTLIBRARIES = liblmdb.la -+liblmdb_la_SOURCES = mdb.c midl.c -+liblmdb_la_LDFLAGS = -no-undefined -avoid-version ++liblmdb_la_SOURCES = mdb.c midl.c module.c ++liblmdb_la_LDFLAGS = -no-undefined -avoid-version -ldl +mdb_stat_LDADD = liblmdb.la +mdb_copy_LDADD = liblmdb.la +lmdump_LDADD = liblmdb.la diff --git a/deps-packaging/lmdb/0009-Added-mdb_dump-and-mdb_load-to-build.patch b/deps-packaging/lmdb/0009-Added-mdb_dump-and-mdb_load-to-build.patch index 655502008..7429bd91f 100644 --- a/deps-packaging/lmdb/0009-Added-mdb_dump-and-mdb_load-to-build.patch +++ b/deps-packaging/lmdb/0009-Added-mdb_dump-and-mdb_load-to-build.patch @@ -15,9 +15,10 @@ index e331a15..736a41d 100644 --- a/libraries/liblmdb/Makefile.am +++ b/libraries/liblmdb/Makefile.am @@ -4,9 +4,11 @@ lib_LTLIBRARIES = liblmdb.la - liblmdb_la_SOURCES = mdb.c midl.c - liblmdb_la_LDFLAGS=-no-undefined -avoid-version + liblmdb_la_SOURCES = mdb.c midl.c module.c + liblmdb_la_LDFLAGS=-no-undefined -avoid-version -ldl + AM_LDFLAGS = -ldl -bin_PROGRAMS = mdb_stat mdb_copy lmdump lmmgr +bin_PROGRAMS = mdb_stat mdb_copy mdb_dump mdb_load lmdump lmmgr mdb_stat_LDADD = liblmdb.la From 3a4fa1cbdaa2129f19b2d4facfe377945563e977 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Mon, 13 Jul 2026 16:43:30 -0500 Subject: [PATCH 12/15] Restore legacy lmdb behavior of hard-coded MDB_MAXKEYSIZE=511 Adjusting core code to work with a dynamic max key size in lmdb is a larger effort. Ticket: ENT-14295 Changelog: none --- deps-packaging/lmdb/cfbuild-lmdb.spec | 4 ++-- deps-packaging/lmdb/debian/rules | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps-packaging/lmdb/cfbuild-lmdb.spec b/deps-packaging/lmdb/cfbuild-lmdb.spec index 0387ab844..233e3095a 100644 --- a/deps-packaging/lmdb/cfbuild-lmdb.spec +++ b/deps-packaging/lmdb/cfbuild-lmdb.spec @@ -19,9 +19,9 @@ Patch0: mdb.patch %if %{?with_debugsym}%{!?with_debugsym:0} %define debug_package %{nil} -%define cflags CFLAGS="-ggdb3" +%define cflags CFLAGS="-ggdb3 -DMDB_MAXKEYSIZE=511" %else -%define cflags CFLAGS="" +%define cflags CFLAGS="-DMDB_MAXKEYSIZE=511" %endif %ifarch %ix86 diff --git a/deps-packaging/lmdb/debian/rules b/deps-packaging/lmdb/debian/rules index ac416cb6f..a1749babf 100755 --- a/deps-packaging/lmdb/debian/rules +++ b/deps-packaging/lmdb/debian/rules @@ -27,9 +27,9 @@ build-stamp: # it can't without automake. Work around it by touching that file. touch libraries/liblmdb/Makefile.in ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS))) - cd libraries/liblmdb/ && sh ./configure --host=$(DEB_HOST_GNU_TYPE) --prefix=$(PREFIX) $(PTHREAD) && make + cd libraries/liblmdb/ && CFLAGS="-DMDB_MAXKEYSIZE=511" sh ./configure --host=$(DEB_HOST_GNU_TYPE) --prefix=$(PREFIX) $(PTHREAD) && make else - cd libraries/liblmdb/ && env CFLAGS="-ggdb3" sh ./configure --host=$(DEB_HOST_GNU_TYPE) --prefix=$(PREFIX) $(PTHREAD) && make + cd libraries/liblmdb/ && env CFLAGS="-ggdb3 -DMDB_MAXKEYSIZE=511" sh ./configure --host=$(DEB_HOST_GNU_TYPE) --prefix=$(PREFIX) $(PTHREAD) && make endif touch build-stamp From b72a8429d6bff9d86937b85b9ba1f1c904e17fd4 Mon Sep 17 00:00:00 2001 From: Ihor Aleksandrychiev Date: Tue, 14 Jul 2026 11:03:14 +0300 Subject: [PATCH 13/15] Build Git without an experimental Rust libgitcore Signed-off-by: Ihor Aleksandrychiev --- deps-packaging/git/cfbuild-git.spec | 7 +++++-- deps-packaging/git/debian/rules | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec index 452a011b9..f8fe68181 100644 --- a/deps-packaging/git/cfbuild-git.spec +++ b/deps-packaging/git/cfbuild-git.spec @@ -39,12 +39,15 @@ esac # On RHEL the macro PATH_MAX is in linux/limits.h, not limits.h patch -p1 < %{_topdir}/SOURCES/fixed-undeclared-identifier-PATH_MAX.patch -make CURL_LDFLAGS="-lcurl" +# git 2.55+ builds an experimental Rust libgitcore by default (needs cargo). +# We bundle git only as a dependency and don't use those features, so disable +# Rust to keep the pre-2.55 behavior and avoid requiring cargo in the build env. +make NO_RUST=YesPlease CURL_LDFLAGS="-lcurl" %install rm -rf ${RPM_BUILD_ROOT} -make install DESTDIR=${RPM_BUILD_ROOT} +make NO_RUST=YesPlease install DESTDIR=${RPM_BUILD_ROOT} # Removing unused files diff --git a/deps-packaging/git/debian/rules b/deps-packaging/git/debian/rules index a69615d76..395c1cc42 100755 --- a/deps-packaging/git/debian/rules +++ b/deps-packaging/git/debian/rules @@ -13,7 +13,10 @@ build-stamp: dh_testdir ./configure --prefix=$(PREFIX) --with-openssl=$(PREFIX) --without-iconv --with-gitconfig=$(PREFIX)/config/gitconfig --with-gitattributes=$(PREFIX)/config/gitattributes --with-zlib=$(PREFIX) --with-curl=$(PREFIX) --libexecdir=$(PREFIX)/lib - make CURL_LDFLAGS="-lcurl" + # git 2.55+ builds an experimental Rust libgitcore by default (needs cargo). + # We bundle git only as a dependency and don't use those features, so disable + # Rust to keep the pre-2.55 behavior and avoid requiring cargo in the build env. + make NO_RUST=YesPlease CURL_LDFLAGS="-lcurl" touch build-stamp @@ -23,7 +26,7 @@ install: build dh_clean -k dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + $(MAKE) NO_RUST=YesPlease install DESTDIR=$(CURDIR)/debian/tmp rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/perl* rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/python* From fbe38731639747c014bd32531becb9c71224499d Mon Sep 17 00:00:00 2001 From: Ihor Aleksandrychiev Date: Tue, 14 Jul 2026 15:25:09 +0300 Subject: [PATCH 14/15] Fix mingw build of lmdb 1.0.0 (LARGE_INTEGER usage in mdb.c) lmdb 1.0.0 added incremental dump/load and MDB_RPAGE_CACHE remapping code that treats the Windows LARGE_INTEGER union as a scalar integer, which fails to compile with x86_64-w64-mingw32-gcc. Add a patch that accesses the .QuadPart member on Windows so offset arithmetic and SetFilePointerEx() use the correct type. POSIX builds are unaffected. Co-Authored-By: Claude Opus 4.8 (1M context) --- ...s-mingw-LARGE_INTEGER-usage-in-mdb.c.patch | 93 +++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 deps-packaging/lmdb/0011-Fix-Windows-mingw-LARGE_INTEGER-usage-in-mdb.c.patch diff --git a/deps-packaging/lmdb/0011-Fix-Windows-mingw-LARGE_INTEGER-usage-in-mdb.c.patch b/deps-packaging/lmdb/0011-Fix-Windows-mingw-LARGE_INTEGER-usage-in-mdb.c.patch new file mode 100644 index 000000000..2283cc2d0 --- /dev/null +++ b/deps-packaging/lmdb/0011-Fix-Windows-mingw-LARGE_INTEGER-usage-in-mdb.c.patch @@ -0,0 +1,93 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ihor Aleksandrychiev +Date: Tue, 14 Jul 2026 15:19:32 +0300 +Subject: [PATCH] Fix Windows/mingw LARGE_INTEGER usage in mdb.c + +lmdb 1.0.0 introduced incremental dump/load and MDB_RPAGE_CACHE +remapping code that treats the Windows LARGE_INTEGER union as a +scalar integer. This does not compile with mingw (x86_64-w64-mingw32), +failing with 'invalid initializer', 'incompatible types when assigning +to type LARGE_INTEGER' and 'used union type value where scalar is +required' in mdb_env_copyfd0() and mdb_env_incr_loadfd(). + +Access the .QuadPart member on Windows so the offset arithmetic and +SetFilePointerEx() calls use the correct type. + +Upstream tracking: fixed upstream by ITS#10539 ("lmdb: windows cleanup", +mdb.RE/1.0 commit 8827c7d, 2026-07-14), which landed after the LMDB_1.0.0 +tag we build from. Drop this patch once we update to an lmdb snapshot that +includes that commit. +Ref: https://bugs.openldap.org/show_bug.cgi?id=10539 +--- + libraries/liblmdb/mdb.c | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c +index 43fe7b9..6c7078c 100644 +--- a/libraries/liblmdb/mdb.c ++++ b/libraries/liblmdb/mdb.c +@@ -11623,7 +11623,7 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd) + #endif + #if MDB_RPAGE_CACHE + #ifdef _WIN32 +- LARGE_INTEGER off = 0; ++ LARGE_INTEGER off = {0}; + #else + off_t off = 0; + #endif +@@ -11687,7 +11687,11 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd) + } + #if MDB_RPAGE_CACHE + if (MDB_REMAPPING(env->me_flags)) { ++#ifdef _WIN32 ++ off.QuadPart = wsize; ++#else + off = wsize; ++#endif + } + #endif + wsize = w3 - wsize; +@@ -11713,7 +11717,11 @@ mdb_env_copyfd0(MDB_env *env, HANDLE fd) + wsize -= len; + #if MDB_RPAGE_CACHE + if (MDB_REMAPPING(env->me_flags)) { ++#ifdef _WIN32 ++ off.QuadPart += len; ++#else + off += len; ++#endif + } + #endif + continue; +@@ -11955,7 +11963,8 @@ mdb_env_incr_loadfd(MDB_env *env, HANDLE fd) + return ENOMEM; + + #ifdef _WIN32 +- SetFilePointerEx(env->me_fd, 0, NULL, FILE_BEGIN); ++ off.QuadPart = 0; ++ SetFilePointerEx(env->me_fd, off, NULL, FILE_BEGIN); + #else + lseek(env->me_fd, 0, SEEK_SET); + #endif +@@ -12020,15 +12029,18 @@ mdb_env_incr_loadfd(MDB_env *env, HANDLE fd) + ptr += rlen; + rsize -= rlen; + } +- off = (pg-prevpg-numprev) * env->me_psize; + rsize = numpgs * env->me_psize; +- if (off) { + #ifdef _WIN32 ++ off.QuadPart = (pg-prevpg-numprev) * env->me_psize; ++ if (off.QuadPart) { + SetFilePointerEx(env->me_fd, off, NULL, FILE_CURRENT); ++ } + #else ++ off = (pg-prevpg-numprev) * env->me_psize; ++ if (off) { + lseek(env->me_fd, off, SEEK_CUR); +-#endif + } ++#endif + ptr = pbuf; + while (rsize > 0) { + w2 = (rsize > MAX_WRITE) ? MAX_WRITE: rsize; From 679f7b5ac701e9f2ffeb757fe10b7ee5bf460240 Mon Sep 17 00:00:00 2001 From: Ihor Aleksandrychiev Date: Tue, 14 Jul 2026 16:15:42 +0300 Subject: [PATCH 15/15] Fix mingw link of lmdb 1.0.0 (do not link -ldl on Windows) lmdb 1.0.0's autotools source linked liblmdb (and, transitively, the tools) against -ldl unconditionally, via both liblmdb_la_LDFLAGS and AM_LDFLAGS in Makefile.am. libdl does not exist on Windows, so the mingw cross build failed with 'cannot find -ldl' when linking mdb_stat.exe. dlopen() is only used by module.c on Unix; Windows uses LoadLibrary(). Detect dlopen via AC_CHECK_LIB in configure.ac (adding -ldl to LIBS only when it links) and drop the hard-coded -ldl from Makefile.am. On Unix -ldl still flows into every link through $(LIBS); on Windows it is simply omitted. Split into a source patch (configure.ac, Makefile.am) and the regenerated files (configure, Makefile.in), matching the 0009/0010 split. Co-Authored-By: Claude Opus 4.8 (1M context) --- ...-code-ldl-detect-libdl-via-configure.patch | 58 +++++++++++++ ...13-Updated-generated-autotools-files.patch | 81 +++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 deps-packaging/lmdb/0012-Do-not-hard-code-ldl-detect-libdl-via-configure.patch create mode 100644 deps-packaging/lmdb/0013-Updated-generated-autotools-files.patch diff --git a/deps-packaging/lmdb/0012-Do-not-hard-code-ldl-detect-libdl-via-configure.patch b/deps-packaging/lmdb/0012-Do-not-hard-code-ldl-detect-libdl-via-configure.patch new file mode 100644 index 000000000..581a5a338 --- /dev/null +++ b/deps-packaging/lmdb/0012-Do-not-hard-code-ldl-detect-libdl-via-configure.patch @@ -0,0 +1,58 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ihor Aleksandrychiev +Date: Tue, 14 Jul 2026 20:52:08 +0300 +Subject: [PATCH 12/13] Do not hard-code -ldl; detect libdl via configure + (fixes mingw build) + +lmdb 1.0.0's autotools source linked liblmdb (and, transitively, the +tools) against -ldl unconditionally, both via liblmdb_la_LDFLAGS and via +AM_LDFLAGS in Makefile.am. libdl does not exist on Windows, so the mingw +cross build failed with 'cannot find -ldl' when linking mdb_stat.exe. +dlopen() is only used by module.c on Unix; on Windows it uses +LoadLibrary() instead, so -ldl is never needed there. + +Detect dlopen in libdl via AC_CHECK_LIB in configure.ac (which adds -ldl +to LIBS only when it links) and drop the hard-coded -ldl from +Makefile.am. On Unix -ldl still flows into every link through $(LIBS); +on Windows it is simply omitted. + +This patch only touches the autotools *source* (configure.ac, +Makefile.am). The regenerated configure/Makefile.in are updated in the +following patch. +--- + libraries/liblmdb/Makefile.am | 5 +++-- + libraries/liblmdb/configure.ac | 4 ++++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/libraries/liblmdb/Makefile.am b/libraries/liblmdb/Makefile.am +index 1590869..d381334 100644 +--- a/libraries/liblmdb/Makefile.am ++++ b/libraries/liblmdb/Makefile.am +@@ -2,9 +2,10 @@ AM_CPPFLAGS = -D_POSIX_PTHREAD_SEMANTICS + + lib_LTLIBRARIES = liblmdb.la + liblmdb_la_SOURCES = mdb.c midl.c module.c +-liblmdb_la_LDFLAGS=-no-undefined -avoid-version -ldl ++# -ldl is not hard-coded here: configure.ac detects libdl (AC_CHECK_LIB) and ++# adds it to LIBS only where dlopen() lives, so the mingw build (no libdl) links. ++liblmdb_la_LDFLAGS=-no-undefined -avoid-version + +-AM_LDFLAGS = -ldl + bin_PROGRAMS = mdb_stat mdb_copy mdb_dump mdb_load lmdump lmmgr + mdb_stat_LDADD = liblmdb.la + mdb_copy_LDADD = liblmdb.la +diff --git a/libraries/liblmdb/configure.ac b/libraries/liblmdb/configure.ac +index 2a5834b..1274866 100644 +--- a/libraries/liblmdb/configure.ac ++++ b/libraries/liblmdb/configure.ac +@@ -20,6 +20,10 @@ AS_IF([test "$ac_cv_lib_pthread" = "no" && test "$ac_cv_lib_pthreadGC2" = "no"], + [ + AC_MSG_ERROR([Could not find pthreads library]) + ]) ++# module.c uses dlopen() on Unix, but Windows (mingw) has no libdl and uses ++# LoadLibrary() instead. Add -ldl to LIBS only when it actually links, so the ++# mingw cross build does not fail with 'cannot find -ldl'. ++AC_CHECK_LIB([dl], [dlopen]) + AC_CHECK_FUNCS([pthread_mutexattr_settype]) + AC_CHECK_FUNC([pthread_mutexattr_setrobust], + [ diff --git a/deps-packaging/lmdb/0013-Updated-generated-autotools-files.patch b/deps-packaging/lmdb/0013-Updated-generated-autotools-files.patch new file mode 100644 index 000000000..b9c290dc8 --- /dev/null +++ b/deps-packaging/lmdb/0013-Updated-generated-autotools-files.patch @@ -0,0 +1,81 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Ihor Aleksandrychiev +Date: Tue, 14 Jul 2026 20:53:21 +0300 +Subject: [PATCH 13/13] Updated generated autotools files + +Regenerated configure/Makefile.in for the libdl detection change in the +previous patch: AC_CHECK_LIB([dl], [dlopen]) block added to configure and +the hard-coded -ldl dropped from liblmdb_la_LDFLAGS in Makefile.in. +--- + libraries/liblmdb/Makefile.in | 2 +- + libraries/liblmdb/configure | 44 +++++++++++++++++++++++++++++++++++ + 2 files changed, 45 insertions(+), 1 deletion(-) + +diff --git a/libraries/liblmdb/Makefile.in b/libraries/liblmdb/Makefile.in +index 78a8b28..c3837e2 100644 +--- a/libraries/liblmdb/Makefile.in ++++ b/libraries/liblmdb/Makefile.in +@@ -374,7 +374,7 @@ top_srcdir = @top_srcdir@ + AM_CPPFLAGS = -D_POSIX_PTHREAD_SEMANTICS + lib_LTLIBRARIES = liblmdb.la + liblmdb_la_SOURCES = mdb.c midl.c module.c +-liblmdb_la_LDFLAGS = -no-undefined -avoid-version -ldl ++liblmdb_la_LDFLAGS = -no-undefined -avoid-version + mdb_stat_LDADD = liblmdb.la + mdb_copy_LDADD = liblmdb.la + mdb_dump_LDADD = liblmdb.la +diff --git a/libraries/liblmdb/configure b/libraries/liblmdb/configure +index 5dd41bf..c3039e0 100755 +--- a/libraries/liblmdb/configure ++++ b/libraries/liblmdb/configure +@@ -11981,6 +11981,50 @@ if test "$ac_cv_lib_pthread" = "no" && test "$ac_cv_lib_pthreadGC2" = "no"; then + + as_fn_error $? "Could not find pthreads library" "$LINENO" 5 + ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 ++$as_echo_n "checking for dlopen in -ldl... " >&6; } ++if ${ac_cv_lib_dl_dlopen+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ldl $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char dlopen (); ++int ++main () ++{ ++return dlopen (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_dl_dlopen=yes ++else ++ ac_cv_lib_dl_dlopen=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 ++$as_echo "$ac_cv_lib_dl_dlopen" >&6; } ++if test "x$ac_cv_lib_dl_dlopen" = xyes; then : ++ cat >>confdefs.h <<_ACEOF ++#define HAVE_LIBDL 1 ++_ACEOF ++ ++ LIBS="-ldl $LIBS" ++ + fi + for ac_func in pthread_mutexattr_settype + do :