Merge pull request zcash#6909 from str4d/pre-release-maintenance-5.10.0

Pre-release maintenance for 5.10.0

Author: str4d

Cargo.lock

@@ -19,7 +19,7 @@ repository = "https://github.com/zcash/zcash"
 readme = "README.md"
 license = "MIT OR Apache-2.0"
 edition = "2018"
-rust-version = "1.78"
+rust-version = "1.79"
 
 [package.metadata.vet]
 store = { path = "./qa/supply-chain" }
@@ -74,7 +74,7 @@ wagyu-zcash-parameters = "0.2"
 
 # Rust/C++ interop
 # The version needs to match depends/packages/native_cxxbridge.mk
-cxx = { version = "=1.0.122", features = ["c++17"] }
+cxx = { version = "=1.0.124", features = ["c++17"] }
 
 # Rust threading
 rayon = "1.5"

Cargo.toml

@@ -1,6 +1,6 @@
 package=libcxx
 $(package)_version=$(if $(native_clang_version_$(host_arch)_$(host_os)),$(native_clang_version_$(host_arch)_$(host_os)),$(if $(native_clang_version_$(host_os)),$(native_clang_version_$(host_os)),$(native_clang_default_version)))
-$(package)_msys2_version=18.1.4-1
+$(package)_msys2_version=18.1.8-1
 
 ifneq ($(canonical_host),$(build))
 ifneq ($(host_os),mingw32)
@@ -9,10 +9,10 @@ ifneq ($(host_os),mingw32)
 $(package)_download_path=$(native_clang_download_path)
 $(package)_download_file_aarch64_linux=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
 $(package)_file_name_aarch64_linux=clang-llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
-$(package)_sha256_hash_aarch64_linux=8c2f4d1606d24dc197a590acce39453abe7a302b9b92e762108f9b5a9701b1df
+$(package)_sha256_hash_aarch64_linux=dcaa1bebbfbb86953fdfbdc7f938800229f75ad26c5c9375ef242edad737d999
 $(package)_download_file_linux=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-22.04.tar.xz
 $(package)_file_name_linux=clang-llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-22.04.tar.xz
-$(package)_sha256_hash_linux=1607375b4aa2aec490b6db51846a04b265675a87e925bcf5825966401ff9b0b1
+$(package)_sha256_hash_linux=54ec30358afcc9fb8aa74307db3046f5187f9fb89fb37064cdde906e062ebf36
 
 # Starting from LLVM 14.0.0, some Clang binary tarballs store libc++ in a
 # target-specific subdirectory.
@@ -30,7 +30,7 @@ else
 $(package)_download_path=https://repo.msys2.org/mingw/x86_64
 $(package)_download_file=mingw-w64-x86_64-libc++-$($(package)_msys2_version)-any.pkg.tar.zst
 $(package)_file_name=mingw-w64-x86_64-libcxx-$($(package)_msys2_version)-any.pkg.tar.zst
-$(package)_sha256_hash=45f8dcac0ed5ff68d202c9321375dbefb0a7e7aa1d1e1ed7299842759f9bc88b
+$(package)_sha256_hash=4673dba0e8c4bac3c4d645a4a64b947855228b21c82f6366b201e7636a78bc1a
 
 define $(package)_stage_cmds
   mkdir -p $($(package)_staging_prefix_dir)/lib && \

depends/packages/libcxx.mk

@@ -1,16 +1,15 @@
 package=libsodium
-$(package)_version=1.0.19
+$(package)_version=1.0.20
 $(package)_download_path=https://download.libsodium.org/libsodium/releases/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=018d79fe0a045cca07331d37bd0cb57b2e838c51bc48fd837a1472e50068bbea
+$(package)_sha256_hash=ebb65ef6ca439333c2bb41a0c1990587288da07f6c7fd07cb3a18cc18d30ce19
 $(package)_dependencies=
