Merge pull request #1741 from cfengine/update-dependencies-action-3.21.x-1749452737

larsewi · web-flow · commit c93a14fc1b06 · 2025-06-12T08:36:07.000Z
Updated dependencies (3.21.x)
diff --git a/deps-packaging/apr/cfbuild-apr.spec b/deps-packaging/apr/cfbuild-apr.spec
@@ -1,4 +1,4 @@
-%define apr_version 1.7.5
+%define apr_version 1.7.6
 
 Summary: CFEngine Build Automation -- apr
 Name: cfbuild-apr
diff --git a/deps-packaging/apr/distfiles b/deps-packaging/apr/distfiles
@@ -1 +1 @@
-3375fa365d67bcf945e52b52cba07abea57ef530f40b281ffbe977a9251361db  apr-1.7.5.tar.gz
+6a10e7f7430510600af25fabf466e1df61aaae910bf1dc5d10c44a4433ccc81d  apr-1.7.6.tar.gz
diff --git 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.13.0
+%define curl_version 8.14.1
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl-hub
@@ -32,20 +32,13 @@ mkdir -p %{_builddir}
     --disable-ldap \
     --disable-ldaps \
     --disable-ntlm \
-    --without-axtls \
-    --without-cyassl \
-    --without-egd-socket \
     --without-gnutls \
     --without-gssapi \
-    --without-libidn \
     --without-libpsl \
     --without-librtmp \
     --without-libssh2 \
     --without-nghttp2 \
-    --without-nss \
-    --without-polarssl \
     --without-winidn \
-    --without-winssl \
     --prefix=%{prefix} \
     CPPFLAGS="-I%{prefix}/include" \
     LD_LIBRARY_PATH="%{prefix}/lib" \
@@ -83,6 +76,7 @@ CFEngine Build Automation -- libcurl
 
 %dir %prefix/bin
 %prefix/bin/curl
