diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8b4ec77d7b..40f67a1e41 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -120,8 +120,8 @@ jobs: with: version: ${{ env.CARGO_MAKE_VERSION }} - - name: cargo make all-features - run: cargo make all-features + - name: cargo make no-default-features + run: cargo make no-default-features - name: cargo make build-bench if: matrix.version == 'nightly' diff --git a/CHANGELOG.md b/CHANGELOG.md index d6174d7198..32e4d2ca81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,17 @@ This project adheres to [Semantic Versioning](http://semver.org/). All notes should be prepended with the location of the change, e.g. `(proto)` or `(resolver)`. +## 0.20.4 + +### Fixed + +- (all) updated tokio dependencies to 1.16 #1623 +- (all) removed audit chrono due to rustsec audit failure (backport) #1623 + +### Changed + +- (all) Increased MSRV to 1.51 + ## 0.20.3 ### Fixed diff --git a/Cargo.lock b/Cargo.lock index cf1f0876ff..2f7ebb1484 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -165,7 +165,7 @@ dependencies = [ [[package]] name = "async-std-resolver" -version = "0.20.3" +version = "0.20.4" dependencies = [ "async-std", "async-trait", @@ -686,7 +686,7 @@ checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747" dependencies = [ "bytes", "fnv", - "itoa 0.4.7", + "itoa", ] [[package]] @@ -749,12 +749,6 @@ version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" -[[package]] -name = "itoa" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" - [[package]] name = "js-sys" version = "0.3.48" @@ -937,15 +931,6 @@ dependencies = [ "libc", ] -[[package]] -name = "num_threads" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ba99ba6393e2c3734791401b66902d981cb03bf190af674ca69949b6d5fb15" -dependencies = [ - "libc", -] - [[package]] name = "object" version = "0.23.0" @@ -1493,13 +1478,12 @@ dependencies = [ [[package]] name = "time" -version = "0.3.7" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" +checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" dependencies = [ - "itoa 1.0.1", + "itoa", "libc", - "num_threads", "time-macros", ] @@ -1629,7 +1613,7 @@ dependencies = [ [[package]] name = "trust-dns" -version = "0.20.3" +version = "0.20.4" dependencies = [ "clap", "env_logger", @@ -1653,7 +1637,7 @@ dependencies = [ [[package]] name = "trust-dns-client" -version = "0.20.3" +version = "0.20.4" dependencies = [ "cfg-if 1.0.0", "data-encoding", @@ -1678,7 +1662,7 @@ dependencies = [ [[package]] name = "trust-dns-compatibility" -version = "0.20.3" +version = "0.20.4" dependencies = [ "data-encoding", "env_logger", @@ -1691,7 +1675,7 @@ dependencies = [ [[package]] name = "trust-dns-https" -version = "0.20.3" +version = "0.20.4" dependencies = [ "bytes", "cfg-if 1.0.0", @@ -1714,7 +1698,7 @@ dependencies = [ [[package]] name = "trust-dns-integration" -version = "0.20.3" +version = "0.20.4" dependencies = [ "env_logger", "futures", @@ -1738,7 +1722,7 @@ dependencies = [ [[package]] name = "trust-dns-native-tls" -version = "0.20.3" +version = "0.20.4" dependencies = [ "futures-channel", "futures-util", @@ -1750,7 +1734,7 @@ dependencies = [ [[package]] name = "trust-dns-openssl" -version = "0.20.3" +version = "0.20.4" dependencies = [ "futures-channel", "futures-util", @@ -1762,7 +1746,7 @@ dependencies = [ [[package]] name = "trust-dns-proto" -version = "0.20.3" +version = "0.20.4" dependencies = [ "async-trait", "backtrace", @@ -1794,7 +1778,7 @@ dependencies = [ [[package]] name = "trust-dns-resolver" -version = "0.20.3" +version = "0.20.4" dependencies = [ "cfg-if 1.0.0", "env_logger", @@ -1824,7 +1808,7 @@ dependencies = [ [[package]] name = "trust-dns-rustls" -version = "0.20.3" +version = "0.20.4" dependencies = [ "futures-channel", "futures-io", @@ -1840,7 +1824,7 @@ dependencies = [ [[package]] name = "trust-dns-server" -version = "0.20.3" +version = "0.20.4" dependencies = [ "async-trait", "bytes", @@ -1872,7 +1856,7 @@ dependencies = [ [[package]] name = "trust-dns-util" -version = "0.20.3" +version = "0.20.4" dependencies = [ "clap", "console", diff --git a/bin/Cargo.toml b/bin/Cargo.toml index 56683bed83..09fc0c875b 100644 --- a/bin/Cargo.toml +++ b/bin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -77,18 +77,18 @@ log = "0.4" rustls = { version = "0.19", optional = true } time = "0.3" tokio = { version = "1.0", features = ["time"] } -trust-dns-client = { version = "0.20.3", path = "../crates/client" } -trust-dns-openssl = { version = "0.20.3", path = "../crates/openssl", optional = true } -trust-dns-proto = { version = "0.20.3", path = "../crates/proto" } -trust-dns-rustls = { version = "0.20.3", path = "../crates/rustls", optional = true } -trust-dns-server = { version = "0.20.3", path = "../crates/server" } +trust-dns-client = { version = "0.20.4", path = "../crates/client" } +trust-dns-openssl = { version = "0.20.4", path = "../crates/openssl", optional = true } +trust-dns-proto = { version = "0.20.4", path = "../crates/proto" } +trust-dns-rustls = { version = "0.20.4", path = "../crates/rustls", optional = true } +trust-dns-server = { version = "0.20.4", path = "../crates/server" } [dev-dependencies] env_logger = "0.8" native-tls = "0.2" regex = "1.3.4" -trust-dns-proto = { version = "0.20.3", path = "../crates/proto", features = ["testing"] } -trust-dns-native-tls = { version = "0.20.3", path = "../crates/native-tls" } -trust-dns-https = { version = "0.20.3", path = "../crates/https" } -trust-dns-resolver = { version = "0.20.3", path = "../crates/resolver" } +trust-dns-proto = { version = "0.20.4", path = "../crates/proto", features = ["testing"] } +trust-dns-native-tls = { version = "0.20.4", path = "../crates/native-tls" } +trust-dns-https = { version = "0.20.4", path = "../crates/https" } +trust-dns-resolver = { version = "0.20.4", path = "../crates/resolver" } webpki-roots = "0.21" diff --git a/crates/async-std-resolver/Cargo.toml b/crates/async-std-resolver/Cargo.toml index 08ca72fd61..6e0e2b7c12 100644 --- a/crates/async-std-resolver/Cargo.toml +++ b/crates/async-std-resolver/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "async-std-resolver" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -69,8 +69,8 @@ async-trait = "0.1.36" futures-io = { version = "0.3.5", default-features = false, features = ["std"] } futures-util = { version = "0.3.5", default-features = false, features = ["std"] } pin-utils = "0.1.0" -trust-dns-resolver = { version = "0.20.3", path = "../resolver", default-features = false } +trust-dns-resolver = { version = "0.20.4", path = "../resolver", default-features = false } [dev-dependencies] async-std = { version = "1.6", features = ["attributes"] } -trust-dns-resolver = { version = "0.20.3", path = "../resolver", default-features = false, features = ["testing"] } +trust-dns-resolver = { version = "0.20.4", path = "../resolver", default-features = false, features = ["testing"] } diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml index 3f8385adaf..70f23b8f77 100644 --- a/crates/client/Cargo.toml +++ b/crates/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns-client" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -81,8 +81,8 @@ serde = { version = "1.0", features = ["derive"], optional = true } thiserror = "1.0.20" time = "0.3" tokio = { version = "1.0", features = ["rt"] } -trust-dns-https = { version = "0.20.3", path = "../https", optional = true } -trust-dns-proto = { version = "0.20.3", path = "../proto", features = ["dnssec"]} +trust-dns-https = { version = "0.20.4", path = "../https", optional = true } +trust-dns-proto = { version = "0.20.4", path = "../proto", features = ["dnssec"]} webpki = { version = "0.21", optional = true } [dev-dependencies] diff --git a/crates/https/Cargo.toml b/crates/https/Cargo.toml index 36d8b2c793..b2cf0332e6 100644 --- a/crates/https/Cargo.toml +++ b/crates/https/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns-https" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -59,8 +59,8 @@ thiserror = "1.0.20" tokio = { version = "1.0", features = ["io-util", "net", "rt"] } tokio-rustls = "0.22.0" # disables default features, i.e. openssl... -trust-dns-proto = { version = "0.20.3", path = "../proto", features = ["tokio-runtime"], default-features = false } -trust-dns-rustls = { version = "0.20.3", path = "../rustls", default-features = false } +trust-dns-proto = { version = "0.20.4", path = "../proto", features = ["tokio-runtime"], default-features = false } +trust-dns-rustls = { version = "0.20.4", path = "../rustls", default-features = false } webpki-roots = "0.21" webpki = "0.21" diff --git a/crates/native-tls/Cargo.toml b/crates/native-tls/Cargo.toml index 48bba8fbbd..7a8d8500dc 100644 --- a/crates/native-tls/Cargo.toml +++ b/crates/native-tls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns-native-tls" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -53,7 +53,7 @@ native-tls = "0.2" tokio = "1.0" tokio-native-tls = "0.3.0" # disables default features, i.e. openssl... -trust-dns-proto = { version = "0.20.3", path = "../proto", features = ["tokio-runtime"], default-features = false } +trust-dns-proto = { version = "0.20.4", path = "../proto", features = ["tokio-runtime"], default-features = false } [dev-dependencies] diff --git a/crates/openssl/Cargo.toml b/crates/openssl/Cargo.toml index 76b445caea..528e481126 100644 --- a/crates/openssl/Cargo.toml +++ b/crates/openssl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns-openssl" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -52,7 +52,7 @@ futures-util = { version = "0.3.5", default-features = false, features = ["std"] openssl = { version = "0.10", features = ["v102", "v110"] } tokio-openssl = "0.6.0" tokio = "1.0" -trust-dns-proto = { version = "0.20.3", path = "../proto", features = ["openssl"] } +trust-dns-proto = { version = "0.20.4", path = "../proto", features = ["openssl"] } [dev-dependencies] openssl = { version = "0.10", features = ["v102", "v110"] } diff --git a/crates/proto/Cargo.toml b/crates/proto/Cargo.toml index 3203ff325a..b8474b43ac 100644 --- a/crates/proto/Cargo.toml +++ b/crates/proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns-proto" -version = "0.20.3" +version = "0.20.4" edition = "2018" authors = ["Benjamin Fry "] diff --git a/crates/resolver/Cargo.toml b/crates/resolver/Cargo.toml index eb036868c9..249921cfc6 100644 --- a/crates/resolver/Cargo.toml +++ b/crates/resolver/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns-resolver" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -81,11 +81,11 @@ tokio = { version = "1.0", optional = true } tokio-native-tls = { version = "0.3", optional = true } tokio-openssl = { version = "0.6.0", optional = true } tokio-rustls = { version = "0.22", optional = true } -trust-dns-https = { version = "0.20.3", path = "../https", optional = true } -trust-dns-native-tls = { version = "0.20.3", path = "../native-tls", optional = true } -trust-dns-openssl = { version = "0.20.3", path = "../openssl", optional = true } -trust-dns-proto = { version = "0.20.3", path = "../proto", default-features = false } -trust-dns-rustls = { version = "0.20.3", path = "../rustls", optional = true } +trust-dns-https = { version = "0.20.4", path = "../https", optional = true } +trust-dns-native-tls = { version = "0.20.4", path = "../native-tls", optional = true } +trust-dns-openssl = { version = "0.20.4", path = "../openssl", optional = true } +trust-dns-proto = { version = "0.20.4", path = "../proto", default-features = false } +trust-dns-rustls = { version = "0.20.4", path = "../rustls", optional = true } webpki-roots = { version = "0.21", optional = true } [target.'cfg(windows)'.dependencies] diff --git a/crates/rustls/Cargo.toml b/crates/rustls/Cargo.toml index b3230ca90d..81b695d65c 100644 --- a/crates/rustls/Cargo.toml +++ b/crates/rustls/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns-rustls" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -55,7 +55,7 @@ rustls = "0.19" tokio = { version = "1.0", features = ["io-util", "net"] } tokio-rustls = { version = "0.22", features = ["early-data"] } # disables default features, i.e. openssl... -trust-dns-proto = { version = "0.20.3", path = "../proto", features = ["tokio-runtime"], default-features = false } +trust-dns-proto = { version = "0.20.4", path = "../proto", features = ["tokio-runtime"], default-features = false } webpki = "0.21" [dev-dependencies] diff --git a/crates/server/Cargo.toml b/crates/server/Cargo.toml index 718a73ea04..c94fdb55c5 100644 --- a/crates/server/Cargo.toml +++ b/crates/server/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns-server" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -91,9 +91,9 @@ tokio = { version = "1.0", features = ["net"] } tokio-openssl = { version = "0.6.0", optional = true } tokio-rustls = { version = "0.22", optional = true } toml = "0.5" -trust-dns-client= { version = "0.20.3", path = "../client" } -trust-dns-https = { version = "0.20.3", path = "../https", optional = true } -trust-dns-proto = { version = "0.20.3", path = "../proto" } -trust-dns-openssl = { version = "0.20.3", path = "../openssl", optional = true } -trust-dns-resolver = { version = "0.20.3", path = "../resolver", features = ["serde-config"], optional = true } -trust-dns-rustls = { version = "0.20.3", path = "../rustls", optional = true } +trust-dns-client= { version = "0.20.4", path = "../client" } +trust-dns-https = { version = "0.20.4", path = "../https", optional = true } +trust-dns-proto = { version = "0.20.4", path = "../proto" } +trust-dns-openssl = { version = "0.20.4", path = "../openssl", optional = true } +trust-dns-resolver = { version = "0.20.4", path = "../resolver", features = ["serde-config"], optional = true } +trust-dns-rustls = { version = "0.20.4", path = "../rustls", optional = true } diff --git a/tests/compatibility-tests/Cargo.toml b/tests/compatibility-tests/Cargo.toml index 08170c4816..ab5c388707 100644 --- a/tests/compatibility-tests/Cargo.toml +++ b/tests/compatibility-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns-compatibility" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -52,4 +52,4 @@ futures = "0.3.5" openssl = { version = "0.10", features = ["v102", "v110"] } rand = "0.8" time = "0.3" -trust-dns-client= { version = "0.20.3", path="../../crates/client", features = ["dnssec-openssl"] } +trust-dns-client= { version = "0.20.4", path="../../crates/client", features = ["dnssec-openssl"] } diff --git a/tests/integration-tests/Cargo.toml b/tests/integration-tests/Cargo.toml index 49c82de887..8ed3ef3936 100644 --- a/tests/integration-tests/Cargo.toml +++ b/tests/integration-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns-integration" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -78,14 +78,14 @@ rusqlite = { version = "0.26.0", features = ["bundled"] } rustls = "0.19" time = "0.3" tokio = { version = "1.0", features = ["time", "rt"] } -trust-dns-client= { version = "0.20.3", path = "../../crates/client" } -trust-dns-https = { version = "0.20.3", path = "../../crates/https" } -trust-dns-openssl = { version = "0.20.3", path = "../../crates/openssl" } -trust-dns-proto = { version = "0.20.3", path = "../../crates/proto", features = ["testing"] } -trust-dns-resolver = { version = "0.20.3", path = "../../crates/resolver" } -trust-dns-rustls = { version = "0.20.3", path = "../../crates/rustls" } +trust-dns-client= { version = "0.20.4", path = "../../crates/client" } +trust-dns-https = { version = "0.20.4", path = "../../crates/https" } +trust-dns-openssl = { version = "0.20.4", path = "../../crates/openssl" } +trust-dns-proto = { version = "0.20.4", path = "../../crates/proto", features = ["testing"] } +trust-dns-resolver = { version = "0.20.4", path = "../../crates/resolver" } +trust-dns-rustls = { version = "0.20.4", path = "../../crates/rustls" } # TODO: fixup tests to not require openssl -trust-dns-server = { version = "0.20.3", path = "../../crates/server" } +trust-dns-server = { version = "0.20.4", path = "../../crates/server" } webpki-roots = { version = "0.21", optional = true } [dev-dependencies] diff --git a/util/Cargo.toml b/util/Cargo.toml index 953628600a..f14b3d026b 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "trust-dns-util" -version = "0.20.3" +version = "0.20.4" authors = ["Benjamin Fry "] edition = "2018" @@ -59,9 +59,9 @@ clap = "2.33.1" console = "0.14.0" data-encoding = "2.2.0" env_logger = { version = "0.8.1", features = ["termcolor", "humantime", "atty"] } -trust-dns-client= { version = "0.20.3", features = ["dnssec-openssl"], path = "../crates/client" } -trust-dns-proto = { version = "0.20.3", features = ["dnssec-openssl"], path = "../crates/proto" } -trust-dns-resolver = { version = "0.20.3", features = ["dnssec-openssl"], path = "../crates/resolver" } +trust-dns-client= { version = "0.20.4", features = ["dnssec-openssl"], path = "../crates/client" } +trust-dns-proto = { version = "0.20.4", features = ["dnssec-openssl"], path = "../crates/proto" } +trust-dns-resolver = { version = "0.20.4", features = ["dnssec-openssl"], path = "../crates/resolver" } log = "0.4" openssl = { version = "0.10", features = ["v102", "v110"] } structopt = "0.3"