-$(package)_patches=1.0.15-pubkey-validation.diff 1.0.15-signature-validation.diff 1321-aarch64-fix-compiler-attributes.patch
+$(package)_patches=1.0.15-pubkey-validation.diff 1.0.15-signature-validation.diff
 $(package)_config_opts=
 
 define $(package)_preprocess_cmds
   patch -p1 < $($(package)_patch_dir)/1.0.15-pubkey-validation.diff && \
   patch -p1 < $($(package)_patch_dir)/1.0.15-signature-validation.diff && \
-  patch -p1 < $($(package)_patch_dir)/1321-aarch64-fix-compiler-attributes.patch && \
   cd $($(package)_build_subdir); DO_NOT_UPDATE_CONFIG_SCRIPTS=1 ./autogen.sh
 endef
 

depends/packages/libsodium.mk

@@ -1,15 +1,20 @@
 package=native_ccache
-$(package)_version=4.9.1
+$(package)_version=4.10.1
 $(package)_download_path=https://github.com/ccache/ccache/releases/download/v$($(package)_version)
 $(package)_file_name=ccache-$($(package)_version).tar.gz
-$(package)_sha256_hash=12834ecaaaf2db069dda1d1d991f91c19e3274cc04a471af5b64195def17e90f
+$(package)_sha256_hash=8f8ad60d9363857812aa8af3fa7fb72be5ea5cf193f824d16d237a8a79256be4
 $(package)_build_subdir=build
-$(package)_dependencies=native_cmake native_zstd
+$(package)_dependencies=native_cmake native_fmt native_xxhash native_zstd
 
 define $(package)_set_vars
 $(package)_config_opts += -DCMAKE_BUILD_TYPE=Release
+$(package)_config_opts += -DDEPS=LOCAL
+$(package)_config_opts += -DCMAKE_PREFIX_PATH=$(build_prefix)
+$(package)_config_opts += -DFMT_LIBRARY=$(build_prefix)/lib/libfmt.a
+$(package)_config_opts += -DXXHASH_LIBRARY=$(build_prefix)/lib/libxxhash.a
 $(package)_config_opts += -DZSTD_LIBRARY=$(build_prefix)/lib/libzstd.a
 $(package)_config_opts += -DREDIS_STORAGE_BACKEND=OFF
+$(package)_config_opts += -DENABLE_TESTING=OFF
 endef
 
 define $(package)_preprocess_cmds

depends/packages/native_ccache.mk

@@ -6,7 +6,7 @@ package=native_clang
 #   doesn't uniformly cut binaries across releases).
 # The Clang compiler should use the same LLVM version as the Rust compiler.
 $(package)_default_major_version=18
-$(package)_default_version=18.1.4
+$(package)_default_version=18.1.8
 # 2024-05-03: No Intel macOS packages are available for Clang 16, 17, or 18.
 $(package)_major_version_darwin=15
 $(package)_version_darwin=15.0.4
