Merge pull request #2156 from cfengine/update-dependencies-action-master-1775460882

larsewi · web-flow · commit b57dd519eef7 · 2026-04-09T15:56:21.000+02:00
Updated dependencies (master)
diff --git a/build-scripts/bootstrap-tarballs b/build-scripts/bootstrap-tarballs
@@ -96,6 +96,9 @@ git rev-parse HEAD >"$BASEDIR"/output/core-commitID
 # Configure in order to run "make dist", deleted later.
 log_debug "Running configure on core repository..."
 run_and_print_on_failure ./configure -C
+# Normalize source timestamps to avoid errors like:
+# configure: error: newly created file is older than distributed files!
+find . -exec touch -t 202501010000.00 {} +
 log_debug "Running make dist on core repository..."
 run_and_print_on_failure make dist
 mv cfengine-3.*.tar.gz "$BASEDIR"/output/tarballs/
@@ -109,6 +112,9 @@ git rev-parse HEAD >"$BASEDIR"/output/masterfiles-commitID
 # Configure in order to run "make dist", deleted later.
 log_debug "Running configure on masterfiles repository..."
 run_and_print_on_failure ./configure
+# Normalize source timestamps to avoid errors like:
+# configure: error: newly created file is older than distributed files!
+find . -exec touch -t 202501010000.00 {} +
 log_debug "Running make dist on masterfiles repository..."
 run_and_print_on_failure make dist # source tarball
 log_debug "Running make tar-package on masterfiles repository..."