+%prefix/bin/wcurl
 
 %dir %prefix/lib
 %prefix/lib/*.so*
@@ -100,9 +94,3 @@ CFEngine Build Automation -- libcurl
 %prefix/lib/pkgconfig
 
 %changelog
-
-
-
-
-
-
diff --git a/deps-packaging/libcurl-hub/distfiles b/deps-packaging/libcurl-hub/distfiles
@@ -1 +1 @@
-c261a4db579b289a7501565497658bbd52d3138fdbaccf1490fa918129ab45bc  curl-8.13.0.tar.gz
+6766ada7101d292b42b8b15681120acd68effa4a9660935853cf6d61f0d984d4  curl-8.14.1.tar.gz
diff --git a/deps-packaging/libcurl/cfbuild-libcurl.spec b/deps-packaging/libcurl/cfbuild-libcurl.spec
@@ -1,4 +1,4 @@
-%define curl_version 8.13.0
+%define curl_version 8.14.1
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl
@@ -32,20 +32,13 @@ mkdir -p %{_builddir}
     --disable-ldap \
     --disable-ldaps \
     --disable-ntlm \
-    --without-axtls \
-    --without-cyassl \
-    --without-egd-socket \
     --without-gnutls \
     --without-gssapi \
-    --without-libidn \
     --without-libpsl \
     --without-librtmp \
     --without-libssh2 \
     --without-nghttp2 \
-    --without-nss \
-    --without-polarssl \
     --without-winidn \
-    --without-winssl \
     --prefix=%{prefix} \
     CPPFLAGS="-I%{prefix}/include -DAF_LOCAL=AF_UNIX" \
     LD_LIBRARY_PATH="%{prefix}/lib" \
@@ -83,6 +76,7 @@ CFEngine Build Automation -- libcurl
 
 %dir %prefix/bin
 %prefix/bin/curl
+%prefix/bin/wcurl
 
 %dir %prefix/lib
 %prefix/lib/*.so*
@@ -100,9 +94,3 @@ CFEngine Build Automation -- libcurl
 %prefix/lib/pkgconfig
 
 %changelog
-
-
-
-
-
-
diff --git a/deps-packaging/libcurl/distfiles b/deps-packaging/libcurl/distfiles
@@ -1 +1 @@
-c261a4db579b289a7501565497658bbd52d3138fdbaccf1490fa918129ab45bc  curl-8.13.0.tar.gz
+6766ada7101d292b42b8b15681120acd68effa4a9660935853cf6d61f0d984d4  curl-8.14.1.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.14.2
+%define libxml_version 2.14.3
 
 Summary: CFEngine Build Automation -- libxml2
 Name: cfbuild-libxml2
diff --git a/deps-packaging/libxml2/distfiles b/deps-packaging/libxml2/distfiles
@@ -1 +1 @@
-353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6  libxml2-2.14.2.tar.xz
+6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833  libxml2-2.14.3.tar.xz
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.9
+%define openldap_version 2.6.10
 
 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.9
+%define openldap_version 2.6.10
 
 Summary: CFEngine Build Automation -- openldap
 Name: cfbuild-openldap
diff --git a/deps-packaging/openldap/distfiles b/deps-packaging/openldap/distfiles
@@ -1 +1 @@
-2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff  openldap-2.6.9.tgz
+c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516  openldap-2.6.10.tgz
diff --git a/deps-packaging/php/cfbuild-php.spec b/deps-packaging/php/cfbuild-php.spec
@@ -1,4 +1,4 @@
-%define php_version 8.3.21
+%define php_version 8.3.22
 
 Summary: CFEngine Build Automation -- php
 Name: cfbuild-php
diff --git a/deps-packaging/php/distfiles b/deps-packaging/php/distfiles
@@ -1 +1 @@
-e7f1748c1fa3d2bf8ef2e00508bd62325ba68c3b830b253bc561225a9ba5457d  php-8.3.21.tar.gz
+8fc57c9df455354679e4a127defb60e1af8718ece4cd4827e500f5c7f2449103  php-8.3.22.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 15.12
+%define postgresql_version 15.13
 
 Summary: CFEngine Build Automation -- postgresql
 Name: cfbuild-postgresql
diff --git a/deps-packaging/postgresql/distfiles b/deps-packaging/postgresql/distfiles
@@ -1 +1 @@
-3bc8462a38ca0857270cc88b949a3f6659f0d5c44c029c482355835b61a0f6f7  postgresql-15.12.tar.bz2
+4f62e133d22ea08a0401b0840920e26698644d01a80c34341fb732dd0a90ca5d  postgresql-15.13.tar.bz2
diff --git a/deps-packaging/postgresql/source b/deps-packaging/postgresql/source
@@ -1 +1 @@
-https://ftp.postgresql.org/pub/source/v15.12/
+https://ftp.postgresql.org/pub/source/v15.13/
diff --git a/packaging/cfengine-community/cfengine-community.spec.in b/packaging/cfengine-community/cfengine-community.spec.in
@@ -60,6 +60,7 @@ rm -f $RPM_BUILD_ROOT%{prefix}/lib/libpromises.la
 rm -f $RPM_BUILD_ROOT%{prefix}/lib/libpromises.so
 rm -f $RPM_BUILD_ROOT%{prefix}/bin/openssl
 rm -f $RPM_BUILD_ROOT%{prefix}/bin/curl
+rm -f $RPM_BUILD_ROOT%{prefix}/bin/wcurl
 rm -rf $RPM_BUILD_ROOT%{prefix}/ssl
 
 # For el9+ and suse-15+ we started seeing issues from other packages not expecting init scripts
diff --git a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in
@@ -250,6 +250,7 @@ exit 0
 %prefix/bin/git-upload-archive
 %prefix/bin/git-upload-pack
 %prefix/bin/curl
+%prefix/bin/wcurl
 #postgresql binaries
 %{prefix}/bin/clusterdb
 %{prefix}/bin/createdb
diff --git a/packaging/cfengine-nova/cfengine-nova.spec.in b/packaging/cfengine-nova/cfengine-nova.spec.in
@@ -70,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT%{prefix}/share/CoreBase
 rm -f $RPM_BUILD_ROOT%{prefix}/bin/getfacl
 rm -f $RPM_BUILD_ROOT%{prefix}/bin/openssl
 rm -f $RPM_BUILD_ROOT%{prefix}/bin/curl
+rm -f $RPM_BUILD_ROOT%{prefix}/bin/wcurl
 rm -rf $RPM_BUILD_ROOT%{prefix}/ssl
 
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define apr_version 1.7.5`
	`1`	`+%define apr_version 1.7.6`
`2`	`2`
`3`	`3`	`Summary: CFEngine Build Automation -- apr`
`4`	`4`	`Name: cfbuild-apr`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3375fa365d67bcf945e52b52cba07abea57ef530f40b281ffbe977a9251361db apr-1.7.5.tar.gz`
	`1`	`+6a10e7f7430510600af25fabf466e1df61aaae910bf1dc5d10c44a4433ccc81d apr-1.7.6.tar.gz`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-c261a4db579b289a7501565497658bbd52d3138fdbaccf1490fa918129ab45bc curl-8.13.0.tar.gz`
	`1`	`+6766ada7101d292b42b8b15681120acd68effa4a9660935853cf6d61f0d984d4 curl-8.14.1.tar.gz`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define libxml_version 2.14.2`
	`1`	`+%define libxml_version 2.14.3`
`2`	`2`
`3`	`3`	`Summary: CFEngine Build Automation -- libxml2`
`4`	`4`	`Name: cfbuild-libxml2`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-353f3c83535d4224a4e5f1e88c90b5d4563ea8fec11f6407df640fd28fc8b8c6 libxml2-2.14.2.tar.xz`
	`1`	`+6de55cacc8c2bc758f2ef6f93c313cb30e4dd5d84ac5d3c7ccbd9344d8cc6833 libxml2-2.14.3.tar.xz`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define openldap_version 2.6.9`
	`1`	`+%define openldap_version 2.6.10`
`2`	`2`
`3`	`3`	`Summary: CFEngine Build Automation -- openldap`
`4`	`4`	`Name: cfbuild-openldap`