diff --git a/Cargo.lock b/Cargo.lock index 466d796166..085590f72e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -512,11 +512,21 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" @@ -1824,9 +1834,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ "base64 0.21.5", "bytes", @@ -1850,6 +1860,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-rustls", "tower-service", @@ -2486,6 +2497,27 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tempfile" version = "3.8.1" diff --git a/Cargo.toml b/Cargo.toml index 587c8c88e1..4946af7be6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ jsonwebtoken = "9.2.0" clap = { version = "4.4", features = ["derive", "env"] } serde = { version = "1.0.158", features = ["derive"] } tokio = { version = "1.33.0", features = ["full"] } -reqwest = { version = "0.11.20", default-features = false, features = ["json", "rustls-tls"] } +reqwest = { version = "0.11.23", default-features = false, features = ["json", "rustls-tls"] } thiserror = "1.0.49" serde_yaml = "0.9.25" serde_json = "1.0.107" diff --git a/third-party/rust/BUCK b/third-party/rust/BUCK index 350f9abca2..e3032f3845 100644 --- a/third-party/rust/BUCK +++ b/third-party/rust/BUCK @@ -1088,19 +1088,48 @@ cargo.rust_library( ) http_archive( - name = "core-foundation-sys-0.8.4.crate", - sha256 = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa", - strip_prefix = "core-foundation-sys-0.8.4", - urls = ["https://crates.io/api/v1/crates/core-foundation-sys/0.8.4/download"], + name = "core-foundation-0.9.4.crate", + sha256 = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f", + strip_prefix = "core-foundation-0.9.4", + urls = ["https://crates.io/api/v1/crates/core-foundation/0.9.4/download"], visibility = [], ) cargo.rust_library( - name = "core-foundation-sys-0.8.4", - srcs = [":core-foundation-sys-0.8.4.crate"], + name = "core-foundation-0.9.4", + srcs = [":core-foundation-0.9.4.crate"], + crate = "core_foundation", + crate_root = "core-foundation-0.9.4.crate/src/lib.rs", + edition = "2018", + features = [ + "default", + "link", + ], + visibility = [], + deps = [ + ":core-foundation-sys-0.8.6", + ":libc-0.2.149", + ], +) + +http_archive( + name = "core-foundation-sys-0.8.6.crate", + sha256 = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f", + strip_prefix = "core-foundation-sys-0.8.6", + urls = ["https://crates.io/api/v1/crates/core-foundation-sys/0.8.6/download"], + visibility = [], +) + +cargo.rust_library( + name = "core-foundation-sys-0.8.6", + srcs = [":core-foundation-sys-0.8.6.crate"], crate = "core_foundation_sys", - crate_root = "core-foundation-sys-0.8.4.crate/src/lib.rs", - edition = "2015", + crate_root = "core-foundation-sys-0.8.6.crate/src/lib.rs", + edition = "2018", + features = [ + "default", + "link", + ], visibility = [], ) @@ -2564,10 +2593,10 @@ cargo.rust_library( features = ["fallback"], platform = { "macos-arm64": dict( - deps = [":core-foundation-sys-0.8.4"], + deps = [":core-foundation-sys-0.8.6"], ), "macos-x86_64": dict( - deps = [":core-foundation-sys-0.8.4"], + deps = [":core-foundation-sys-0.8.6"], ), "windows-gnu": dict( deps = [":windows-core-0.51.1"], @@ -3616,7 +3645,7 @@ cargo.rust_library( ":bytes-1.5.0", ":http-0.2.9", ":opentelemetry_api-0.20.0", - ":reqwest-0.11.20", + ":reqwest-0.11.23", ], ) @@ -3676,7 +3705,7 @@ cargo.rust_library( ":opentelemetry_api-0.20.0", ":opentelemetry_sdk-0.20.0", ":prost-0.11.9", - ":reqwest-0.11.20", + ":reqwest-0.11.23", ":thiserror-1.0.50", ":tokio-1.33.0", ":tonic-0.9.2", @@ -4636,23 +4665,23 @@ cargo.rust_library( alias( name = "reqwest", - actual = ":reqwest-0.11.20", + actual = ":reqwest-0.11.23", visibility = ["PUBLIC"], ) http_archive( - name = "reqwest-0.11.20.crate", - sha256 = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1", - strip_prefix = "reqwest-0.11.20", - urls = ["https://crates.io/api/v1/crates/reqwest/0.11.20/download"], + name = "reqwest-0.11.23.crate", + sha256 = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41", + strip_prefix = "reqwest-0.11.23", + urls = ["https://crates.io/api/v1/crates/reqwest/0.11.23/download"], visibility = [], ) cargo.rust_library( - name = "reqwest-0.11.20", - srcs = [":reqwest-0.11.20.crate"], + name = "reqwest-0.11.23", + srcs = [":reqwest-0.11.23.crate"], crate = "reqwest", - crate_root = "reqwest-0.11.20.crate/src/lib.rs", + crate_root = "reqwest-0.11.23.crate/src/lib.rs", edition = "2018", features = [ "__rustls", @@ -4724,6 +4753,7 @@ cargo.rust_library( ":pin-project-lite-0.2.13", ":rustls-0.21.8", ":rustls-pemfile-1.0.3", + ":system-configuration-0.5.1", ":tokio-1.33.0", ":tokio-rustls-0.24.1", ":webpki-roots-0.25.2", @@ -4744,6 +4774,7 @@ cargo.rust_library( ":pin-project-lite-0.2.13", ":rustls-0.21.8", ":rustls-pemfile-1.0.3", + ":system-configuration-0.5.1", ":tokio-1.33.0", ":tokio-rustls-0.24.1", ":webpki-roots-0.25.2", @@ -6935,6 +6966,49 @@ cargo.rust_library( visibility = [], ) +http_archive( + name = "system-configuration-0.5.1.crate", + sha256 = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7", + strip_prefix = "system-configuration-0.5.1", + urls = ["https://crates.io/api/v1/crates/system-configuration/0.5.1/download"], + visibility = [], +) + +cargo.rust_library( + name = "system-configuration-0.5.1", + srcs = [":system-configuration-0.5.1.crate"], + crate = "system_configuration", + crate_root = "system-configuration-0.5.1.crate/src/lib.rs", + edition = "2021", + visibility = [], + deps = [ + ":bitflags-1.3.2", + ":core-foundation-0.9.4", + ":system-configuration-sys-0.5.0", + ], +) + +http_archive( + name = "system-configuration-sys-0.5.0.crate", + sha256 = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9", + strip_prefix = "system-configuration-sys-0.5.0", + urls = ["https://crates.io/api/v1/crates/system-configuration-sys/0.5.0/download"], + visibility = [], +) + +cargo.rust_library( + name = "system-configuration-sys-0.5.0", + srcs = [":system-configuration-sys-0.5.0.crate"], + crate = "system_configuration_sys", + crate_root = "system-configuration-sys-0.5.0.crate/src/lib.rs", + edition = "2021", + visibility = [], + deps = [ + ":core-foundation-sys-0.8.6", + ":libc-0.2.149", + ], +) + http_archive( name = "tempfile-3.8.1.crate", sha256 = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5", @@ -6997,7 +7071,7 @@ cargo.rust_binary( ":opentelemetry-otlp-0.13.0", ":opentelemetry-semantic-conventions-0.12.0", ":rand-0.8.5", - ":reqwest-0.11.20", + ":reqwest-0.11.23", ":serde-1.0.190", ":serde_json-1.0.108", ":serde_with-3.4.0", diff --git a/third-party/rust/Cargo.lock b/third-party/rust/Cargo.lock index 6f8c858f73..05161efbaa 100644 --- a/third-party/rust/Cargo.lock +++ b/third-party/rust/Cargo.lock @@ -488,11 +488,21 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "cpufeatures" @@ -1800,9 +1810,9 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ "base64 0.21.5", "bytes", @@ -1826,6 +1836,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-rustls", "tower-service", @@ -2462,6 +2473,27 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tempfile" version = "3.8.1" diff --git a/third-party/rust/Cargo.toml b/third-party/rust/Cargo.toml index edaac0b26d..fefb452281 100644 --- a/third-party/rust/Cargo.toml +++ b/third-party/rust/Cargo.toml @@ -27,7 +27,7 @@ jsonwebtoken = "9.2.0" clap = { version = "4.4", features = ["derive", "env"] } tokio = { version = "1.33.0", features = ["full"] } serde = { version = "1.0.158", features = ["derive"] } -reqwest = { version = "0.11.20", default-features = false, features = ["json", "rustls-tls"] } +reqwest = { version = "0.11.23", default-features = false, features = ["json", "rustls-tls"] } thiserror = "1.0.49" serde_yaml = "0.9.25" serde_json = "1.0.107" diff --git a/third-party/rust/fixups/system-configuration-sys/fixups.toml b/third-party/rust/fixups/system-configuration-sys/fixups.toml new file mode 100644 index 0000000000..db40d72cb2 --- /dev/null +++ b/third-party/rust/fixups/system-configuration-sys/fixups.toml @@ -0,0 +1 @@ +buildscript = []