diff --git a/deps-packaging/apr-util/cfbuild-apr-util.spec b/deps-packaging/apr-util/cfbuild-apr-util.spec
index 2caa1c954..6fa161f22 100644
--- a/deps-packaging/apr-util/cfbuild-apr-util.spec
+++ b/deps-packaging/apr-util/cfbuild-apr-util.spec
@@ -1,4 +1,4 @@
-%define apr_version 1.6.3
+%define apr_version 1.6.4
 
 Summary: CFEngine Build Automation -- apr-util
 Name: cfbuild-apr-util
diff --git a/deps-packaging/apr-util/distfiles b/deps-packaging/apr-util/distfiles
index 8ab0de2e6..1779c18a7 100644
--- a/deps-packaging/apr-util/distfiles
+++ b/deps-packaging/apr-util/distfiles
@@ -1 +1 @@
-2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983  apr-util-1.6.3.tar.gz
+9160444764bd1d804d7e6ee50783ec9442a88b5a8984e62470832b06983eeaa4  apr-util-1.6.4.tar.gz
diff --git a/deps-packaging/lmdb/cfbuild-lmdb.spec b/deps-packaging/lmdb/cfbuild-lmdb.spec
index 1fe9dc9e6..70115ea0b 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 0.9.36
 
 Summary: CFEngine Build Automation -- lmdb
 Name: cfbuild-lmdb
diff --git a/deps-packaging/lmdb/distfiles b/deps-packaging/lmdb/distfiles
index 0ced69b1f..1a0bf372c 100644
--- a/deps-packaging/lmdb/distfiles
+++ b/deps-packaging/lmdb/distfiles
@@ -1 +1 @@
-0d090c6a7c85a4f31a2ab0d734554c21097f24752393a190b0e51996b08f48c4  openldap-LMDB_0.9.35.tar.gz
+90a595ea500074af61b213464452d8d212405261094667a686357467ae7b57b9  openldap-LMDB_0.9.36.tar.gz
diff --git a/deps-packaging/lmdb/source b/deps-packaging/lmdb/source
index 94726e992..2b1a0a9da 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_0.9.36/
diff --git a/deps-packaging/openldap/cfbuild-openldap-aix.spec b/deps-packaging/openldap/cfbuild-openldap-aix.spec
index cbc24973b..4e09cfdf7 100644
--- a/deps-packaging/openldap/cfbuild-openldap-aix.spec
+++ b/deps-packaging/openldap/cfbuild-openldap-aix.spec
@@ -1,4 +1,4 @@
-%define openldap_version 2.6.13
+%define openldap_version 2.7.0
 
 Summary: CFEngine Build Automation -- openldap
 Name: cfbuild-openldap
diff --git a/deps-packaging/openldap/cfbuild-openldap.spec b/deps-packaging/openldap/cfbuild-openldap.spec
index bc8fc15ac..a32661cda 100644
--- a/deps-packaging/openldap/cfbuild-openldap.spec
+++ b/deps-packaging/openldap/cfbuild-openldap.spec
@@ -1,4 +1,4 @@
-%define openldap_version 2.6.13
+%define openldap_version 2.7.0
 
 Summary: CFEngine Build Automation -- openldap
 Name: cfbuild-openldap
@@ -6,6 +6,7 @@ Version: %{version}
 Release: 1
 Source0: openldap-%{openldap_version}.tgz
 Patch0:  no_Sockaddr_redefine.patch
+Patch1: gcc-8.5.patch
 License: MIT
 Group: Other
 Url: https://cfengine.com
@@ -19,7 +20,8 @@ AutoReqProv: no
 mkdir -p %{_builddir}
 %setup -q -n openldap-%{openldap_version}
 
-%patch0 -p0
+%patch -P0 -p0
+%patch -P1 -p1
 
 CPPFLAGS=-I%{buildprefix}/include
 
