Skip to content

Commit 7f7e8fb

Browse files
committed
Auto merge of rust-lang#110008 - klensy:deps-up-apr-06, r=Mark-Simulacrum
bump few deps Update few deps to fix security vulns, future incompatibilities, duplicates. `jemalloc-sys` v0.5.0+5.3.0 -> v0.5.3+5.3.0-patched: fixes future-incompatibilities by dropping fs_extra (https://github.com/rust-lang-ci/rust/actions/runs/4626595610/jobs/8183514150#step:26:19499, https://github.com/tikv/jemallocator/blob/tikv-jemalloc-sys-0.5.3/CHANGELOG.md) `openssl-src` v111.22.0+1.1.1q -> v111.25.0+1.1.1t: fixes few vulns: https://www.openssl.org/news/vulnerabilities-1.1.1.html https://www.cve.org/CVERecord?id=CVE-2022-4304 https://www.cve.org/CVERecord?id=CVE-2022-4450 https://www.cve.org/CVERecord?id=CVE-2023-0215 https://www.cve.org/CVERecord?id=CVE-2023-0286 There exist newer openssl version 1.1.1u with low severity vulns, but no crate update yet `openssl` crate with deps 0.10.38 ->0.10.49 fixes vulns (https://github.com/sfackler/rust-openssl/blob/openssl-v0.10.49/openssl/CHANGELOG.md) https://rustsec.org/advisories/RUSTSEC-2023-0022 https://rustsec.org/advisories/RUSTSEC-2023-0023 https://rustsec.org/advisories/RUSTSEC-2023-0024 update `env_logger` for `rustbook` and `cargo_metadata` for `tidy` to newer versions (still used by `rustfmt`, `miri`)
2 parents 749b487 + 40b6095 commit 7f7e8fb

File tree

3 files changed

+24
-20
lines changed

3 files changed

+24
-20
lines changed

Cargo.lock

+22-18
Original file line numberDiff line numberDiff line change
@@ -1673,12 +1673,6 @@ version = "2.8.1"
16731673
source = "registry+https://github.com/rust-lang/crates.io-index"
16741674
checksum = "64db3e262960f0662f43a6366788d5f10f7f244b8f7d7d987f560baf5ded5c50"
16751675

1676-
[[package]]
1677-
name = "fs_extra"
1678-
version = "1.1.0"
1679-
source = "registry+https://github.com/rust-lang/crates.io-index"
1680-
checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
1681-
16821676
[[package]]
16831677
name = "futf"
16841678
version = "0.1.5"
@@ -2861,12 +2855,11 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
28612855

28622856
[[package]]
28632857
name = "jemalloc-sys"
2864-
version = "0.5.0+5.3.0"
2858+
version = "0.5.3+5.3.0-patched"
28652859
source = "registry+https://github.com/rust-lang/crates.io-index"
2866-
checksum = "f655c3ecfa6b0d03634595b4b54551d4bd5ac208b9e0124873949a7ab168f70b"
2860+
checksum = "f9bd5d616ea7ed58b571b2e209a65759664d7fb021a0819d7a790afc67e47ca1"
28672861
dependencies = [
28682862
"cc",
2869-
"fs_extra",
28702863
"libc",
28712864
]
28722865

@@ -3475,18 +3468,30 @@ dependencies = [
34753468

34763469
[[package]]
34773470
name = "openssl"
3478-
version = "0.10.38"
3471+
version = "0.10.49"
34793472
source = "registry+https://github.com/rust-lang/crates.io-index"
3480-
checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95"
3473+
checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33"
34813474
dependencies = [
34823475
"bitflags",
34833476
"cfg-if",
34843477
"foreign-types",
34853478
"libc",
34863479
"once_cell",
3480+
"openssl-macros",
34873481
"openssl-sys",
34883482
]
34893483

3484+
[[package]]
3485+
name = "openssl-macros"
3486+
version = "0.1.1"
3487+
source = "registry+https://github.com/rust-lang/crates.io-index"
3488+
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
3489+
dependencies = [
3490+
"proc-macro2",
3491+
"quote",
3492+
"syn 2.0.8",
3493+
]
3494+
34903495
[[package]]
34913496
name = "openssl-probe"
34923497
version = "0.1.5"
@@ -3495,20 +3500,19 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
34953500

34963501
[[package]]
34973502
name = "openssl-src"
3498-
version = "111.22.0+1.1.1q"
3503+
version = "111.25.0+1.1.1t"
34993504
source = "registry+https://github.com/rust-lang/crates.io-index"
3500-
checksum = "8f31f0d509d1c1ae9cada2f9539ff8f37933831fd5098879e482aa687d659853"
3505+
checksum = "3173cd3626c43e3854b1b727422a276e568d9ec5fe8cec197822cf52cfb743d6"
35013506
dependencies = [
35023507
"cc",
35033508
]
35043509

35053510
[[package]]
35063511
name = "openssl-sys"
3507-
version = "0.9.72"
3512+
version = "0.9.84"
35083513
source = "registry+https://github.com/rust-lang/crates.io-index"
3509-
checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb"
3514+
checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa"
35103515
dependencies = [
3511-
"autocfg",
35123516
"cc",
35133517
"libc",
35143518
"openssl-src",
@@ -4178,7 +4182,7 @@ name = "rustbook"
41784182
version = "0.1.0"
41794183
dependencies = [
41804184
"clap 4.2.1",
4181-
"env_logger 0.7.1",
4185+
"env_logger 0.10.0",
41824186
"mdbook",
41834187
]
41844188

@@ -6311,7 +6315,7 @@ name = "tidy"
63116315
version = "0.1.0"
63126316
dependencies = [
63136317
"cargo-platform 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
6314-
"cargo_metadata 0.14.0",
6318+
"cargo_metadata 0.15.3",
63156319
"ignore",
63166320
"lazy_static",
63176321
"miropt-test-tools",

src/tools/rustbook/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2021"
66

77
[dependencies]
88
clap = "4.0.32"
9-
env_logger = "0.7.1"
9+
env_logger = "0.10"
1010

1111
[dependencies.mdbook]
1212
version = "0.4.28"

src/tools/tidy/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55
autobins = false
66

77
[dependencies]
8-
cargo_metadata = "0.14"
8+
cargo_metadata = "0.15"
99
cargo-platform = "0.1.2"
1010
regex = "1"
1111
miropt-test-tools = { path = "../miropt-test-tools" }

0 commit comments

Comments
 (0)