diff --git a/Cargo.lock b/Cargo.lock index a504bc7d9..70b821ea9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -439,9 +439,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f83d0ebf42c6eafb8d7c52f7e5f2d3003b89c7aa4fd2b79229209459a849af8" +checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" dependencies = [ "cc", "cxxbridge-flags", @@ -451,15 +451,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d2199b00553eda8012dfec8d3b1c75fce747cf27c169a270b3b99e3448ab78" +checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" [[package]] name = "cxxbridge-macro" -version = "1.0.79" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb67a6de1f602736dd7eaead0080cf3435df806c61b24b13328db128c58868f" +checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index 29dba4bea..62e39a1ca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,7 +68,7 @@ zeroize = "1.4.2" # Rust/C++ interop # The version needs to match depends/packages/native_cxxbridge.mk -cxx = { version = "=1.0.79", features = ["c++17"] } +cxx = { version = "=1.0.83", features = ["c++17"] } # Rust threading rayon = "1.5" diff --git a/depends/packages/native_cxxbridge.mk b/depends/packages/native_cxxbridge.mk index 3fe05a407..836dcaad4 100644 --- a/depends/packages/native_cxxbridge.mk +++ b/depends/packages/native_cxxbridge.mk @@ -1,10 +1,10 @@ package=native_cxxbridge # The version needs to match cxx in Cargo.toml -$(package)_version=1.0.79 +$(package)_version=1.0.83 $(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=4da400783dee17e9a99dd39a17cd2cc346df311cb8745832e2b4d5173c23dfcd +$(package)_sha256_hash=e30cbd34fc8ec2ae78f4f9e546d29c6c92e6d714f30c3c150f7b8c6ea08ea971 $(package)_build_subdir=gen/cmd $(package)_dependencies=native_rust $(package)_extra_sources=$(package)-$($(package)_version)-vendored.tar.gz diff --git a/qa/supply-chain/audits.toml b/qa/supply-chain/audits.toml index 4c4457cdb..70ca3574a 100644 --- a/qa/supply-chain/audits.toml +++ b/qa/supply-chain/audits.toml @@ -130,6 +130,11 @@ a struct containing both the pointer to an error message and its length, instead of just the raw `*const u8`. """ +[[audits.cxx]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.79 -> 1.0.83" + [[audits.cxxbridge-flags]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -151,6 +156,11 @@ criteria = "safe-to-deploy" delta = "1.0.78 -> 1.0.79" notes = "This is exclusively an update to the `cxxbridge` dependency version." +[[audits.cxxbridge-flags]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.79 -> 1.0.83" + [[audits.cxxbridge-macro]] who = "Daira Hopwood " criteria = "safe-to-deploy" @@ -177,6 +187,11 @@ criteria = "safe-to-deploy" delta = "1.0.78 -> 1.0.79" notes = "This is exclusively an update to the `cxxbridge` dependency version." +[[audits.cxxbridge-macro]] +who = "Jack Grigg " +criteria = "safe-to-deploy" +delta = "1.0.79 -> 1.0.83" + [[audits.ed25519-zebra]] who = "Jack Grigg " criteria = "safe-to-deploy" diff --git a/qa/zcash/postponed-updates.txt b/qa/zcash/postponed-updates.txt index 2b7e77a99..211cba31c 100644 --- a/qa/zcash/postponed-updates.txt +++ b/qa/zcash/postponed-updates.txt @@ -4,14 +4,13 @@ # bdb 18.1.40 2020-09-01 # -native_cxxbridge 1.0.80 2022-12-10 -native_cxxbridge 1.0.81 2022-12-10 -native_cxxbridge 1.0.82 2022-12-10 -native_cxxbridge 1.0.83 2022-12-10 -rustcxx 1.0.80 2022-12-10 -rustcxx 1.0.81 2022-12-10 -rustcxx 1.0.82 2022-12-10 -rustcxx 1.0.83 2022-12-10 +# cxx 1.0.84-1.0.86 didn't update third-party/Cargo.lock +native_cxxbridge 1.0.84 2024-02-01 +native_cxxbridge 1.0.85 2024-02-01 +native_cxxbridge 1.0.86 2024-02-01 +rustcxx 1.0.84 2024-02-01 +rustcxx 1.0.85 2024-02-01 +rustcxx 1.0.86 2024-02-01 # CCache 4.7 appears to drop support for Ubuntu 18.04 native_ccache 4.7 2023-03-01