Merge pull request #1620 from cfengine/update-dependencies-action

olehermanse · web-flow · commit 0bf2fd06e1c7 · 2025-03-24T14:35:34.000+01:00
Updated dependencies
diff --git a/deps-packaging/apache/cfbuild-apache.spec b/deps-packaging/apache/cfbuild-apache.spec
@@ -1,4 +1,4 @@
-%define apache_version 2.4.62
+%define apache_version 2.4.63
 %global __os_install_post %{nil}
 
 Summary: CFEngine Build Automation -- apache
diff --git a/deps-packaging/apache/distfiles b/deps-packaging/apache/distfiles
@@ -1 +1 @@
-3e2404d762a2da03560d7ada379ba1599d32f04a0d70ad6ff86f44325f2f062d  httpd-2.4.62.tar.gz
+1fdf1667ebe313a04e9f4d35ea9f043a4e0ebb62ba5a3047abcad824224c3867  httpd-2.4.63.tar.gz
diff --git a/deps-packaging/diffutils/01-mingw-signals.patch b/deps-packaging/diffutils/01-mingw-signals.patch
diff --git a/deps-packaging/diffutils/cfbuild-diffutils-aix.spec b/deps-packaging/diffutils/cfbuild-diffutils-aix.spec
@@ -1,4 +1,4 @@
-%define diffutils_version 3.10
+%define diffutils_version 3.11
 
 Summary: CFEngine Build Automation -- diffutils
 Name: cfbuild-diffutils
diff --git a/deps-packaging/diffutils/cfbuild-diffutils.spec b/deps-packaging/diffutils/cfbuild-diffutils.spec
@@ -1,4 +1,4 @@
-%define diffutils_version 3.10
+%define diffutils_version 3.11
 
 Summary: CFEngine Build Automation -- diffutils
 Name: cfbuild-diffutils
diff --git a/deps-packaging/diffutils/distfiles b/deps-packaging/diffutils/distfiles
@@ -1 +1 @@
-90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e  diffutils-3.10.tar.xz
+a73ef05fe37dd585f7d87068e4a0639760419f810138bd75c61ddaa1f9e2131e  diffutils-3.11.tar.xz
diff --git a/deps-packaging/diffutils/mingw/debian/rules b/deps-packaging/diffutils/mingw/debian/rules
@@ -11,9 +11,6 @@ clean:
 build: build-stamp
 build-stamp:
 	dh_testdir
-	pwd
-	ls -l
-	patch -p1 < 01-mingw-signals.patch
 
 	./configure --host=\$(DEB_HOST_GNU_TYPE) --prefix=\$(PREFIX) LDFLAGS="-pthread"
 	make -C lib
diff --git a/deps-packaging/git/cfbuild-git.spec b/deps-packaging/git/cfbuild-git.spec
@@ -1,11 +1,10 @@
-%define git_version 2.47.1
+%define git_version 2.49.0
 
 Summary: CFEngine Build Automation -- git
 Name: cfbuild-git
 Version: %{version}
 Release: 1
 Source0: git-%{git_version}.tar.gz
-Patch0: clar-stop-passing-timezone-to-gettimeofday.patch
 License: MIT
 Group: Other
 Url: https://cfengine.com
@@ -19,8 +18,6 @@ AutoReqProv: no
 mkdir -p %{_builddir}
 %setup -q -n git-%{git_version}
 
-%patch0 -p0
-
 ./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 --with-python=%{prefix}/bin/python
 
 %build
diff --git a/deps-packaging/git/clar-stop-passing-timezone-to-gettimeofday.patch b/deps-packaging/git/clar-stop-passing-timezone-to-gettimeofday.patch
diff --git a/deps-packaging/git/debian/rules b/deps-packaging/git/debian/rules
@@ -12,8 +12,6 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	patch -p0 -i clar-stop-passing-timezone-to-gettimeofday.patch
-
 	./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"
 
