From 8f5474bef05f20fb16094ce538f73a280951e370 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 3 Nov 2020 10:26:27 +1000 Subject: [PATCH] ues native roots with rustls --- cargo/BUILD.bazel | 11 +- cargo/Cargo.lock | 160 +++++++++----- cargo/crates.bzl | 208 +++++++++++------- ....BUILD.bazel => anyhow-1.0.34.BUILD.bazel} | 4 +- ....BUILD.bazel => base64-0.13.0.BUILD.bazel} | 3 +- .../remote/core-foundation-0.7.0.BUILD.bazel | 55 +++++ ... => core-foundation-sys-0.7.0.BUILD.bazel} | 43 ++-- ...8.BUILD.bazel => hyper-0.13.9.BUILD.bazel} | 22 +- ....bazel => hyper-rustls-0.21.0.BUILD.bazel} | 14 +- cargo/remote/hyper-timeout-0.3.1.BUILD.bazel | 2 +- ....0.BUILD.bazel => ipnet-2.3.0.BUILD.bazel} | 9 +- cargo/remote/openssl-probe-0.1.2.BUILD.bazel | 52 +++++ cargo/remote/prost-derive-0.6.1.BUILD.bazel | 2 +- ...BUILD.bazel => reqwest-0.10.8.BUILD.bazel} | 28 +-- ....BUILD.bazel => rustls-0.18.1.BUILD.bazel} | 7 +- .../rustls-native-certs-0.4.0.BUILD.bazel | 87 ++++++++ cargo/remote/schannel-0.1.19.BUILD.bazel | 54 +++++ .../security-framework-1.0.0.BUILD.bazel | 62 ++++++ .../security-framework-sys-1.0.0.BUILD.bazel | 55 +++++ ....bazel => tokio-rustls-0.14.1.BUILD.bazel} | 4 +- ...LD.bazel => tokio-socks-0.3.0.BUILD.bazel} | 3 +- cargo/remote/web-sys-0.3.45.BUILD.bazel | 3 + cargo/remote/webpki-roots-0.18.0.BUILD.bazel | 78 ------- cargo/remote/winapi-0.3.9.BUILD.bazel | 12 + ...2.BUILD.bazel => winreg-0.7.0.BUILD.bazel} | 2 +- rslib/BUILD.bazel | 1 - rslib/Cargo.toml | 4 +- 27 files changed, 692 insertions(+), 293 deletions(-) rename cargo/remote/{anyhow-1.0.33.BUILD.bazel => anyhow-1.0.34.BUILD.bazel} (98%) rename cargo/remote/{base64-0.11.0.BUILD.bazel => base64-0.13.0.BUILD.bazel} (94%) create mode 100644 cargo/remote/core-foundation-0.7.0.BUILD.bazel rename cargo/remote/{webpki-roots-0.19.0.BUILD.bazel => core-foundation-sys-0.7.0.BUILD.bazel} (65%) rename cargo/remote/{hyper-0.13.8.BUILD.bazel => hyper-0.13.9.BUILD.bazel} (82%) rename cargo/remote/{hyper-rustls-0.20.0.BUILD.bazel => hyper-rustls-0.21.0.BUILD.bazel} (79%) rename cargo/remote/{ct-logs-0.6.0.BUILD.bazel => ipnet-2.3.0.BUILD.bazel} (83%) create mode 100644 cargo/remote/openssl-probe-0.1.2.BUILD.bazel rename cargo/remote/{reqwest-0.10.4.BUILD.bazel => reqwest-0.10.8.BUILD.bazel} (84%) rename cargo/remote/{rustls-0.17.0.BUILD.bazel => rustls-0.18.1.BUILD.bazel} (85%) create mode 100644 cargo/remote/rustls-native-certs-0.4.0.BUILD.bazel create mode 100644 cargo/remote/schannel-0.1.19.BUILD.bazel create mode 100644 cargo/remote/security-framework-1.0.0.BUILD.bazel create mode 100644 cargo/remote/security-framework-sys-1.0.0.BUILD.bazel rename cargo/remote/{tokio-rustls-0.13.1.BUILD.bazel => tokio-rustls-0.14.1.BUILD.bazel} (95%) rename cargo/remote/{tokio-socks-0.2.2.BUILD.bazel => tokio-socks-0.3.0.BUILD.bazel} (94%) delete mode 100644 cargo/remote/webpki-roots-0.18.0.BUILD.bazel rename cargo/remote/{winreg-0.6.2.BUILD.bazel => winreg-0.7.0.BUILD.bazel} (98%) diff --git a/cargo/BUILD.bazel b/cargo/BUILD.bazel index c59006fa9..deb27fbde 100644 --- a/cargo/BUILD.bazel +++ b/cargo/BUILD.bazel @@ -138,15 +138,6 @@ alias( ], ) -alias( - name = "hyper", - actual = "@raze__hyper__0_13_8//:hyper", - tags = [ - "cargo-raze", - "manual", - ], -) - alias( name = "intl_memoizer", actual = "@raze__intl_memoizer__0_3_0//:intl_memoizer", @@ -275,7 +266,7 @@ alias( alias( name = "reqwest", - actual = "@raze__reqwest__0_10_4//:reqwest", + actual = "@raze__reqwest__0_10_8//:reqwest", tags = [ "cargo-raze", "manual", diff --git a/cargo/Cargo.lock b/cargo/Cargo.lock index 2596a1d45..92536a335 100644 --- a/cargo/Cargo.lock +++ b/cargo/Cargo.lock @@ -32,9 +32,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c" +checksum = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7" [[package]] name = "arc-swap" @@ -154,18 +154,18 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - [[package]] name = "base64" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + [[package]] name = "bitflags" version = "1.2.1" @@ -282,6 +282,22 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" +[[package]] +name = "core-foundation" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + [[package]] name = "crc32fast" version = "1.2.1" @@ -322,15 +338,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ct-logs" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113" -dependencies = [ - "sct", -] - [[package]] name = "ctor" version = "0.1.16" @@ -406,7 +413,6 @@ dependencies = [ "futures", "hex", "htmlescape", - "hyper", "intl-memoizer", "itertools", "lazy_static", @@ -841,9 +847,9 @@ checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" [[package]] name = "hyper" -version = "0.13.8" +version = "0.13.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835" +checksum = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf" dependencies = [ "bytes 0.5.6", "futures-channel", @@ -855,7 +861,7 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project 0.4.27", + "pin-project 1.0.1", "socket2", "tokio", "tower-service", @@ -865,12 +871,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08" +checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" dependencies = [ "bytes 0.5.6", - "ct-logs", "futures-util", "hyper", "log", @@ -878,13 +883,12 @@ dependencies = [ "tokio", "tokio-rustls", "webpki", - "webpki-roots 0.19.0", ] [[package]] name = "hyper-timeout" version = "0.3.1" -source = "git+https://github.com/ankitects/hyper-timeout.git?branch=shared-timeout#664b6f9c387f6a7d75d1609a65c02554e8c55bc7" +source = "git+https://github.com/ankitects/hyper-timeout.git?tag=anki-2020-11-03#f9ef687120d88744c1da50a222e19208b4553503" dependencies = [ "bytes 0.5.6", "hyper", @@ -995,6 +999,12 @@ dependencies = [ "libc", ] +[[package]] +name = "ipnet" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" + [[package]] name = "itertools" version = "0.9.0" @@ -1265,6 +1275,12 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "260e51e7efe62b592207e9e13a68e43692a7a279171d6ba57abd208bf23645ad" +[[package]] +name = "openssl-probe" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + [[package]] name = "parking_lot" version = "0.11.0" @@ -1628,10 +1644,10 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.10.4" -source = "git+https://github.com/ankitects/reqwest.git?rev=57665e2c2a39db85723ba860f1b570a608bb73f9#57665e2c2a39db85723ba860f1b570a608bb73f9" +version = "0.10.8" +source = "git+https://github.com/ankitects/reqwest.git?tag=anki-2020-11-03#eab12efe22f370f386d99c7d90e7a964e85dd071" dependencies = [ - "base64 0.12.3", + "base64 0.13.0", "bytes 0.5.6", "encoding_rs", "futures-core", @@ -1641,6 +1657,7 @@ dependencies = [ "hyper", "hyper-rustls", "hyper-timeout", + "ipnet", "js-sys", "lazy_static", "log", @@ -1649,6 +1666,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls", + "rustls-native-certs", "serde", "serde_json", "serde_urlencoded", @@ -1659,7 +1677,6 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.18.0", "winreg", ] @@ -1713,23 +1730,45 @@ checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" [[package]] name = "rustls" -version = "0.17.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1" +checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" dependencies = [ - "base64 0.11.0", + "base64 0.12.3", "log", "ring", "sct", "webpki", ] +[[package]] +name = "rustls-native-certs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8" +dependencies = [ + "openssl-probe", + "rustls", + "schannel", + "security-framework", +] + [[package]] name = "ryu" version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +[[package]] +name = "schannel" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +dependencies = [ + "lazy_static", + "winapi 0.3.9", +] + [[package]] name = "scopeguard" version = "1.1.0" @@ -1746,6 +1785,29 @@ dependencies = [ "untrusted", ] +[[package]] +name = "security-framework" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b" +dependencies = [ + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "serde" version = "1.0.117" @@ -2090,7 +2152,7 @@ dependencies = [ [[package]] name = "tokio-io-timeout" version = "0.4.0" -source = "git+https://github.com/ankitects/tokio-io-timeout.git?branch=shared-timeout#96e1358555c49905de89170f2b1102a7d8b6c4c2" +source = "git+https://github.com/ankitects/tokio-io-timeout.git?tag=anki-2020-11-03#96e1358555c49905de89170f2b1102a7d8b6c4c2" dependencies = [ "bytes 0.5.6", "tokio", @@ -2098,9 +2160,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.13.1" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4" +checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" dependencies = [ "futures-core", "rustls", @@ -2110,9 +2172,9 @@ dependencies = [ [[package]] name = "tokio-socks" -version = "0.2.2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1997788a0e25e09300e44680ba1ef9d44d6f634a883641f80109e8b59c928daf" +checksum = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539" dependencies = [ "bytes 0.4.12", "either", @@ -2439,24 +2501,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "webpki-roots" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4" -dependencies = [ - "webpki", -] - -[[package]] -name = "webpki-roots" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" -dependencies = [ - "webpki", -] - [[package]] name = "which" version = "4.0.2" @@ -2512,9 +2556,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "winreg" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69" dependencies = [ "winapi 0.3.9", ] diff --git a/cargo/crates.bzl b/cargo/crates.bzl index 5a4428c4b..d8df6339f 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -53,12 +53,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__anyhow__1_0_33", - url = "https://crates.io/api/v1/crates/anyhow/1.0.33/download", + name = "raze__anyhow__1_0_34", + url = "https://crates.io/api/v1/crates/anyhow/1.0.34/download", type = "tar.gz", - sha256 = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c", - strip_prefix = "anyhow-1.0.33", - build_file = Label("//cargo/remote:anyhow-1.0.33.BUILD.bazel"), + sha256 = "bf8dcb5b4bbaa28653b647d8c77bd4ed40183b48882e130c1f1ffb73de069fd7", + strip_prefix = "anyhow-1.0.34", + build_file = Label("//cargo/remote:anyhow-1.0.34.BUILD.bazel"), ) maybe( @@ -181,16 +181,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:backtrace-0.3.54.BUILD.bazel"), ) - maybe( - http_archive, - name = "raze__base64__0_11_0", - url = "https://crates.io/api/v1/crates/base64/0.11.0/download", - type = "tar.gz", - sha256 = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7", - strip_prefix = "base64-0.11.0", - build_file = Label("//cargo/remote:base64-0.11.0.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__base64__0_12_3", @@ -201,6 +191,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:base64-0.12.3.BUILD.bazel"), ) + maybe( + http_archive, + name = "raze__base64__0_13_0", + url = "https://crates.io/api/v1/crates/base64/0.13.0/download", + type = "tar.gz", + sha256 = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd", + strip_prefix = "base64-0.13.0", + build_file = Label("//cargo/remote:base64-0.13.0.BUILD.bazel"), + ) + maybe( http_archive, name = "raze__bitflags__1_2_1", @@ -340,6 +340,26 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:constant_time_eq-0.1.5.BUILD.bazel"), ) + maybe( + http_archive, + name = "raze__core_foundation__0_7_0", + url = "https://crates.io/api/v1/crates/core-foundation/0.7.0/download", + type = "tar.gz", + sha256 = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171", + strip_prefix = "core-foundation-0.7.0", + build_file = Label("//cargo/remote:core-foundation-0.7.0.BUILD.bazel"), + ) + + maybe( + http_archive, + name = "raze__core_foundation_sys__0_7_0", + url = "https://crates.io/api/v1/crates/core-foundation-sys/0.7.0/download", + type = "tar.gz", + sha256 = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac", + strip_prefix = "core-foundation-sys-0.7.0", + build_file = Label("//cargo/remote:core-foundation-sys-0.7.0.BUILD.bazel"), + ) + maybe( http_archive, name = "raze__crc32fast__1_2_1", @@ -380,16 +400,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:crypto-mac-0.8.0.BUILD.bazel"), ) - maybe( - http_archive, - name = "raze__ct_logs__0_6_0", - url = "https://crates.io/api/v1/crates/ct-logs/0.6.0/download", - type = "tar.gz", - sha256 = "4d3686f5fa27dbc1d76c751300376e167c5a43387f44bb451fd1c24776e49113", - strip_prefix = "ct-logs-0.6.0", - build_file = Label("//cargo/remote:ct-logs-0.6.0.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__ctor__0_1_16", @@ -880,29 +890,29 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__hyper__0_13_8", - url = "https://crates.io/api/v1/crates/hyper/0.13.8/download", + name = "raze__hyper__0_13_9", + url = "https://crates.io/api/v1/crates/hyper/0.13.9/download", type = "tar.gz", - sha256 = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835", - strip_prefix = "hyper-0.13.8", - build_file = Label("//cargo/remote:hyper-0.13.8.BUILD.bazel"), + sha256 = "f6ad767baac13b44d4529fcf58ba2cd0995e36e7b435bc5b039de6f47e880dbf", + strip_prefix = "hyper-0.13.9", + build_file = Label("//cargo/remote:hyper-0.13.9.BUILD.bazel"), ) maybe( http_archive, - name = "raze__hyper_rustls__0_20_0", - url = "https://crates.io/api/v1/crates/hyper-rustls/0.20.0/download", + name = "raze__hyper_rustls__0_21_0", + url = "https://crates.io/api/v1/crates/hyper-rustls/0.21.0/download", type = "tar.gz", - sha256 = "ac965ea399ec3a25ac7d13b8affd4b8f39325cca00858ddf5eb29b79e6b14b08", - strip_prefix = "hyper-rustls-0.20.0", - build_file = Label("//cargo/remote:hyper-rustls-0.20.0.BUILD.bazel"), + sha256 = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6", + strip_prefix = "hyper-rustls-0.21.0", + build_file = Label("//cargo/remote:hyper-rustls-0.21.0.BUILD.bazel"), ) maybe( new_git_repository, name = "raze__hyper_timeout__0_3_1", remote = "https://github.com/ankitects/hyper-timeout.git", - commit = "664b6f9c387f6a7d75d1609a65c02554e8c55bc7", + commit = "f9ef687120d88744c1da50a222e19208b4553503", build_file = Label("//cargo/remote:hyper-timeout-0.3.1.BUILD.bazel"), init_submodules = True, ) @@ -1006,6 +1016,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:iovec-0.1.4.BUILD.bazel"), ) + maybe( + http_archive, + name = "raze__ipnet__2_3_0", + url = "https://crates.io/api/v1/crates/ipnet/2.3.0/download", + type = "tar.gz", + sha256 = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135", + strip_prefix = "ipnet-2.3.0", + build_file = Label("//cargo/remote:ipnet-2.3.0.BUILD.bazel"), + ) + maybe( http_archive, name = "raze__itertools__0_9_0", @@ -1306,6 +1326,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:once_cell-1.4.1.BUILD.bazel"), ) + maybe( + http_archive, + name = "raze__openssl_probe__0_1_2", + url = "https://crates.io/api/v1/crates/openssl-probe/0.1.2/download", + type = "tar.gz", + sha256 = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de", + strip_prefix = "openssl-probe-0.1.2", + build_file = Label("//cargo/remote:openssl-probe-0.1.2.BUILD.bazel"), + ) + maybe( http_archive, name = "raze__parking_lot__0_11_0", @@ -1684,10 +1714,10 @@ def raze_fetch_remote_crates(): maybe( new_git_repository, - name = "raze__reqwest__0_10_4", + name = "raze__reqwest__0_10_8", remote = "https://github.com/ankitects/reqwest.git", - commit = "57665e2c2a39db85723ba860f1b570a608bb73f9", - build_file = Label("//cargo/remote:reqwest-0.10.4.BUILD.bazel"), + commit = "eab12efe22f370f386d99c7d90e7a964e85dd071", + build_file = Label("//cargo/remote:reqwest-0.10.8.BUILD.bazel"), init_submodules = True, ) @@ -1733,12 +1763,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__rustls__0_17_0", - url = "https://crates.io/api/v1/crates/rustls/0.17.0/download", + name = "raze__rustls__0_18_1", + url = "https://crates.io/api/v1/crates/rustls/0.18.1/download", type = "tar.gz", - sha256 = "c0d4a31f5d68413404705d6982529b0e11a9aacd4839d1d6222ee3b8cb4015e1", - strip_prefix = "rustls-0.17.0", - build_file = Label("//cargo/remote:rustls-0.17.0.BUILD.bazel"), + sha256 = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81", + strip_prefix = "rustls-0.18.1", + build_file = Label("//cargo/remote:rustls-0.18.1.BUILD.bazel"), + ) + + maybe( + http_archive, + name = "raze__rustls_native_certs__0_4_0", + url = "https://crates.io/api/v1/crates/rustls-native-certs/0.4.0/download", + type = "tar.gz", + sha256 = "629d439a7672da82dd955498445e496ee2096fe2117b9f796558a43fdb9e59b8", + strip_prefix = "rustls-native-certs-0.4.0", + build_file = Label("//cargo/remote:rustls-native-certs-0.4.0.BUILD.bazel"), ) maybe( @@ -1751,6 +1791,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:ryu-1.0.5.BUILD.bazel"), ) + maybe( + http_archive, + name = "raze__schannel__0_1_19", + url = "https://crates.io/api/v1/crates/schannel/0.1.19/download", + type = "tar.gz", + sha256 = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75", + strip_prefix = "schannel-0.1.19", + build_file = Label("//cargo/remote:schannel-0.1.19.BUILD.bazel"), + ) + maybe( http_archive, name = "raze__scopeguard__1_1_0", @@ -1771,6 +1821,26 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:sct-0.6.0.BUILD.bazel"), ) + maybe( + http_archive, + name = "raze__security_framework__1_0_0", + url = "https://crates.io/api/v1/crates/security-framework/1.0.0/download", + type = "tar.gz", + sha256 = "ad502866817f0575705bd7be36e2b2535cc33262d493aa733a2ec862baa2bc2b", + strip_prefix = "security-framework-1.0.0", + build_file = Label("//cargo/remote:security-framework-1.0.0.BUILD.bazel"), + ) + + maybe( + http_archive, + name = "raze__security_framework_sys__1_0_0", + url = "https://crates.io/api/v1/crates/security-framework-sys/1.0.0/download", + type = "tar.gz", + sha256 = "51ceb04988b17b6d1dcd555390fa822ca5637b4a14e1f5099f13d351bed4d6c7", + strip_prefix = "security-framework-sys-1.0.0", + build_file = Label("//cargo/remote:security-framework-sys-1.0.0.BUILD.bazel"), + ) + maybe( http_archive, name = "raze__serde__1_0_117", @@ -2132,22 +2202,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__tokio_rustls__0_13_1", - url = "https://crates.io/api/v1/crates/tokio-rustls/0.13.1/download", + name = "raze__tokio_rustls__0_14_1", + url = "https://crates.io/api/v1/crates/tokio-rustls/0.14.1/download", type = "tar.gz", - sha256 = "15cb62a0d2770787abc96e99c1cd98fcf17f94959f3af63ca85bdfb203f051b4", - strip_prefix = "tokio-rustls-0.13.1", - build_file = Label("//cargo/remote:tokio-rustls-0.13.1.BUILD.bazel"), + sha256 = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a", + strip_prefix = "tokio-rustls-0.14.1", + build_file = Label("//cargo/remote:tokio-rustls-0.14.1.BUILD.bazel"), ) maybe( http_archive, - name = "raze__tokio_socks__0_2_2", - url = "https://crates.io/api/v1/crates/tokio-socks/0.2.2/download", + name = "raze__tokio_socks__0_3_0", + url = "https://crates.io/api/v1/crates/tokio-socks/0.3.0/download", type = "tar.gz", - sha256 = "1997788a0e25e09300e44680ba1ef9d44d6f634a883641f80109e8b59c928daf", - strip_prefix = "tokio-socks-0.2.2", - build_file = Label("//cargo/remote:tokio-socks-0.2.2.BUILD.bazel"), + sha256 = "d611fd5d241872372d52a0a3d309c52d0b95a6a67671a6c8f7ab2c4a37fb2539", + strip_prefix = "tokio-socks-0.3.0", + build_file = Label("//cargo/remote:tokio-socks-0.3.0.BUILD.bazel"), ) maybe( @@ -2500,26 +2570,6 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:webpki-0.21.3.BUILD.bazel"), ) - maybe( - http_archive, - name = "raze__webpki_roots__0_18_0", - url = "https://crates.io/api/v1/crates/webpki-roots/0.18.0/download", - type = "tar.gz", - sha256 = "91cd5736df7f12a964a5067a12c62fa38e1bd8080aff1f80bc29be7c80d19ab4", - strip_prefix = "webpki-roots-0.18.0", - build_file = Label("//cargo/remote:webpki-roots-0.18.0.BUILD.bazel"), - ) - - maybe( - http_archive, - name = "raze__webpki_roots__0_19_0", - url = "https://crates.io/api/v1/crates/webpki-roots/0.19.0/download", - type = "tar.gz", - sha256 = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739", - strip_prefix = "webpki-roots-0.19.0", - build_file = Label("//cargo/remote:webpki-roots-0.19.0.BUILD.bazel"), - ) - maybe( http_archive, name = "raze__which__4_0_2", @@ -2592,12 +2642,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__winreg__0_6_2", - url = "https://crates.io/api/v1/crates/winreg/0.6.2/download", + name = "raze__winreg__0_7_0", + url = "https://crates.io/api/v1/crates/winreg/0.7.0/download", type = "tar.gz", - sha256 = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9", - strip_prefix = "winreg-0.6.2", - build_file = Label("//cargo/remote:winreg-0.6.2.BUILD.bazel"), + sha256 = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69", + strip_prefix = "winreg-0.7.0", + build_file = Label("//cargo/remote:winreg-0.7.0.BUILD.bazel"), ) maybe( diff --git a/cargo/remote/anyhow-1.0.33.BUILD.bazel b/cargo/remote/anyhow-1.0.34.BUILD.bazel similarity index 98% rename from cargo/remote/anyhow-1.0.33.BUILD.bazel rename to cargo/remote/anyhow-1.0.34.BUILD.bazel index 0b0b1ed40..cb9148b0e 100644 --- a/cargo/remote/anyhow-1.0.33.BUILD.bazel +++ b/cargo/remote/anyhow-1.0.34.BUILD.bazel @@ -57,7 +57,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.0.33", + version = "1.0.34", visibility = ["//visibility:private"], ) @@ -75,7 +75,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "1.0.33", + version = "1.0.34", tags = [ "cargo-raze", "manual", diff --git a/cargo/remote/base64-0.11.0.BUILD.bazel b/cargo/remote/base64-0.13.0.BUILD.bazel similarity index 94% rename from cargo/remote/base64-0.11.0.BUILD.bazel rename to cargo/remote/base64-0.13.0.BUILD.bazel index 179ee43bb..a2978e26e 100644 --- a/cargo/remote/base64-0.11.0.BUILD.bazel +++ b/cargo/remote/base64-0.13.0.BUILD.bazel @@ -29,6 +29,7 @@ licenses([ ]) # Generated targets +# Unsupported target "base64" with type "example" omitted # buildifier: leave-alone rust_library( @@ -42,7 +43,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.11.0", + version = "0.13.0", tags = [ "cargo-raze", "manual", diff --git a/cargo/remote/core-foundation-0.7.0.BUILD.bazel b/cargo/remote/core-foundation-0.7.0.BUILD.bazel new file mode 100644 index 000000000..38abcea78 --- /dev/null +++ b/cargo/remote/core-foundation-0.7.0.BUILD.bazel @@ -0,0 +1,55 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated targets + +# buildifier: leave-alone +rust_library( + name = "core_foundation", + crate_type = "lib", + deps = [ + "@raze__core_foundation_sys__0_7_0//:core_foundation_sys", + "@raze__libc__0_2_80//:libc", + ], + srcs = glob(["**/*.rs"]), + crate_root = "src/lib.rs", + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + version = "0.7.0", + tags = [ + "cargo-raze", + "manual", + ], + crate_features = [ + ], +) +# Unsupported target "use_macro_outside_crate" with type "test" omitted diff --git a/cargo/remote/webpki-roots-0.19.0.BUILD.bazel b/cargo/remote/core-foundation-sys-0.7.0.BUILD.bazel similarity index 65% rename from cargo/remote/webpki-roots-0.19.0.BUILD.bazel rename to cargo/remote/core-foundation-sys-0.7.0.BUILD.bazel index e4642a9fa..d8f3297e6 100644 --- a/cargo/remote/webpki-roots-0.19.0.BUILD.bazel +++ b/cargo/remote/core-foundation-sys-0.7.0.BUILD.bazel @@ -25,50 +25,55 @@ package(default_visibility = [ ]) licenses([ - "reciprocal", # MPL-2.0 from expression "MPL-2.0" + "notice", # MIT from expression "MIT OR Apache-2.0" ]) # Generated targets +# buildifier: disable=load-on-top +load( + "@io_bazel_rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) # buildifier: leave-alone -rust_binary( - # Prefix bin name to disambiguate from (probable) collision with lib name - # N.B.: The exact form of this is subject to change. - name = "cargo_bin_process_cert", - deps = [ - # Binaries get an implicit dependency on their crate's lib - ":webpki_roots", - "@raze__webpki__0_21_3//:webpki", - ], +cargo_build_script( + name = "core_foundation_sys_build_script", srcs = glob(["**/*.rs"]), - crate_root = "src/bin/process_cert.rs", - edition = "2018", + crate_root = "build.rs", + edition = "2015", + deps = [ + ], rustc_flags = [ "--cap-lints=allow", ], - version = "0.19.0", + crate_features = [ + ], + build_script_env = { + }, + data = glob(["**"]), tags = [ "cargo-raze", "manual", ], - crate_features = [ - ], + version = "0.7.0", + visibility = ["//visibility:private"], ) + # buildifier: leave-alone rust_library( - name = "webpki_roots", + name = "core_foundation_sys", crate_type = "lib", deps = [ - "@raze__webpki__0_21_3//:webpki", + ":core_foundation_sys_build_script", ], srcs = glob(["**/*.rs"]), crate_root = "src/lib.rs", - edition = "2018", + edition = "2015", rustc_flags = [ "--cap-lints=allow", ], - version = "0.19.0", + version = "0.7.0", tags = [ "cargo-raze", "manual", diff --git a/cargo/remote/hyper-0.13.8.BUILD.bazel b/cargo/remote/hyper-0.13.9.BUILD.bazel similarity index 82% rename from cargo/remote/hyper-0.13.8.BUILD.bazel rename to cargo/remote/hyper-0.13.9.BUILD.bazel index 03fa5518e..c9ea23a64 100644 --- a/cargo/remote/hyper-0.13.8.BUILD.bazel +++ b/cargo/remote/hyper-0.13.9.BUILD.bazel @@ -55,31 +55,40 @@ rust_library( "@raze__httparse__1_3_4//:httparse", "@raze__httpdate__0_3_2//:httpdate", "@raze__itoa__0_4_6//:itoa", - "@raze__pin_project__0_4_27//:pin_project", + "@raze__pin_project__1_0_1//:pin_project", "@raze__socket2__0_3_15//:socket2", "@raze__tokio__0_2_22//:tokio", "@raze__tower_service__0_3_0//:tower_service", "@raze__tracing__0_1_21//:tracing", "@raze__want__0_3_0//:want", - ], + ] + selects.with_or({ + # cfg(any(target_os = "linux", target_os = "macos")) + ( + "@io_bazel_rules_rust//rust/platform:i686-apple-darwin", + "@io_bazel_rules_rust//rust/platform:i686-unknown-linux-gnu", + "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", + "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", + ): [ + ], + "//conditions:default": [], + }), srcs = glob(["**/*.rs"]), crate_root = "src/lib.rs", edition = "2018", rustc_flags = [ "--cap-lints=allow", ], - version = "0.13.8", + version = "0.13.9", tags = [ "cargo-raze", "manual", ], crate_features = [ - "default", - "runtime", "socket2", - "stream", "tcp", ], + aliases = { + }, ) # Unsupported target "integration" with type "test" omitted # Unsupported target "multi_server" with type "example" omitted @@ -88,6 +97,7 @@ rust_library( # Unsupported target "send_file" with type "example" omitted # Unsupported target "server" with type "bench" omitted # Unsupported target "server" with type "test" omitted +# Unsupported target "service_struct_impl" with type "example" omitted # Unsupported target "single_threaded" with type "example" omitted # Unsupported target "state" with type "example" omitted # Unsupported target "tower_client" with type "example" omitted diff --git a/cargo/remote/hyper-rustls-0.20.0.BUILD.bazel b/cargo/remote/hyper-rustls-0.21.0.BUILD.bazel similarity index 79% rename from cargo/remote/hyper-rustls-0.20.0.BUILD.bazel rename to cargo/remote/hyper-rustls-0.21.0.BUILD.bazel index a9894ac84..1761932df 100644 --- a/cargo/remote/hyper-rustls-0.20.0.BUILD.bazel +++ b/cargo/remote/hyper-rustls-0.21.0.BUILD.bazel @@ -37,15 +37,13 @@ rust_library( crate_type = "lib", deps = [ "@raze__bytes__0_5_6//:bytes", - "@raze__ct_logs__0_6_0//:ct_logs", "@raze__futures_util__0_3_7//:futures_util", - "@raze__hyper__0_13_8//:hyper", + "@raze__hyper__0_13_9//:hyper", "@raze__log__0_4_11//:log", - "@raze__rustls__0_17_0//:rustls", + "@raze__rustls__0_18_1//:rustls", "@raze__tokio__0_2_22//:tokio", - "@raze__tokio_rustls__0_13_1//:tokio_rustls", + "@raze__tokio_rustls__0_14_1//:tokio_rustls", "@raze__webpki__0_21_3//:webpki", - "@raze__webpki_roots__0_19_0//:webpki_roots", ], srcs = glob(["**/*.rs"]), crate_root = "src/lib.rs", @@ -53,16 +51,12 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.20.0", + version = "0.21.0", tags = [ "cargo-raze", "manual", ], crate_features = [ - "ct-logs", - "tokio-runtime", - "webpki-roots", - "webpki-tokio", ], ) # Unsupported target "server" with type "example" omitted diff --git a/cargo/remote/hyper-timeout-0.3.1.BUILD.bazel b/cargo/remote/hyper-timeout-0.3.1.BUILD.bazel index 76d0de098..0f8e61883 100644 --- a/cargo/remote/hyper-timeout-0.3.1.BUILD.bazel +++ b/cargo/remote/hyper-timeout-0.3.1.BUILD.bazel @@ -37,7 +37,7 @@ rust_library( crate_type = "lib", deps = [ "@raze__bytes__0_5_6//:bytes", - "@raze__hyper__0_13_8//:hyper", + "@raze__hyper__0_13_9//:hyper", "@raze__tokio__0_2_22//:tokio", "@raze__tokio_io_timeout__0_4_0//:tokio_io_timeout", ], diff --git a/cargo/remote/ct-logs-0.6.0.BUILD.bazel b/cargo/remote/ipnet-2.3.0.BUILD.bazel similarity index 83% rename from cargo/remote/ct-logs-0.6.0.BUILD.bazel rename to cargo/remote/ipnet-2.3.0.BUILD.bazel index 9a4eaefe5..0aae854ac 100644 --- a/cargo/remote/ct-logs-0.6.0.BUILD.bazel +++ b/cargo/remote/ipnet-2.3.0.BUILD.bazel @@ -25,25 +25,24 @@ package(default_visibility = [ ]) licenses([ - "notice", # Apache-2.0 from expression "Apache-2.0 OR (ISC OR MIT)" + "notice", # MIT from expression "MIT OR Apache-2.0" ]) # Generated targets # buildifier: leave-alone rust_library( - name = "ct_logs", + name = "ipnet", crate_type = "lib", deps = [ - "@raze__sct__0_6_0//:sct", ], srcs = glob(["**/*.rs"]), crate_root = "src/lib.rs", - edition = "2018", + edition = "2015", rustc_flags = [ "--cap-lints=allow", ], - version = "0.6.0", + version = "2.3.0", tags = [ "cargo-raze", "manual", diff --git a/cargo/remote/openssl-probe-0.1.2.BUILD.bazel b/cargo/remote/openssl-probe-0.1.2.BUILD.bazel new file mode 100644 index 000000000..3dc0e8b05 --- /dev/null +++ b/cargo/remote/openssl-probe-0.1.2.BUILD.bazel @@ -0,0 +1,52 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated targets + +# buildifier: leave-alone +rust_library( + name = "openssl_probe", + crate_type = "lib", + deps = [ + ], + srcs = glob(["**/*.rs"]), + crate_root = "src/lib.rs", + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + version = "0.1.2", + tags = [ + "cargo-raze", + "manual", + ], + crate_features = [ + ], +) diff --git a/cargo/remote/prost-derive-0.6.1.BUILD.bazel b/cargo/remote/prost-derive-0.6.1.BUILD.bazel index dacb1ddfa..c61ce331e 100644 --- a/cargo/remote/prost-derive-0.6.1.BUILD.bazel +++ b/cargo/remote/prost-derive-0.6.1.BUILD.bazel @@ -35,7 +35,7 @@ rust_library( name = "prost_derive", crate_type = "proc-macro", deps = [ - "@raze__anyhow__1_0_33//:anyhow", + "@raze__anyhow__1_0_34//:anyhow", "@raze__itertools__0_9_0//:itertools", "@raze__proc_macro2__1_0_24//:proc_macro2", "@raze__quote__1_0_7//:quote", diff --git a/cargo/remote/reqwest-0.10.4.BUILD.bazel b/cargo/remote/reqwest-0.10.8.BUILD.bazel similarity index 84% rename from cargo/remote/reqwest-0.10.4.BUILD.bazel rename to cargo/remote/reqwest-0.10.8.BUILD.bazel index f94480093..a64c908c7 100644 --- a/cargo/remote/reqwest-0.10.4.BUILD.bazel +++ b/cargo/remote/reqwest-0.10.8.BUILD.bazel @@ -51,8 +51,10 @@ rust_library( "@raze__bytes__0_5_6//:bytes", "@raze__http__0_2_1//:http", "@raze__hyper_timeout__0_3_1//:hyper_timeout", + "@raze__mime_guess__2_0_3//:mime_guess", "@raze__serde__1_0_117//:serde", "@raze__serde_json__1_0_59//:serde_json", + "@raze__serde_urlencoded__0_6_1//:serde_urlencoded", "@raze__url__2_1_1//:url", ] + selects.with_or({ # cfg(not(target_arch = "wasm32")) @@ -66,25 +68,24 @@ rust_library( "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__base64__0_12_3//:base64", + "@raze__base64__0_13_0//:base64", "@raze__encoding_rs__0_8_26//:encoding_rs", "@raze__futures_core__0_3_7//:futures_core", "@raze__futures_util__0_3_7//:futures_util", "@raze__http_body__0_3_1//:http_body", - "@raze__hyper__0_13_8//:hyper", - "@raze__hyper_rustls__0_20_0//:hyper_rustls", + "@raze__hyper__0_13_9//:hyper", + "@raze__hyper_rustls__0_21_0//:hyper_rustls", + "@raze__ipnet__2_3_0//:ipnet", "@raze__lazy_static__1_4_0//:lazy_static", "@raze__log__0_4_11//:log", "@raze__mime__0_3_16//:mime", - "@raze__mime_guess__2_0_3//:mime_guess", "@raze__percent_encoding__2_1_0//:percent_encoding", "@raze__pin_project_lite__0_1_11//:pin_project_lite", - "@raze__rustls__0_17_0//:rustls", - "@raze__serde_urlencoded__0_6_1//:serde_urlencoded", + "@raze__rustls__0_18_1//:rustls", + "@raze__rustls_native_certs__0_4_0//:rustls_native_certs", "@raze__tokio__0_2_22//:tokio", - "@raze__tokio_rustls__0_13_1//:tokio_rustls", - "@raze__tokio_socks__0_2_2//:tokio_socks", - "@raze__webpki_roots__0_18_0//:webpki_roots", + "@raze__tokio_rustls__0_14_1//:tokio_rustls", + "@raze__tokio_socks__0_3_0//:tokio_socks", ], "//conditions:default": [], }) + selects.with_or({ @@ -93,7 +94,7 @@ rust_library( "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", ): [ - "@raze__winreg__0_6_2//:winreg", + "@raze__winreg__0_7_0//:winreg", ], "//conditions:default": [], }), @@ -103,23 +104,24 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.10.4", + version = "0.10.8", tags = [ "cargo-raze", "manual", ], crate_features = [ + "__rustls", "__tls", "hyper-rustls", "json", "rustls", - "rustls-tls", + "rustls-native-certs", + "rustls-tls-native-roots", "serde_json", "socks", "stream", "tokio-rustls", "tokio-socks", - "webpki-roots", ], aliases = { }, diff --git a/cargo/remote/rustls-0.17.0.BUILD.bazel b/cargo/remote/rustls-0.18.1.BUILD.bazel similarity index 85% rename from cargo/remote/rustls-0.17.0.BUILD.bazel rename to cargo/remote/rustls-0.18.1.BUILD.bazel index ad6ac2753..25c4a5a0b 100644 --- a/cargo/remote/rustls-0.17.0.BUILD.bazel +++ b/cargo/remote/rustls-0.18.1.BUILD.bazel @@ -34,13 +34,14 @@ licenses([ # Unsupported target "benchmarks" with type "bench" omitted # Unsupported target "benchmarks" with type "test" omitted # Unsupported target "bogo_shim" with type "example" omitted +# Unsupported target "limitedclient" with type "example" omitted # buildifier: leave-alone rust_library( name = "rustls", crate_type = "lib", deps = [ - "@raze__base64__0_11_0//:base64", + "@raze__base64__0_12_3//:base64", "@raze__log__0_4_11//:log", "@raze__ring__0_16_15//:ring", "@raze__sct__0_6_0//:sct", @@ -52,7 +53,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.17.0", + version = "0.18.1", tags = [ "cargo-raze", "manual", @@ -64,4 +65,6 @@ rust_library( "logging", ], ) +# Unsupported target "simple_0rtt_client" with type "example" omitted +# Unsupported target "simpleclient" with type "example" omitted # Unsupported target "trytls_shim" with type "example" omitted diff --git a/cargo/remote/rustls-native-certs-0.4.0.BUILD.bazel b/cargo/remote/rustls-native-certs-0.4.0.BUILD.bazel new file mode 100644 index 000000000..d235504e0 --- /dev/null +++ b/cargo/remote/rustls-native-certs-0.4.0.BUILD.bazel @@ -0,0 +1,87 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # Apache-2.0 from expression "Apache-2.0 OR (ISC OR MIT)" +]) + +# Generated targets +# Unsupported target "compare_mozilla" with type "test" omitted +# Unsupported target "google" with type "example" omitted + +# buildifier: leave-alone +rust_library( + name = "rustls_native_certs", + crate_type = "lib", + deps = [ + "@raze__rustls__0_18_1//:rustls", + ] + selects.with_or({ + # cfg(all(unix, not(target_os = "macos"))) + ( + "@io_bazel_rules_rust//rust/platform:aarch64-apple-ios", + "@io_bazel_rules_rust//rust/platform:i686-unknown-linux-gnu", + "@io_bazel_rules_rust//rust/platform:x86_64-apple-ios", + "@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu", + ): [ + "@raze__openssl_probe__0_1_2//:openssl_probe", + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(target_os = "macos") + ( + "@io_bazel_rules_rust//rust/platform:i686-apple-darwin", + "@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin", + ): [ + "@raze__security_framework__1_0_0//:security_framework", + ], + "//conditions:default": [], + }) + selects.with_or({ + # cfg(windows) + ( + "@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc", + "@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc", + ): [ + "@raze__schannel__0_1_19//:schannel", + ], + "//conditions:default": [], + }), + srcs = glob(["**/*.rs"]), + crate_root = "src/lib.rs", + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + version = "0.4.0", + tags = [ + "cargo-raze", + "manual", + ], + crate_features = [ + ], + aliases = { + }, +) +# Unsupported target "smoketests" with type "test" omitted diff --git a/cargo/remote/schannel-0.1.19.BUILD.bazel b/cargo/remote/schannel-0.1.19.BUILD.bazel new file mode 100644 index 000000000..ceb0314ad --- /dev/null +++ b/cargo/remote/schannel-0.1.19.BUILD.bazel @@ -0,0 +1,54 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated targets + +# buildifier: leave-alone +rust_library( + name = "schannel", + crate_type = "lib", + deps = [ + "@raze__lazy_static__1_4_0//:lazy_static", + "@raze__winapi__0_3_9//:winapi", + ], + srcs = glob(["**/*.rs"]), + crate_root = "src/lib.rs", + edition = "2015", + rustc_flags = [ + "--cap-lints=allow", + ], + version = "0.1.19", + tags = [ + "cargo-raze", + "manual", + ], + crate_features = [ + ], +) diff --git a/cargo/remote/security-framework-1.0.0.BUILD.bazel b/cargo/remote/security-framework-1.0.0.BUILD.bazel new file mode 100644 index 000000000..cc8a0dfd3 --- /dev/null +++ b/cargo/remote/security-framework-1.0.0.BUILD.bazel @@ -0,0 +1,62 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated targets +# Unsupported target "client" with type "example" omitted +# Unsupported target "find_internet_password" with type "example" omitted + +# buildifier: leave-alone +rust_library( + name = "security_framework", + crate_type = "lib", + deps = [ + "@raze__bitflags__1_2_1//:bitflags", + "@raze__core_foundation__0_7_0//:core_foundation", + "@raze__core_foundation_sys__0_7_0//:core_foundation_sys", + "@raze__libc__0_2_80//:libc", + "@raze__security_framework_sys__1_0_0//:security_framework_sys", + ], + srcs = glob(["**/*.rs"]), + crate_root = "src/lib.rs", + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + version = "1.0.0", + tags = [ + "cargo-raze", + "manual", + ], + crate_features = [ + "OSX_10_9", + "default", + ], +) +# Unsupported target "set_internet_password" with type "example" omitted diff --git a/cargo/remote/security-framework-sys-1.0.0.BUILD.bazel b/cargo/remote/security-framework-sys-1.0.0.BUILD.bazel new file mode 100644 index 000000000..619d066b0 --- /dev/null +++ b/cargo/remote/security-framework-sys-1.0.0.BUILD.bazel @@ -0,0 +1,55 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load( + "@io_bazel_rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated targets + +# buildifier: leave-alone +rust_library( + name = "security_framework_sys", + crate_type = "lib", + deps = [ + "@raze__core_foundation_sys__0_7_0//:core_foundation_sys", + "@raze__libc__0_2_80//:libc", + ], + srcs = glob(["**/*.rs"]), + crate_root = "src/lib.rs", + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + version = "1.0.0", + tags = [ + "cargo-raze", + "manual", + ], + crate_features = [ + "OSX_10_9", + ], +) diff --git a/cargo/remote/tokio-rustls-0.13.1.BUILD.bazel b/cargo/remote/tokio-rustls-0.14.1.BUILD.bazel similarity index 95% rename from cargo/remote/tokio-rustls-0.13.1.BUILD.bazel rename to cargo/remote/tokio-rustls-0.14.1.BUILD.bazel index 8c85478ec..ddad9cc3c 100644 --- a/cargo/remote/tokio-rustls-0.13.1.BUILD.bazel +++ b/cargo/remote/tokio-rustls-0.14.1.BUILD.bazel @@ -39,7 +39,7 @@ rust_library( crate_type = "lib", deps = [ "@raze__futures_core__0_3_7//:futures_core", - "@raze__rustls__0_17_0//:rustls", + "@raze__rustls__0_18_1//:rustls", "@raze__tokio__0_2_22//:tokio", "@raze__webpki__0_21_3//:webpki", ], @@ -49,7 +49,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.13.1", + version = "0.14.1", tags = [ "cargo-raze", "manual", diff --git a/cargo/remote/tokio-socks-0.2.2.BUILD.bazel b/cargo/remote/tokio-socks-0.3.0.BUILD.bazel similarity index 94% rename from cargo/remote/tokio-socks-0.2.2.BUILD.bazel rename to cargo/remote/tokio-socks-0.3.0.BUILD.bazel index 153f28d9e..0342f918f 100644 --- a/cargo/remote/tokio-socks-0.2.2.BUILD.bazel +++ b/cargo/remote/tokio-socks-0.3.0.BUILD.bazel @@ -32,6 +32,7 @@ licenses([ # Unsupported target "common" with type "test" omitted # Unsupported target "long_username_password_auth" with type "test" omitted # Unsupported target "no_auth" with type "test" omitted +# Unsupported target "socket" with type "example" omitted # buildifier: leave-alone rust_library( @@ -50,7 +51,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.2.2", + version = "0.3.0", tags = [ "cargo-raze", "manual", diff --git a/cargo/remote/web-sys-0.3.45.BUILD.bazel b/cargo/remote/web-sys-0.3.45.BUILD.bazel index e804a22e4..4ea2f9743 100644 --- a/cargo/remote/web-sys-0.3.45.BUILD.bazel +++ b/cargo/remote/web-sys-0.3.45.BUILD.bazel @@ -51,9 +51,12 @@ rust_library( "manual", ], crate_features = [ + "Blob", + "BlobPropertyBag", "Crypto", "Event", "EventTarget", + "FormData", "Headers", "MessageEvent", "Request", diff --git a/cargo/remote/webpki-roots-0.18.0.BUILD.bazel b/cargo/remote/webpki-roots-0.18.0.BUILD.bazel deleted file mode 100644 index 61f7b6d8e..000000000 --- a/cargo/remote/webpki-roots-0.18.0.BUILD.bazel +++ /dev/null @@ -1,78 +0,0 @@ -""" -@generated -cargo-raze crate build file. - -DO NOT EDIT! Replaced on runs of cargo-raze -""" - -# buildifier: disable=load -load( - "@io_bazel_rules_rust//rust:rust.bzl", - "rust_binary", - "rust_library", - "rust_test", -) - -# buildifier: disable=load -load("@bazel_skylib//lib:selects.bzl", "selects") - -package(default_visibility = [ - # Public for visibility by "@raze__crate__version//" targets. - # - # Prefer access through "//cargo", which limits external - # visibility to explicit Cargo.toml dependencies. - "//visibility:public", -]) - -licenses([ - "reciprocal", # MPL-2.0 from expression "MPL-2.0" -]) - -# Generated targets - -# buildifier: leave-alone -rust_binary( - # Prefix bin name to disambiguate from (probable) collision with lib name - # N.B.: The exact form of this is subject to change. - name = "cargo_bin_process_cert", - deps = [ - # Binaries get an implicit dependency on their crate's lib - ":webpki_roots", - "@raze__webpki__0_21_3//:webpki", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/bin/process_cert.rs", - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.18.0", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) - -# buildifier: leave-alone -rust_library( - name = "webpki_roots", - crate_type = "lib", - deps = [ - "@raze__webpki__0_21_3//:webpki", - ], - srcs = glob(["**/*.rs"]), - crate_root = "src/lib.rs", - edition = "2018", - rustc_flags = [ - "--cap-lints=allow", - ], - version = "0.18.0", - tags = [ - "cargo-raze", - "manual", - ], - crate_features = [ - ], -) diff --git a/cargo/remote/winapi-0.3.9.BUILD.bazel b/cargo/remote/winapi-0.3.9.BUILD.bazel index 73c72bf6f..27a5827a9 100644 --- a/cargo/remote/winapi-0.3.9.BUILD.bazel +++ b/cargo/remote/winapi-0.3.9.BUILD.bazel @@ -54,6 +54,8 @@ cargo_build_script( "impl-debug", "impl-default", "knownfolders", + "lmcons", + "minschannel", "minwinbase", "minwindef", "ntdef", @@ -62,12 +64,16 @@ cargo_build_script( "objbase", "processenv", "profileapi", + "schannel", + "securitybaseapi", "shlobj", + "sspi", "std", "sysinfoapi", "timezoneapi", "winbase", "wincon", + "wincrypt", "winerror", "winnt", "winreg", @@ -115,6 +121,8 @@ rust_library( "impl-debug", "impl-default", "knownfolders", + "lmcons", + "minschannel", "minwinbase", "minwindef", "ntdef", @@ -123,12 +131,16 @@ rust_library( "objbase", "processenv", "profileapi", + "schannel", + "securitybaseapi", "shlobj", + "sspi", "std", "sysinfoapi", "timezoneapi", "winbase", "wincon", + "wincrypt", "winerror", "winnt", "winreg", diff --git a/cargo/remote/winreg-0.6.2.BUILD.bazel b/cargo/remote/winreg-0.7.0.BUILD.bazel similarity index 98% rename from cargo/remote/winreg-0.6.2.BUILD.bazel rename to cargo/remote/winreg-0.7.0.BUILD.bazel index cbeb9ffb3..dff30da00 100644 --- a/cargo/remote/winreg-0.6.2.BUILD.bazel +++ b/cargo/remote/winreg-0.7.0.BUILD.bazel @@ -48,7 +48,7 @@ rust_library( rustc_flags = [ "--cap-lints=allow", ], - version = "0.6.2", + version = "0.7.0", tags = [ "cargo-raze", "manual", diff --git a/rslib/BUILD.bazel b/rslib/BUILD.bazel index 12fa6063f..a0df37844 100644 --- a/rslib/BUILD.bazel +++ b/rslib/BUILD.bazel @@ -90,7 +90,6 @@ rust_library( "//cargo:futures", "//cargo:hex", "//cargo:htmlescape", - "//cargo:hyper", "//cargo:intl_memoizer", "//cargo:itertools", "//cargo:lazy_static", diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index 39d1c7bf0..a434d1f32 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -39,7 +39,6 @@ fluent = { git = "https://github.com/ankitects/fluent-rs.git", branch="32bit-pan futures = "0.3.5" hex = "0.4.2" htmlescape = "0.3.1" -hyper = "0.13.7" intl-memoizer = { git = "https://github.com/ankitects/fluent-rs.git", branch="32bit-panic" } itertools = "0.9.0" lazy_static = "1.4.0" @@ -52,8 +51,7 @@ pin-project = "1" prost = { git = "https://github.com/danburkert/prost.git", rev = "4ded4a98ef339da0b7babd4efee3fbe8adaf746b" } rand = "0.7.3" regex = "1.3.9" -#reqwest = { git = "https://github.com/ankitects/reqwest.git", rev = "57665e2c2a39db85723ba860f1b570a608bb73f9", default-features = false, features = ["json", "socks", "stream", "native-tls-vendored"] } -reqwest = { git = "https://github.com/ankitects/reqwest.git", rev = "57665e2c2a39db85723ba860f1b570a608bb73f9", default-features = false, features = ["json", "socks", "stream", "rustls-tls"] } +reqwest = { git = "https://github.com/ankitects/reqwest.git", tag = "anki-2020-11-03", default-features = false, features = ["json", "socks", "stream", "rustls-tls-native-roots"] } rusqlite = { version = "0.24.1", features = ["trace", "functions", "collation", "bundled" ] } scopeguard = "1.1.0" serde = "1.0.114"