Merge pull request #2340 from cfengine/update-dependencies-action-master-1783929879

Updated dependencies (master)

Author: aleksandrychev

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.

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
@@ -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
 

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*

deps-packaging/git/distfiles

@@ -1 +1 @@
-45e8107643a44e3ce46f5665beb35af3932fb0d70017687905ab5d4e3aafa8eb  git-2.54.0.tar.gz
+0842dc384a23ac33ba3e570c4f3a8ded85963ee4713b1cd21153c3db41813d1e  git-2.55.0.tar.gz

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

deps-packaging/leech2/distfiles

@@ -1 +1 @@
-b33711aeadf592c3b56dceda683191d83d23d9b0dbb2ef9b690004bcc5ed908d  leech2-5.2.0.tar.gz
+570d7c002fa05fe1dbccfdcbf8592823b303341844763d898a0d7ed3183c971f  leech2-5.3.0.tar.gz

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/

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

deps-packaging/libacl/distfiles

@@ -1 +1 @@
-5f2bdbad629707aa7d85c623f994aa8a1d2dec55a73de5205bac0bf6058a2f7c  acl-2.3.2.tar.gz
+73c853c3d44e1f693e5a96a986f1bd19d3d0dac2c7d453e796177774bc4e5f6a  acl-2.4.0.tar.gz

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