@@ -27,7 +27,7 @@ $(package)_major_version=$(if $($(package)_major_version_$(host_arch)_$(host_os)
 $(package)_download_path_linux=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
 $(package)_download_file_linux=clang+llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
 $(package)_file_name_linux=clang-llvm-$($(package)_version)-x86_64-linux-gnu-ubuntu-18.04.tar.xz
-$(package)_sha256_hash_linux=1607375b4aa2aec490b6db51846a04b265675a87e925bcf5825966401ff9b0b1
+$(package)_sha256_hash_linux=54ec30358afcc9fb8aa74307db3046f5187f9fb89fb37064cdde906e062ebf36
 $(package)_download_path_darwin=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
 $(package)_download_file_darwin=clang+llvm-$($(package)_version)-x86_64-apple-darwin.tar.xz
 $(package)_file_name_darwin=clang-llvm-$($(package)_version)-x86_64-apple-darwin.tar.xz
@@ -39,7 +39,7 @@ $(package)_sha256_hash_freebsd=b0a7b86dacb12afb8dd2ca99ea1b894d9cce84aab7711cb19
 $(package)_download_path_aarch64_linux=https://github.com/llvm/llvm-project/releases/download/llvmorg-$($(package)_version)
 $(package)_download_file_aarch64_linux=clang+llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
 $(package)_file_name_aarch64_linux=clang-llvm-$($(package)_version)-aarch64-linux-gnu.tar.xz
-$(package)_sha256_hash_aarch64_linux=8c2f4d1606d24dc197a590acce39453abe7a302b9b92e762108f9b5a9701b1df
+$(package)_sha256_hash_aarch64_linux=dcaa1bebbfbb86953fdfbdc7f938800229f75ad26c5c9375ef242edad737d999
 
 ifeq ($(build_os),linux)
 $(package)_dependencies=native_libtinfo5

depends/packages/native_clang.mk

@@ -1,8 +1,8 @@
 package=native_cmake
-$(package)_version=3.29.3
+$(package)_version=3.30.1
 $(package)_download_path=https://github.com/Kitware/CMake/releases/download/v$($(package)_version)
 $(package)_file_name=cmake-$($(package)_version).tar.gz
-$(package)_sha256_hash=252aee1448d49caa04954fd5e27d189dd51570557313e7b281636716a238bccb
+$(package)_sha256_hash=df9b3c53e3ce84c3c1b7c253e5ceff7d8d1f084ff0673d048f260e04ccb346e1
 
 define $(package)_set_vars
 $(package)_config_opts += -DCMAKE_BUILD_TYPE:STRING=Release

depends/packages/native_cmake.mk

@@ -1,15 +1,15 @@
 package=native_cxxbridge
 # The version needs to match cxx in Cargo.toml
-$(package)_version=1.0.122
+$(package)_version=1.0.124
 $(package)_download_path=https://github.com/dtolnay/cxx/archive/refs/tags
 $(package)_file_name=native_cxxbridge-$($(package)_version).tar.gz
 $(package)_download_file=$($(package)_version).tar.gz
-$(package)_sha256_hash=359df8381a85d63259fc429b8ae1f3de6dc839ecea7b21d437bd6ccd028b7c01
+$(package)_sha256_hash=ee25ea9b2157de797a087cee7fe02e92af53eba435b009b5e42317ea47fc8551
 $(package)_build_subdir=gen/cmd
 $(package)_dependencies=native_rust
 # This file is somewhat annoying to update, but can be done like so from the repo base:
-# $ export VERSION=1.0.122
-# $ rm .cargo/config .cargo/.configured-for-offline
+# $ export VERSION=1.0.124
+# $ rm .cargo/config.toml .cargo/.configured-for-offline
 # $ mkdir tmp
 # $ cd tmp
 # $ tar xf ../depends/sources/native_cxxbridge-$VERSION.tar.gz

depends/packages/native_cxxbridge.mk

@@ -0,0 +1,30 @@
+package=native_fmt
+$(package)_version=10.2.1
+$(package)_download_path=https://github.com/fmtlib/fmt/archive/refs/tags
+$(package)_download_file=$($(package)_version).tar.gz
+$(package)_file_name=fmt-$($(package)_version).tar.gz
+$(package)_sha256_hash=1250e4cc58bf06ee631567523f48848dc4596133e163f02615c97f78bab6c811
+$(package)_build_subdir=build
+$(package)_dependencies=native_cmake
+
+define $(package)_set_vars
+$(package)_config_opts += -DCMAKE_BUILD_TYPE=Release
+$(package)_config_opts += -DCMAKE_POSITION_INDEPENDENT_CODE=TRUE
+$(package)_config_opts += -DFMT_TEST=FALSE
+endef
+
+define $(package)_preprocess_cmds
+  mkdir $($(package)_build_subdir)
+endef
+
+define $(package)_config_cmds
+  $($(package)_cmake) .. $($(package)_config_opts)
+endef
+
+define $(package)_build_cmds
+  $(MAKE)
+endef
+
+define $(package)_stage_cmds
+  $(MAKE) DESTDIR=$($(package)_staging_dir) install
+endef

depends/packages/native_fmt.mk

@@ -3,16 +3,16 @@ package=native_rust
 # ./contrib/devtools/update-rust-hashes.sh
 # The Rust compiler should use the same LLVM version as the Clang compiler; you
 # can check this with `rustc --version -v`.
-$(package)_version=1.78.0
+$(package)_version=1.79.0
 $(package)_download_path=https://static.rust-lang.org/dist
 $(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_linux=1307747915e8bd925f4d5396ab2ae3d8d9c7fad564afbc358c081683d0f22e87
+$(package)_sha256_hash_linux=628efa8ef0658a7c4199883ee132281f19931448d3cfee4ecfd768898fe74c18
 $(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz
-$(package)_sha256_hash_darwin=6c91ed3bd90253961fcb4a2991b8b22e042e2aaa9aba9f389f1e17008171d898
+$(package)_sha256_hash_darwin=62f018aad30bafa0ef8bff0ed60d5d45e6cadc799769aad9d945509203e9f921
 $(package)_file_name_freebsd=rust-$($(package)_version)-x86_64-unknown-freebsd.tar.gz
-$(package)_sha256_hash_freebsd=b9cc84c60deb8da08a6c876426f8721758f4c7e7c553b4554385752ad37c63df
+$(package)_sha256_hash_freebsd=3c8005f488b8dda0fc6d47928868200852106cac2b568934ae9a2e5c89d3a50d
 $(package)_file_name_aarch64_linux=rust-$($(package)_version)-aarch64-unknown-linux-gnu.tar.gz
-$(package)_sha256_hash_aarch64_linux=131eda738cd977fff2c912e5838e8e9b9c260ecddc1247c0fe5473bf09c594af
+$(package)_sha256_hash_aarch64_linux=f7d3b31581331b54af97cf3162e65b8c26c8aa14d42f71c1ce9adc1078ef54e5
 
 # Mapping from GCC canonical hosts to Rust targets
 # If a mapping is not present, we assume they are identical, unless $host_os is
@@ -21,10 +21,10 @@ $(package)_rust_target_x86_64-pc-linux-gnu=x86_64-unknown-linux-gnu
 $(package)_rust_target_x86_64-w64-mingw32=x86_64-pc-windows-gnu
 
 # Mapping from Rust targets to SHA-256 hashes
-$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=9ef30225a7c466758a1b3ba011cbd702f5038c875816cb1733d633002642e2f3
-$(package)_rust_std_sha256_hash_x86_64-apple-darwin=f91024e3b9a4fdb9bba5dfe8b028604bcd1ad621f0b8e8140a31bd677a0232c2
-$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=5dfe7246685dad55fbdd93deffcdfcf11dea095383228a327769a209bfc145f4
-$(package)_rust_std_sha256_hash_x86_64-unknown-freebsd=82fd506f720c0e469fb72f5b532b42c109562a030c3ef2f4fd73dfb08c050929
+$(package)_rust_std_sha256_hash_aarch64-unknown-linux-gnu=e4597274ffbad0b3196dbab9f8badbdf33d4407a07e3f577c074cc90f95c0ca5
+$(package)_rust_std_sha256_hash_x86_64-apple-darwin=52575ebb436bd67016a5fdf8a6e85ffb258c7f1f70c6b2d4a4e0b98204be327d
+$(package)_rust_std_sha256_hash_x86_64-pc-windows-gnu=95acebd9355ab0556b117fbac8ce88dd98cf91af17a3b95b3a6c0a910f13b546
+$(package)_rust_std_sha256_hash_x86_64-unknown-freebsd=68605333389911e56963963b3fa35e6dd1af92386149115e1c029a37b3a483d5
 
 define rust_target
 $(if $($(1)_rust_target_$(2)),$($(1)_rust_target_$(2)),$(if $(findstring darwin,$(3)),x86_64-apple-darwin,$(if $(findstring freebsd,$(3)),x86_64-unknown-freebsd,$(2))))