diff --git a/deps-packaging/git/distfiles b/deps-packaging/git/distfiles
@@ -1 +1 @@
-f4c4e98667800585d218dfdf415eb72f73baa7abcac4569e2ce497970f8d6665  git-2.47.1.tar.gz
+f8047f572f665bebeb637fd5f14678f31b3ca5d2ff9a18f20bd925bd48f75d3c  git-2.49.0.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.11.1
+%define curl_version 8.12.1
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl-hub
diff --git a/deps-packaging/libcurl-hub/distfiles b/deps-packaging/libcurl-hub/distfiles
@@ -1 +1 @@
-a889ac9dbba3644271bd9d1302b5c22a088893719b72be3487bc3d401e5c4e80  curl-8.11.1.tar.gz
+7b40ea64947e0b440716a4d7f0b7aa56230a5341c8377d7b609649d4aea8dbcf  curl-8.12.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.11.1
+%define curl_version 8.12.1
 
 Summary: CFEngine Build Automation -- libcurl
 Name: cfbuild-libcurl
diff --git a/deps-packaging/libcurl/distfiles b/deps-packaging/libcurl/distfiles
@@ -1 +1 @@
-a889ac9dbba3644271bd9d1302b5c22a088893719b72be3487bc3d401e5c4e80  curl-8.11.1.tar.gz
+7b40ea64947e0b440716a4d7f0b7aa56230a5341c8377d7b609649d4aea8dbcf  curl-8.12.1.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.6.3
+%define expat_version 2.7.0
 
 Summary: CFEngine Build Automation -- libexpat
 Name: cfbuild-libexpat
diff --git a/deps-packaging/libexpat/distfiles b/deps-packaging/libexpat/distfiles
@@ -1 +1 @@
-274db254a6979bde5aad404763a704956940e465843f2a9bd9ed7af22e2c0efc  expat-2.6.3.tar.xz
+25df13dd2819e85fb27a1ce0431772b7047d72af81ae78dc26b4c6e0805f48d1  expat-2.7.0.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_6_3/
+https://github.com/libexpat/libexpat/releases/download/R_2_7_0/
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.17.tar.gz
+Source0: libiconv-1.18.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.17
+%setup -q -n libiconv-1.18
 
 ./configure --prefix=%{prefix} --disable-shared --enable-static
 
diff --git a/deps-packaging/libiconv/distfiles b/deps-packaging/libiconv/distfiles
@@ -1 +1 @@
-8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313  libiconv-1.17.tar.gz
+3b08f5f4f9b4eb82f151a7040bfd6fe6c6fb922efe4b1659c66ea933276965e8  libiconv-1.18.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.13.5
+%define libxml_version 2.13.6
 
 Summary: CFEngine Build Automation -- libxml2
 Name: cfbuild-libxml2
diff --git a/deps-packaging/libxml2/distfiles b/deps-packaging/libxml2/distfiles
@@ -1 +1 @@
-74fc163217a3964257d3be39af943e08861263c4231f9ef5b496b6f6d4c7b2b6  libxml2-2.13.5.tar.xz
+f453480307524968f7a04ec65e64f2a83a825973bcd260a2e7691be82ae70c96  libxml2-2.13.6.tar.xz
diff --git a/deps-packaging/nghttp2/cfbuild-nghttp2.spec b/deps-packaging/nghttp2/cfbuild-nghttp2.spec
@@ -1,4 +1,4 @@
-%define nghttp2_version 1.64.0
+%define nghttp2_version 1.65.0
 
 Summary: CFEngine Build Automation -- nghttp2
 Name: cfbuild-nghttp2