diff --git a/ci/linux-install-jdk21.sh b/ci/linux-install-jdk21.sh
@@ -9,15 +9,15 @@ install_jdk() {
   baseurl=https://download.oracle.com/java/21/archive/
   major_version=21
   baseurl="https://download.oracle.com/java/${major_version}/archive/"
-  version=21.0.9
+  version=21.0.10
   if uname -m | grep aarch64; then
     tarball=jdk-${version}_linux-aarch64_bin.tar.gz
     # checksum from https://download.oracle.com/java/${major_version}/archive/jdk-${version}_linux-aarch64_bin.tar.gz.sha256
-    sha=6e0eef0f229e121dd432358b60e2755bc0916b207bcef014839c78cf9e4367ac
+    sha=edaf800c6deb1e7daeb448ef9c6a047551fd681942cb9e37e2729ae1a3918d1d
   else
     tarball=jdk-${version}_linux-x64_bin.tar.gz
     # checksum from https://download.oracle.com/java/${major_version}/latest/jdk-${version}_linux-x64_bin.tar.gz.sha256
-    sha=0854421306468559813f1e5068e036213f9710e1e239d823c0d63552a1259e25
+    sha=773eff7191d996d3b6ce3a99c21ce69cf2d836fd07277106313732a098d4309a
   fi
   wget --quiet "$baseurl$tarball"
   echo "$sha  $tarball" | sha256sum --check -
diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec
@@ -1,4 +1,4 @@
-%define git_version 2.52.0
+%define git_version 2.53.0
 
 Summary: CFEngine Build Automation -- git
 Name: cfbuild-git
diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles
@@ -1 +1 @@
-6880cb1e737e26f81cf7db9957ab2b5bb2aa1490d87619480b860816e0c10c32  git-2.52.0.tar.gz
+429dc0f5fe5f14109930cdbbb588c5d6ef5b8528910f0d738040744bebdc6275  git-2.53.0.tar.gz
diff --git a/deps-packaging/libexpat/cfbuild-libexpat.spec b/deps-packaging/libexpat/cfbuild-libexpat.spec
@@ -1,4 +1,4 @@
-%define expat_version 2.7.3
+%define expat_version 2.7.5
 
 Summary: CFEngine Build Automation -- libexpat
 Name: cfbuild-libexpat
diff --git a/deps-packaging/libexpat/distfiles b/deps-packaging/libexpat/distfiles
@@ -1 +1 @@
-71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f  expat-2.7.3.tar.xz
+1032dfef4ff17f70464827daa28369b20f6584d108bc36f17ab1676e1edd2f91  expat-2.7.5.tar.xz
diff --git a/deps-packaging/libexpat/source b/deps-packaging/libexpat/source
@@ -1 +1 @@
-https://github.com/libexpat/libexpat/releases/download/R_2_7_3/
+https://github.com/libexpat/libexpat/releases/download/R_2_7_5/
diff --git a/deps-packaging/libiconv/cfbuild-libiconv.spec b/deps-packaging/libiconv/cfbuild-libiconv.spec
@@ -2,7 +2,7 @@ Summary: CFEngine Build Automation -- libiconv
 Name: cfbuild-libiconv
 Version: %{version}
 Release: 1
-Source0: libiconv-1.18.tar.gz
+Source0: libiconv-1.19.tar.gz
 License: MIT
 Group: Other
 Url: https://cfengine.com
@@ -14,7 +14,7 @@ AutoReqProv: no
 
 %prep
 mkdir -p %{_builddir}
-%setup -q -n libiconv-1.18
+%setup -q -n libiconv-1.19
 
 ./configure --prefix=%{prefix} --disable-shared --enable-static
 
diff --git a/deps-packaging/libiconv/distfiles b/deps-packaging/libiconv/distfiles
@@ -1 +1 @@
-3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8  libiconv-1.18.tar.gz
+88dd96a8c0464eca144fc791ae60cd31cd8ee78321e67397e25fc095c4a19aa6  libiconv-1.19.tar.gz
diff --git a/deps-packaging/libxml2/cfbuild-libxml2.spec b/deps-packaging/libxml2/cfbuild-libxml2.spec
@@ -1,4 +1,4 @@
-%define libxml_version 2.15.1
+%define libxml_version 2.15.2
 
 Summary: CFEngine Build Automation -- libxml2
 Name: cfbuild-libxml2
diff --git a/deps-packaging/libxml2/distfiles b/deps-packaging/libxml2/distfiles
@@ -1 +1 @@
-c008bac08fd5c7b4a87f7b8a71f283fa581d80d80ff8d2efd3b26224c39bc54c  libxml2-2.15.1.tar.xz
+c8b9bc81f8b590c33af8cc6c336dbff2f53409973588a351c95f1c621b13d09d  libxml2-2.15.2.tar.xz
diff --git a/deps-packaging/lmdb/cfbuild-lmdb.spec b/deps-packaging/lmdb/cfbuild-lmdb.spec
@@ -1,4 +1,4 @@
-%define lmdb_version 0.9.33
+%define lmdb_version 0.9.35
 
 Summary: CFEngine Build Automation -- lmdb
 Name: cfbuild-lmdb
diff --git a/deps-packaging/lmdb/distfiles b/deps-packaging/lmdb/distfiles
@@ -1 +1 @@
-476801f5239c88c7de61c3390502a5d13965ecedef80105b5fb0fcb8373d1e53  openldap-LMDB_0.9.33.tar.gz
+0d090c6a7c85a4f31a2ab0d734554c21097f24752393a190b0e51996b08f48c4  openldap-LMDB_0.9.35.tar.gz
diff --git a/deps-packaging/lmdb/source b/deps-packaging/lmdb/source
@@ -1 +1 @@
-https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.33/
+https://git.openldap.org/openldap/openldap/-/archive/LMDB_0.9.35/
diff --git a/deps-packaging/nghttp2/cfbuild-nghttp2.spec b/deps-packaging/nghttp2/cfbuild-nghttp2.spec
@@ -1,4 +1,4 @@
-%define nghttp2_version 1.68.0
+%define nghttp2_version 1.68.1
 
 Summary: CFEngine Build Automation -- nghttp2
 Name: cfbuild-nghttp2
diff --git a/deps-packaging/nghttp2/distfiles b/deps-packaging/nghttp2/distfiles
@@ -1 +1 @@
-5511d3128850e01b5b26ec92bf39df15381c767a63441438b25ad6235def902c  nghttp2-1.68.0.tar.xz
+6abd7ab0a7f1580d5914457cb3c85eb80455657ee5119206edbd7f848c14f0b2  nghttp2-1.68.1.tar.xz
diff --git a/deps-packaging/nghttp2/source b/deps-packaging/nghttp2/source
@@ -1 +1 @@
-https://github.com/nghttp2/nghttp2/releases/download/v1.68.0/
+https://github.com/nghttp2/nghttp2/releases/download/v1.68.1/
diff --git 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.10
+%define openldap_version 2.6.13
 
 Summary: CFEngine Build Automation -- openldap
 Name: cfbuild-openldap
diff --git a/deps-packaging/openldap/cfbuild-openldap.spec b/deps-packaging/openldap/cfbuild-openldap.spec
@@ -1,4 +1,4 @@
-%define openldap_version 2.6.10
+%define openldap_version 2.6.13
 
 Summary: CFEngine Build Automation -- openldap
 Name: cfbuild-openldap
diff --git a/deps-packaging/openldap/distfiles b/deps-packaging/openldap/distfiles
@@ -1 +1 @@
-c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516  openldap-2.6.10.tgz
+d693b49517a42efb85a1a364a310aed16a53d428d1b46c0d31ef3fba78fcb656  openldap-2.6.13.tgz
diff --git a/deps-packaging/openssl/0008-Define-_XOPEN_SOURCE_EXTENDED-as-1.patch b/deps-packaging/openssl/0008-Define-_XOPEN_SOURCE_EXTENDED-as-1.patch
@@ -25,9 +25,9 @@ index 97454a4b81..299323390c 100644
 @@ -11,7 +11,7 @@
  
  #ifdef OPENSSL_SYS_VMS
-   /* So fd_set and friends get properly defined on OpenVMS */
--# define _XOPEN_SOURCE_EXTENDED
-+# define _XOPEN_SOURCE_EXTENDED 1
+ /* So fd_set and friends get properly defined on OpenVMS */
+-#define _XOPEN_SOURCE_EXTENDED
++#define _XOPEN_SOURCE_EXTENDED 1
  #endif
  
  #include <stdio.h>
diff --git a/deps-packaging/openssl/cfbuild-openssl.spec b/deps-packaging/openssl/cfbuild-openssl.spec
@@ -1,4 +1,4 @@
-%define openssl_version 3.6.0
+%define openssl_version 3.6.1
 
 Summary: CFEngine Build Automation -- openssl
 Name: cfbuild-openssl
diff --git a/deps-packaging/openssl/distfiles b/deps-packaging/openssl/distfiles
@@ -1 +1 @@
-b6a5f44b7eb69e3fa35dbf15524405b44837a481d43d81daddde3ff21fcbb8e9  openssl-3.6.0.tar.gz
+b1bfedcd5b289ff22aee87c9d600f515767ebf45f77168cb6d64f231f518a82e  openssl-3.6.1.tar.gz
diff --git a/deps-packaging/openssl/source b/deps-packaging/openssl/source
@@ -1 +1 @@
-https://github.com/openssl/openssl/releases/download/openssl-3.6.0/
+https://github.com/openssl/openssl/releases/download/openssl-3.6.1/
diff --git a/deps-packaging/php/cfbuild-php.spec b/deps-packaging/php/cfbuild-php.spec
@@ -1,4 +1,4 @@
-%define php_version 8.5.2
+%define php_version 8.5.4
 
 Summary: CFEngine Build Automation -- php
 Name: cfbuild-php
diff --git a/deps-packaging/php/distfiles b/deps-packaging/php/distfiles
@@ -1 +1 @@
-379ccccefcc85f28286444cf01bc0db017c79d513417267f5bb1d804b8428c22  php-8.5.2.tar.gz
+4fef7f44eff3c18e329504cb0d3eb30b41cf54e2db05cb4ebe8b78fc37d38ce1  php-8.5.4.tar.gz
diff --git a/deps-packaging/postgresql/cfbuild-postgresql.spec b/deps-packaging/postgresql/cfbuild-postgresql.spec
@@ -1,4 +1,4 @@
-%define postgresql_version 18.1
+%define postgresql_version 18.3
 
 Summary: CFEngine Build Automation -- postgresql
 Name: cfbuild-postgresql
diff --git a/deps-packaging/postgresql/distfiles b/deps-packaging/postgresql/distfiles
@@ -1 +1 @@
-ff86675c336c46e98ac991ebb306d1b67621ece1d06787beaade312c2c915d54  postgresql-18.1.tar.bz2
+d95663fbbf3a80f81a9d98d895266bdcb74ba274bcc04ef6d76630a72dee016f  postgresql-18.3.tar.bz2
diff --git a/deps-packaging/postgresql/source b/deps-packaging/postgresql/source
@@ -1 +1 @@
-https://ftp.postgresql.org/pub/source/v18.1/
+https://ftp.postgresql.org/pub/source/v18.3/
diff --git a/deps-packaging/zlib/AIX_LDSHARED.patch b/deps-packaging/zlib/AIX_LDSHARED.patch
diff --git a/deps-packaging/zlib/cfbuild-zlib.spec b/deps-packaging/zlib/cfbuild-zlib.spec
@@ -2,8 +2,7 @@ Summary: CFEngine Build Automation -- zlib
 Name: cfbuild-zlib
 Version: %{version}
 Release: 1
-Source0: zlib-1.3.1.tar.gz
-Patch0: AIX_LDSHARED.patch
+Source0: zlib-1.3.2.tar.gz
 License: MIT
 Group: Other
 Url: https://cfengine.com
@@ -15,9 +14,7 @@ AutoReqProv: no
 
 %prep
 mkdir -p %{_builddir}
-%setup -q -n zlib-1.3.1
-
-%patch0 -p1
+%setup -q -n zlib-1.3.2
 
 %build
 
@@ -65,7 +62,7 @@ CFEngine Build Automation -- zlib -- development files
 %dir %{prefix}/lib
 %{prefix}/lib/libz.so
 %{prefix}/lib/libz.so.1
-%{prefix}/lib/libz.so.1.3.1
+%{prefix}/lib/libz.so.1.3.2
 
 %files devel
 %defattr(-,root,root)
diff --git a/deps-packaging/zlib/distfiles b/deps-packaging/zlib/distfiles
@@ -1 +1 @@
-9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23  zlib-1.3.1.tar.gz
+bb329a0a2cd0274d05519d61c667c062e06990d72e125ee2dfa8de64f0119d16  zlib-1.3.2.tar.gz

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define git_version 2.52.0`
	`1`	`+%define git_version 2.53.0`
`2`	`2`
`3`	`3`	`Summary: CFEngine Build Automation -- git`
`4`	`4`	`Name: cfbuild-git`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-6880cb1e737e26f81cf7db9957ab2b5bb2aa1490d87619480b860816e0c10c32 git-2.52.0.tar.gz`
	`1`	`+429dc0f5fe5f14109930cdbbb588c5d6ef5b8528910f0d738040744bebdc6275 git-2.53.0.tar.gz`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define expat_version 2.7.3`
	`1`	`+%define expat_version 2.7.5`
`2`	`2`
`3`	`3`	`Summary: CFEngine Build Automation -- libexpat`
`4`	`4`	`Name: cfbuild-libexpat`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-71df8f40706a7bb0a80a5367079ea75d91da4f8c65c58ec59bcdfbf7decdab9f expat-2.7.3.tar.xz`
	`1`	`+1032dfef4ff17f70464827daa28369b20f6584d108bc36f17ab1676e1edd2f91 expat-2.7.5.tar.xz`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-https://github.com/libexpat/libexpat/releases/download/R_2_7_3/`
	`1`	`+https://github.com/libexpat/libexpat/releases/download/R_2_7_5/`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8 libiconv-1.18.tar.gz`
	`1`	`+88dd96a8c0464eca144fc791ae60cd31cd8ee78321e67397e25fc095c4a19aa6 libiconv-1.19.tar.gz`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define libxml_version 2.15.1`
	`1`	`+%define libxml_version 2.15.2`
`2`	`2`
`3`	`3`	`Summary: CFEngine Build Automation -- libxml2`
`4`	`4`	`Name: cfbuild-libxml2`