Merge pull request zcash#6798 from str4d/update-deps-5.8.0

Update dependencies for 5.8.0
throwingpotman · Dec 20, 2023 · 977eba2 · 977eba2
2 parents 0b61fe5 + daac437
commit 977eba2
Show file tree

Hide file tree

Showing 16 changed files with 1,486 additions and 792 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -71,7 +71,7 @@ wagyu-zcash-parameters = "0.2"
 
 # Rust/C++ interop
 # The version needs to match depends/packages/native_cxxbridge.mk
-cxx = { version = "=1.0.107", features = ["c++17"] }
+cxx = { version = "=1.0.111", features = ["c++17"] }
 
 # Rust threading
 rayon = "1.5"

diff --git a/contrib/debian/copyright b/contrib/debian/copyright
diff --git a/depends/packages/native_cmake.mk b/depends/packages/native_cmake.mk
@@ -1,8 +1,8 @@
 package=native_cmake
-$(package)_version=3.27.6
+$(package)_version=3.28.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=ef3056df528569e0e8956f6cf38806879347ac6de6a4ff7e4105dc4578732cfb
+$(package)_sha256_hash=15e94f83e647f7d620a140a7a5da76349fc47a1bfed66d0f5cdee8e7344079ad
 
 define $(package)_set_vars
 $(package)_config_opts += -DCMAKE_BUILD_TYPE:STRING=Release

diff --git a/depends/packages/native_cxxbridge.mk b/depends/packages/native_cxxbridge.mk
@@ -1,14 +1,14 @@
 package=native_cxxbridge
 # The version needs to match cxx in Cargo.toml
-$(package)_version=1.0.107
+$(package)_version=1.0.111
 $(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=961256a942c2369d84db29f6f7d09bce7fa7de221ec729856216a87b0970b1df
+$(package)_sha256_hash=89b80c4b50410b28e4a78db99cd2764cd017bfbffed0c7ca91f8e01ba9539cd4
 $(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.107
+# $ export VERSION=1.0.111
 # $ rm .cargo/config .cargo/.configured-for-offline
 # $ mkdir tmp
 # $ cd tmp

diff --git a/depends/packages/utfcpp.mk b/depends/packages/utfcpp.mk
@@ -1,9 +1,9 @@
 package=utfcpp
-$(package)_version=3.2.5
+$(package)_version=4.0.4
 $(package)_download_path=https://github.com/nemtrif/$(package)/archive/refs/tags
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_download_file=v$($(package)_version).tar.gz
-$(package)_sha256_hash=14fd1b3c466814cb4c40771b7f207b61d2c7a0aa6a5e620ca05c00df27f25afd
+$(package)_sha256_hash=7c8a403d0c575d52473c8644cd9eb46c6ba028d2549bc3e0cdc2d45f5cfd78a0
 
 define $(package)_stage_cmds
   mkdir -p $($(package)_staging_dir)$(host_prefix)/include && \

diff --git a/depends/packages/zeromq.mk b/depends/packages/zeromq.mk
@@ -1,9 +1,9 @@
 package=zeromq
-$(package)_version=4.3.4
+$(package)_version=4.3.5
 $(package)_download_path=https://github.com/zeromq/libzmq/releases/download/v$($(package)_version)/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=c593001a89f5a85dd2ddf564805deb860e02471171b3f204944857336295c3e5
-$(package)_patches=windows-unused-variables.diff use-snprintf-not-sprintf.patch check_snprintf_return.patch
+$(package)_sha256_hash=6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43
+$(package)_patches=stats_proxy-missing-braces.diff
 
 ifneq ($(host_os),darwin)
 $(package)_dependencies=libcxx
@@ -27,9 +27,7 @@ define $(package)_set_vars
 endef
 
 define $(package)_preprocess_cmds
-  patch -p1 < $($(package)_patch_dir)/windows-unused-variables.diff && \
-  patch -p1 < $($(package)_patch_dir)/use-snprintf-not-sprintf.patch && \
-  patch -p1 < $($(package)_patch_dir)/check_snprintf_return.patch
+  patch -p1 < $($(package)_patch_dir)/stats_proxy-missing-braces.diff
 endef
 
 define $(package)_config_cmds

diff --git a/depends/patches/native_cxxbridge/Cargo.lock b/depends/patches/native_cxxbridge/Cargo.lock
diff --git a/depends/patches/zeromq/check_snprintf_return.patch b/depends/patches/zeromq/check_snprintf_return.patch
diff --git a/depends/patches/zeromq/stats_proxy-missing-braces.diff b/depends/patches/zeromq/stats_proxy-missing-braces.diff
@@ -0,0 +1,13 @@
+diff -ur zeromq-4.3.5-orig/src/proxy.cpp zeromq-4.3.5/src/proxy.cpp
+--- zeromq-4.3.5-orig/src/proxy.cpp	2023-10-09 09:37:00.000000000 +0000
++++ zeromq-4.3.5/src/proxy.cpp	2023-12-18 21:24:25.551814814 +0000
+@@ -499,7 +499,7 @@
+     zmq_pollitem_t itemsout[] = {{frontend_, 0, ZMQ_POLLOUT, 0},
+                                  {backend_, 0, ZMQ_POLLOUT, 0}};
+
+-    stats_proxy stats = {0};
++    stats_proxy stats = {{{0}}};
+
+     //  Proxy can be in these three states
+     proxy_state_t state = active;
+Only in zeromq-4.3.5/src: .proxy.cpp.swp