diff --git a/deps-packaging/openldap/debian/rules b/deps-packaging/openldap/debian/rules
index 7117f9794..f33c3cd44 100755
--- a/deps-packaging/openldap/debian/rules
+++ b/deps-packaging/openldap/debian/rules
@@ -26,6 +26,9 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
+	# for older compilers we need to patch some code
+	patch -p1 < gcc-8.5.patch
+
 	./configure --prefix=$(PREFIX) \
 	    --enable-shared \
 	    --disable-slapd \
diff --git a/deps-packaging/openldap/distfiles b/deps-packaging/openldap/distfiles
index f7da517dc..73edfb2e1 100644
--- a/deps-packaging/openldap/distfiles
+++ b/deps-packaging/openldap/distfiles
@@ -1 +1 @@
-d693b49517a42efb85a1a364a310aed16a53d428d1b46c0d31ef3fba78fcb656  openldap-2.6.13.tgz
+9e86f37da375aa948a1b478dd76fe87b02090e47c21facae19223588e3407922  openldap-2.7.0.tgz
diff --git a/deps-packaging/openldap/gcc-8.5.patch b/deps-packaging/openldap/gcc-8.5.patch
new file mode 100644
index 000000000..813de5f15
--- /dev/null
+++ b/deps-packaging/openldap/gcc-8.5.patch
@@ -0,0 +1,29 @@
+--- openldap-2.6.13/libraries/libldap/tls_o.c   2026-05-19 21:29:39.874030878 +0000
++++ patched-openldap/libraries/libldap/tls_o.c  2026-05-19 21:24:52.955329138 +0000
+@@ -543,7 +543,7 @@
+ 
+				while ((info = OSSL_STORE_load( sctx ))) {
+					switch (OSSL_STORE_INFO_get_type( info )) {
+-					case OSSL_STORE_INFO_CERT:
++					case OSSL_STORE_INFO_CERT:;
+						X509 *cert = OSSL_STORE_INFO_get0_CERT( info );
+						X509_STORE *store = SSL_CTX_get_cert_store( ctx );
+						if ( !X509_STORE_add_cert( store, cert ) ) {
+@@ -753,7 +753,7 @@
+						return -1;
+					}
+					break;
+-				case OSSL_STORE_INFO_CERT:
++				case OSSL_STORE_INFO_CERT:;
+					X509 *cert = OSSL_STORE_INFO_get0_CERT(info);
+					int is_ca = X509_check_ca( cert );
+					if ( !is_ca && !SSL_CTX_use_certificate( ctx, cert )) {
+@@ -773,7 +773,7 @@
+						return -1;
+					}
+					break;
+-				case OSSL_STORE_INFO_CRL:
++				case OSSL_STORE_INFO_CRL:;
+					X509_STORE *x509_s = SSL_CTX_get_cert_store( ctx );
+					if ( !X509_STORE_add_crl( x509_s,
+							OSSL_STORE_INFO_get0_CRL(info) )) {
diff --git a/deps-packaging/openldap/mingw_build_fixes.patch b/deps-packaging/openldap/mingw_build_fixes.patch
index a13ada0c3..bb29df316 100644
--- a/deps-packaging/openldap/mingw_build_fixes.patch
+++ b/deps-packaging/openldap/mingw_build_fixes.patch
@@ -9,13 +9,3 @@
  	struct timespec {
  		time_t	tv_sec;
  		int 	tv_nsec;
---- libraries/liblber/lber.map.orig	2021-11-09 15:43:46.876482616 +0100
-+++ libraries/liblber/lber.map	2021-11-09 15:45:03.819040549 +0100
-@@ -102,6 +102,7 @@
-     ber_pvt_sb_do_write;
-     ber_pvt_sb_grow_buffer;
-     ber_pvt_socket_set_nonblock;
-+    ber_pvt_wsa_err2string;
-     ber_read;
-     ber_realloc;
-     ber_remaining;