diff --git a/deps-packaging/nghttp2/distfiles b/deps-packaging/nghttp2/distfiles
@@ -1 +1 @@
-88bb94c9e4fd1c499967f83dece36a78122af7d5fb40da2019c56b9ccc6eb9dd  nghttp2-1.64.0.tar.xz
+f1b9df5f02e9942b31247e3d415483553bc4ac501c87aa39340b6d19c92a9331  nghttp2-1.65.0.tar.xz
diff --git a/deps-packaging/nghttp2/source b/deps-packaging/nghttp2/source
@@ -1 +1 @@
-https://github.com/nghttp2/nghttp2/releases/download/v1.64.0/
+https://github.com/nghttp2/nghttp2/releases/download/v1.65.0/
diff --git a/deps-packaging/php/0001-Disable-fancy-intrinsics-stuff.patch b/deps-packaging/php/0001-Disable-fancy-intrinsics-stuff.patch
@@ -0,0 +1,35 @@
+From 6d72dc7bc3f055b70388b4e43f771f1fff0fa5e1 Mon Sep 17 00:00:00 2001
+From: Lars Erik Wik <lars.erik.wik@northern.tech>
+Date: Wed, 12 Mar 2025 12:43:45 +0100
+Subject: [PATCH] Disable fancy intrinsics stuff
+
+It does not work on RHEL 7
+
+Signed-off-by: Lars Erik Wik <lars.erik.wik@northern.tech>
+---
+ ext/hash/php_hash_sha.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/ext/hash/php_hash_sha.h b/ext/hash/php_hash_sha.h
+index 50eef82e85..5e733f1dd4 100644
+--- a/ext/hash/php_hash_sha.h
++++ b/ext/hash/php_hash_sha.h
+@@ -55,6 +55,7 @@ PHP_HASH_API void PHP_SHA256Update(PHP_SHA256_CTX *, const unsigned char *, size
+ void SHA256_Transform_sse2(uint32_t state[PHP_STATIC_RESTRICT 8], const uint8_t block[PHP_STATIC_RESTRICT 64], uint32_t W[PHP_STATIC_RESTRICT 64], uint32_t S[PHP_STATIC_RESTRICT 8]);
+ #endif
+ 
++/*
+ #if ((defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IMMINTRIN_H)) || defined(_M_X64) || defined(_M_IX86)
+ # if defined(__SSSE3__) && defined(__SHA__)
+ #  define PHP_HASH_INTRIN_SHA_NATIVE 1
+@@ -62,6 +63,7 @@ void SHA256_Transform_sse2(uint32_t state[PHP_STATIC_RESTRICT 8], const uint8_t
+ #  define PHP_HASH_INTRIN_SHA_RESOLVER 1
+ # endif
+ #endif
++*/
+ 
+ #if defined(PHP_HASH_INTRIN_SHA_NATIVE) || defined(PHP_HASH_INTRIN_SHA_RESOLVER)
+ void SHA256_Transform_shani(uint32_t state[PHP_STATIC_RESTRICT 8], const uint8_t block[PHP_STATIC_RESTRICT 64]);
+-- 
+2.43.0
+
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.15
+%define php_version 8.4.5
 
 Summary: CFEngine Build Automation -- php
 Name: cfbuild-php
@@ -20,9 +20,9 @@ AutoReqProv: no
 mkdir -p %{_builddir}
 %setup -q -n php-%{php_version}
 
-if expr "`cat /etc/redhat-release`" : '.* [5]\.'
+if expr "`cat /etc/redhat-release`" : '.* [7]\.'
 then
-  patch -p0 < %{_topdir}/SOURCES/old-gcc-isfinite.patch
+  patch -p1 < %{_topdir}/SOURCES/0001-Disable-fancy-intrinsics-stuff.patch
 fi
 
 %if %{?rhel}%{!?rhel:0} == 8
diff --git a/deps-packaging/php/distfiles b/deps-packaging/php/distfiles
@@ -1 +1 @@
-67073c3c9c56c86461e0715d9e1806af5ddffe8e6e2eb9781f7923bbb5bd67fa  php-8.3.15.tar.gz
+f05530d350f1ffe279e097c2af7a8d78cab046ef99d91f6b3151b06f0ab05d05  php-8.4.5.tar.gz
diff --git a/deps-packaging/php/old-gcc-isfinite.patch b/deps-packaging/php/old-gcc-isfinite.patch
diff --git a/deps-packaging/pkg-build-deb b/deps-packaging/pkg-build-deb
@@ -64,10 +64,12 @@ echo "$SRCFILES" | while read srcfile opts; do
     mkdir -p "$TD"
     $UNCOMPRESS $srcfile | tar -C $TD -xf -
     mv $TD/*/* $PKGDIR
+    # Also move dot files, but don't fail if there are none
+    mv $TD/*/.* $PKGDIR || true
     rm -r "$TD"
   fi
 done
-cp -a $P/* $PKGDIR
+cp -a $P/. $PKGDIR
 
 # Prepare options
 
diff --git a/deps-packaging/postgresql/cfbuild-postgresql.spec b/deps-packaging/postgresql/cfbuild-postgresql.spec
@@ -1,4 +1,4 @@
-%define postgresql_version 17.2
+%define postgresql_version 17.4
 
 Summary: CFEngine Build Automation -- postgresql
 Name: cfbuild-postgresql
diff --git a/deps-packaging/postgresql/distfiles b/deps-packaging/postgresql/distfiles
@@ -1 +1 @@
-82ef27c0af3751695d7f64e2d963583005fbb6a0c3df63d0e4b42211d7021164  postgresql-17.2.tar.bz2
+c4605b73fea11963406699f949b966e5d173a7ee0ccaef8938dec0ca8a995fe7  postgresql-17.4.tar.bz2
diff --git a/deps-packaging/postgresql/source b/deps-packaging/postgresql/source
@@ -1 +1 @@
-https://ftp.postgresql.org/pub/source/v17.2/
+https://ftp.postgresql.org/pub/source/v17.4/
diff --git a/deps-packaging/rsync/cfbuild-rsync.spec b/deps-packaging/rsync/cfbuild-rsync.spec
@@ -1,11 +1,10 @@
-%define rsync_version 3.3.0
+%define rsync_version 3.4.1
 
 Summary: CFEngine Build Automation -- rsync
 Name: cfbuild-rsync
 Version: %{version}
 Release: 1
 Source0: rsync-%{rsync_version}.tar.gz
-Patch0: fix-buffer-overflow.patch
 License: MIT
 Group: Other
 Url: https://cfengine.com
@@ -19,8 +18,6 @@ AutoReqProv: no
 mkdir -p %{_builddir}
 %setup -q -n rsync-%{rsync_version}
 
-%patch0 -p1
-
 # liblz4, libxxhash, libzstd, and libssl give rsync extra compression
 # algorithms, extra checksum algorithms, and allow use of openssl's crypto lib
 # for (potentially) faster MD4/MD5 checksums.
diff --git a/deps-packaging/rsync/debian/rules b/deps-packaging/rsync/debian/rules
@@ -12,8 +12,6 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	patch -p1 < $(CURDIR)/fix-buffer-overflow.patch
-
 	# liblz4, libxxhash, libzstd, and libssl give rsync extra compression
 	# algorithms, extra checksum algorithms, and allow use of openssl's crypto
 	# lib for (potentially) faster MD4/MD5 checksums.
diff --git a/deps-packaging/rsync/distfiles b/deps-packaging/rsync/distfiles
@@ -1 +1 @@
-7399e9a6708c32d678a72a63219e96f23be0be2336e50fd1348498d07041df90  rsync-3.3.0.tar.gz
+2924bcb3a1ed8b551fc101f740b9f0fe0a202b115027647cf69850d65fd88c52  rsync-3.4.1.tar.gz
diff --git a/deps-packaging/rsync/fix-buffer-overflow.patch b/deps-packaging/rsync/fix-buffer-overflow.patch

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define apache_version 2.4.62`
	`1`	`+%define apache_version 2.4.63`
`2`	`2`	`%global __os_install_post %{nil}`
`3`	`3`
`4`	`4`	`Summary: CFEngine Build Automation -- apache`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-3e2404d762a2da03560d7ada379ba1599d32f04a0d70ad6ff86f44325f2f062d httpd-2.4.62.tar.gz`
	`1`	`+1fdf1667ebe313a04e9f4d35ea9f043a4e0ebb62ba5a3047abcad824224c3867 httpd-2.4.63.tar.gz`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-%define diffutils_version 3.10`
	`1`	`+%define diffutils_version 3.11`
`2`	`2`
`3`	`3`	`Summary: CFEngine Build Automation -- diffutils`
`4`	`4`	`Name: cfbuild-diffutils`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e diffutils-3.10.tar.xz`
	`1`	`+a73ef05fe37dd585f7d87068e4a0639760419f810138bd75c61ddaa1f9e2131e diffutils-3.11.tar.xz`