From 386b3bc3bbaf7a7abaaa2c2587b0510c161cb67a Mon Sep 17 00:00:00 2001 From: Nora Widdecke Date: Thu, 10 Dec 2020 11:04:09 +0100 Subject: Correct minimal versions. - Versions required by feature or API usage: - anyhow 1.0.5. - We use `impl From for Box`, introduced in 1.0.5. - tokio 0.2.19 - We use `tokio::net::tcp::OwnedReadHalf`, introduced in 0.2.19. - chrono 0.4.10 - We use the `std` feature, introduced in 0.4.10. - thiserror 1.0.2 - futures and futures-util 0.3.5 - tempfile 3.1 - c_doctests require the same version of rand both as direct dependency and through tempfile. - Yanked versions: - structopt 0.3.11. 0.3.8 to 0.3.10 were yanked. - socket2 0.3.16. 0.3.0 to 0.3.15 were yanked. - Update our dependencies to the package versions required by other dependencies, e.g. structopt requires lazy_static 1.4.0. - clap 2.33 - lazy_static to 1.4.0 - libc to 0.2.66 - proc-macro2 to 1.0.7 - syn to 1.0.5. - winapi 0.3.8 --- Cargo.lock | 6 +++--- buffered-reader/Cargo.toml | 2 +- core/Cargo.toml | 4 ++-- ffi-macros/Cargo.toml | 6 +++--- ffi/Cargo.toml | 8 ++++---- guide/Cargo.toml | 2 +- ipc/Cargo.toml | 20 ++++++++++---------- net/Cargo.toml | 10 +++++----- openpgp-ffi/Cargo.toml | 6 +++--- openpgp/Cargo.toml | 12 ++++++------ sop/Cargo.toml | 8 ++++---- sq/Cargo.toml | 12 ++++++------ sqv/Cargo.toml | 9 ++++----- store/Cargo.toml | 8 ++++---- 14 files changed, 56 insertions(+), 57 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 96ba0e7b..924387f4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2173,11 +2173,11 @@ checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" [[package]] name = "socket2" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1fa70dc5c8104ec096f4fe7ede7a221d35ae13dcd19ba1ad9a81d2cab9a1c44" +checksum = "2c29947abdee2a218277abeca306f25789c938e500ea5a9d4b12a5a504466902" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "redox_syscall", "winapi 0.3.9", diff --git a/buffered-reader/Cargo.toml b/buffered-reader/Cargo.toml index c00e7d39..2c424286 100644 --- a/buffered-reader/Cargo.toml +++ b/buffered-reader/Cargo.toml @@ -21,7 +21,7 @@ maintenance = { status = "actively-developed" } [dependencies] bzip2 = { version = "0.4", optional = true } flate2 = { version = "1.0.1", optional = true } -libc = "0.2.33" +libc = "0.2.66" [features] default = ["compression"] diff --git a/core/Cargo.toml b/core/Cargo.toml index 17cbe911..e9352350 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -21,7 +21,7 @@ gitlab = { repository = "sequoia-pgp/sequoia" } maintenance = { status = "actively-developed" } [dependencies] -anyhow = "1" +anyhow = "1.0.5" dirs = "2.0" tempfile = "3.1" -thiserror = "1" +thiserror = "1.0.2" diff --git a/ffi-macros/Cargo.toml b/ffi-macros/Cargo.toml index b4b33b28..976bc32c 100644 --- a/ffi-macros/Cargo.toml +++ b/ffi-macros/Cargo.toml @@ -19,13 +19,13 @@ gitlab = { repository = "sequoia-pgp/sequoia" } maintenance = { status = "actively-developed" } [dependencies] -lazy_static = "1.0.0" -proc-macro2 = "1.0" +lazy_static = "1.4.0" +proc-macro2 = "1.0.7" quote = "1.0" sha2 = "0.8" [dependencies.syn] -version = "1.0" +version = "1.0.5" features = ["full"] [lib] diff --git a/ffi/Cargo.toml b/ffi/Cargo.toml index 504d0cce..eb4d2581 100644 --- a/ffi/Cargo.toml +++ b/ffi/Cargo.toml @@ -27,12 +27,12 @@ sequoia-openpgp = { path = "../openpgp", version = "0.20", default-features = fa sequoia-core = { path = "../core", version = "0.20" } sequoia-store = { path = "../store", version = "0.20", default-features = false } sequoia-net = { path = "../net", version = "0.20", default-features = false } -anyhow = "1" -lazy_static = "1.0.0" -libc = "0.2.33" +anyhow = "1.0.5" +lazy_static = "1.4.0" +libc = "0.2.66" memsec = { version = "0.6", default-features = false } native-tls = "0.2.0" -tokio = { version = "0.2", features = ["rt-core", "io-driver", "io-util", "time"] } +tokio = { version = "0.2.19", features = ["rt-core", "io-driver", "io-util", "time"] } [dev-dependencies] filetime = "0.2" diff --git a/guide/Cargo.toml b/guide/Cargo.toml index a3daf8c8..c927a7bb 100644 --- a/guide/Cargo.toml +++ b/guide/Cargo.toml @@ -13,4 +13,4 @@ build = "build.rs" [dependencies] sequoia-openpgp = { path = "../openpgp", version = "0.20" } -anyhow = "1" +anyhow = "1.0.5" diff --git a/ipc/Cargo.toml b/ipc/Cargo.toml index 3988506f..6b443693 100644 --- a/ipc/Cargo.toml +++ b/ipc/Cargo.toml @@ -23,31 +23,31 @@ maintenance = { status = "actively-developed" } sequoia-openpgp = { path = "../openpgp", version = "0.20", default-features = false } sequoia-core = { path = "../core", version = "0.20" } -anyhow = "1" +anyhow = "1.0.5" buffered-reader = { path = "../buffered-reader", version = "0.20", default-features = false } capnp-rpc = "0.13" fs2 = "0.4.2" -futures = "0.3" +futures = "0.3.5" lalrpop-util = "0.19" -lazy_static = "1.3" -libc = "0.2.33" +lazy_static = "1.4.0" +libc = "0.2.66" memsec = { version = "0.6", default-features = false } rand = { version = "0.7", default-features = false } -tempfile = "3.0" -thiserror = "1" -tokio = { version = "0.2", features = ["rt-core", "rt-util", "tcp", "uds", "io-util", "macros"] } +tempfile = "3.1" +thiserror = "1.0.2" +tokio = { version = "0.2.19", features = ["rt-core", "rt-util", "tcp", "uds", "io-util", "macros"] } tokio-util = { version = "0.3", features = ["compat"] } -socket2 = "0.3.11" +socket2 = "0.3.16" [target.'cfg(windows)'.dependencies] -winapi = { version = "0.3", default-features = false, features = ["winsock2"] } +winapi = { version = "0.3.8", default-features = false, features = ["winsock2"] } ctor = "0.1" [build-dependencies] lalrpop = "0.19" [dev-dependencies] -clap = "2.32.0" +clap = "2.33" quickcheck = { version = "0.9", default-features = false } [features] diff --git a/net/Cargo.toml b/net/Cargo.toml index bb546e3c..9d2c9056 100644 --- a/net/Cargo.toml +++ b/net/Cargo.toml @@ -24,22 +24,22 @@ maintenance = { status = "actively-developed" } sequoia-openpgp = { path = "../openpgp", version = "0.20", default-features = false } sequoia-core = { path = "../core", version = "0.20" } -anyhow = "1" -futures-util = "0.3" +anyhow = "1.0.5" +futures-util = "0.3.5" http = "0.2" hyper = "0.13" hyper-tls = "0.4" -libc = "0.2.33" +libc = "0.2.66" native-tls = "0.2.0" percent-encoding = "2.1" tempfile = "3.1" -thiserror = "1" +thiserror = "1.0.2" url = "2.1" zbase32 = "0.1.2" [dev-dependencies] rand = { version = "0.7", default-features = false } -tokio = { version = "0.2", features = ["full"] } +tokio = { version = "0.2.19", features = ["full"] } [features] default = ["compression"] diff --git a/openpgp-ffi/Cargo.toml b/openpgp-ffi/Cargo.toml index d5dbaf5e..85973bec 100644 --- a/openpgp-ffi/Cargo.toml +++ b/openpgp-ffi/Cargo.toml @@ -24,9 +24,9 @@ maintenance = { status = "actively-developed" } [dependencies] sequoia-ffi-macros = { path = "../ffi-macros", version = "0.20" } sequoia-openpgp = { path = "../openpgp", version = "0.20", default-features = false } -anyhow = "1" -lazy_static = "1.0.0" -libc = "0.2.33" +anyhow = "1.0.5" +lazy_static = "1.4.0" +libc = "0.2.66" memsec = { version = "0.6", default-features = false } [dev-dependencies] diff --git a/openpgp/Cargo.toml b/openpgp/Cargo.toml index 000de1d0..55be6cd2 100644 --- a/openpgp/Cargo.toml +++ b/openpgp/Cargo.toml @@ -25,7 +25,7 @@ gitlab = { repository = "sequoia-pgp/sequoia" } maintenance = { status = "actively-developed" } [dependencies] -anyhow = "1" +anyhow = "1.0.5" buffered-reader = { path = "../buffered-reader", version = "0.20", default-features = false } base64 = "0.13" bzip2 = { version = "0.4", optional = true } @@ -33,13 +33,13 @@ dyn-clone = "1" flate2 = { version = "1.0.1", optional = true } idna = "0.2" lalrpop-util = "0.19" -lazy_static = "1.3" -libc = "0.2" +lazy_static = "1.4.0" +libc = "0.2.66" memsec = { version = "0.6", default-features = false } nettle = { version = "7", optional = true } regex = "1" sha1collisiondetection = { version = "0.2.2", default-features = false, features = ["std"] } -thiserror = "1" +thiserror = "1.0.2" backtrace = "0.3.46" unicode-normalization = "0.1.9" @@ -47,11 +47,11 @@ unicode-normalization = "0.1.9" win-crypto-ng = { version = "0.4", features = ["rand", "block-cipher"], optional = true } num-bigint-dig = { version = "0.6", default-features = false, optional = true } ed25519-dalek = { version = "1", default-features = false, features = ["rand", "u64_backend"], optional = true } -winapi = { version = "0.3", default-features = false, features = ["bcrypt"], optional = true } +winapi = { version = "0.3.8", default-features = false, features = ["bcrypt"], optional = true } eax = "0.3" [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies] -chrono = { version = "0.4", default-features = false, features = ["std"] } +chrono = { version = "0.4.10", default-features = false, features = ["std"] } [build-dependencies] lalrpop = "0.19" diff --git a/sop/Cargo.toml b/sop/Cargo.toml index 6f5fa9d7..26434378 100644 --- a/sop/Cargo.toml +++ b/sop/Cargo.toml @@ -20,10 +20,10 @@ maintenance = { status = "actively-developed" } [dependencies] sequoia-openpgp = { path = "../openpgp", version = "0.20", default-features = false } -anyhow = "1" -chrono = "0.4" -structopt = { version = "0.3.8", default-features = false } -thiserror = "1" +anyhow = "1.0.5" +chrono = "0.4.10" +structopt = { version = "0.3.11", default-features = false } +thiserror = "1.0.2" [[bin]] name = "sqop" diff --git a/sq/Cargo.toml b/sq/Cargo.toml index fe88d628..03008594 100644 --- a/sq/Cargo.toml +++ b/sq/Cargo.toml @@ -29,18 +29,18 @@ sequoia-core = { path = "../core", version = "0.20", default-features = false } sequoia-ipc = { path = "../ipc", version = "0.20", default-features = false } sequoia-net = { path = "../net", version = "0.20", default-features = false } sequoia-store = { path = "../store", version = "0.20", default-features = false } -anyhow = "1" -chrono = "0.4" -clap = "2.32.0" +anyhow = "1.0.5" +chrono = "0.4.10" +clap = "2.33" itertools = "0.9" prettytable-rs = "0.8.0" -tempfile = "3.0.4" +tempfile = "3.1" crossterm = "0.13" -tokio = { version = "0.2", features = ["rt-core", "io-util", "io-driver"] } +tokio = { version = "0.2.19", features = ["rt-core", "io-util", "io-driver"] } rpassword = "5.0" [build-dependencies] -clap = "2.32.0" +clap = "2.33" [dev-dependencies] assert_cli = "0.6" diff --git a/sqv/Cargo.toml b/sqv/Cargo.toml index 7821f296..3db60c76 100644 --- a/sqv/Cargo.toml +++ b/sqv/Cargo.toml @@ -22,13 +22,12 @@ maintenance = { status = "actively-developed" } [dependencies] sequoia-openpgp = { path = "../openpgp", version = "0.20", default-features = false } -anyhow = "1" -chrono = "0.4" -clap = "2.32.0" - +anyhow = "1.0.5" +chrono = "0.4.10" +clap = "2.33" [build-dependencies] -clap = "2.27.1" +clap = "2.33" [dev-dependencies] assert_cli = "0.6" diff --git a/store/Cargo.toml b/store/Cargo.toml index c5e1c452..ddac2af2 100644 --- a/store/Cargo.toml +++ b/store/Cargo.toml @@ -36,14 +36,14 @@ sequoia-openpgp = { path = "../openpgp", version = "0.20", default-features = fa sequoia-core = { path = "../core", version = "0.20" } sequoia-ipc = { path = "../ipc", version = "0.20", default-features = false } sequoia-net = { path = "../net", version = "0.20", default-features = false } -anyhow = "1" +anyhow = "1.0.5" capnp = "0.13" capnp-rpc = "0.13" -futures-util = "0.3" +futures-util = "0.3.5" rand = { version = "0.7", default-features = false } rusqlite = "0.24" -thiserror = "1" -tokio = { version = "0.2", features = ["rt-core", "tcp", "io-driver", "time"] } +thiserror = "1.0.2" +tokio = { version = "0.2.19", features = ["rt-core", "tcp", "io-driver", "time"] } tokio-util = { version = "0.3", features = ["compat"] } [target.'cfg(target_os="android")'.dependencies.rusqlite] -- cgit v1.2.3