From 0f068bd3f9b51e0d7e3424db2ff26647ddeb2f9f Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Thu, 4 Nov 2021 03:53:34 -0500 Subject: [PATCH] Upgrade dependencies --- Cargo.lock | 131 +++++++++++++++++++++++++--------------- daemon/Cargo.toml | 7 ++- imap/Cargo.toml | 8 +-- proto-common/Cargo.toml | 2 +- 4 files changed, 92 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b594293..a3c14fa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.16.0" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ "gimli", ] @@ -30,9 +30,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.44" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61604a8f862e1d5c3229fdd78f8b02c68dcf73a4c4b05fd636d12240aaa242c1" +checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7" dependencies = [ "backtrace", ] @@ -85,13 +85,13 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "backtrace" -version = "0.3.62" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091bcdf2da9950f96aa522681ce805e6857f6ca8df73833d35736ab2dc78e152" +checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" dependencies = [ "addr2line", "cc", - "cfg-if", + "cfg-if 1.0.0", "libc", "miniz_oxide", "object", @@ -154,6 +154,12 @@ version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79c2681d6594606957bbb8631c4b90a7fcaaa72cdb714743a437b156d6a7eedd" +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" + [[package]] name = "cfg-if" version = "1.0.0" @@ -234,12 +240,21 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae5588f6b3c3cb05239e90bd110f257254aecd01e4635400391aeae07497845" dependencies = [ - "cfg-if", - "crossbeam-channel", + "cfg-if 1.0.0", + "crossbeam-channel 0.5.1", "crossbeam-deque", "crossbeam-epoch", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.8.5", +] + +[[package]] +name = "crossbeam-channel" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8ec7fcd21571dc78f96cc96243cab8d8f035247c3efd16c687be154c3fa9efa" +dependencies = [ + "crossbeam-utils 0.6.6", ] [[package]] @@ -248,8 +263,8 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ - "cfg-if", - "crossbeam-utils", + "cfg-if 1.0.0", + "crossbeam-utils 0.8.5", ] [[package]] @@ -258,9 +273,9 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "crossbeam-epoch", - "crossbeam-utils", + "crossbeam-utils 0.8.5", ] [[package]] @@ -269,8 +284,8 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ - "cfg-if", - "crossbeam-utils", + "cfg-if 1.0.0", + "crossbeam-utils 0.8.5", "lazy_static", "memoffset", "scopeguard", @@ -282,8 +297,18 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9" dependencies = [ - "cfg-if", - "crossbeam-utils", + "cfg-if 1.0.0", + "crossbeam-utils 0.8.5", +] + +[[package]] +name = "crossbeam-utils" +version = "0.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +dependencies = [ + "cfg-if 0.1.10", + "lazy_static", ] [[package]] @@ -292,7 +317,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "lazy_static", ] @@ -456,7 +481,7 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "redox_syscall", "winapi", @@ -630,16 +655,16 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "libc", "wasi", ] [[package]] name = "gimli" -version = "0.25.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "h2" @@ -788,9 +813,9 @@ dependencies = [ [[package]] name = "inotify" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e5fc8f41dbaa9c8492a96c8afffda4f76896ee041d6a57606e70581b80c901f" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ "bitflags", "inotify-sys", @@ -812,7 +837,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -867,9 +892,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.105" +version = "0.2.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "869d572136620d55835903746bcb5cdc54cb2851fd0aeec53220b4bb65ef3013" +checksum = "a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673" [[package]] name = "libsqlite3-sys" @@ -897,7 +922,7 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", ] [[package]] @@ -983,7 +1008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245d358380e2352c2d020e8ee62baac09b3420f1f6c012a31326cfced4ad487d" dependencies = [ "bitflags", - "crossbeam-channel", + "crossbeam-channel 0.5.1", "filetime", "fsevent-sys", "inotify", @@ -1077,10 +1102,11 @@ dependencies = [ "panorama-imap", "panorama-smtp", "serde", + "session_types", "sqlx", "stderrlog", "tokio", - "tokio-rustls 0.23.0", + "tokio-rustls 0.23.1", "toml", "xdg", ] @@ -1106,7 +1132,7 @@ dependencies = [ "panorama-proto-common", "stderrlog", "tokio", - "tokio-rustls 0.23.0", + "tokio-rustls 0.23.1", "tokio-util", "webpki-roots 0.22.1", ] @@ -1157,7 +1183,7 @@ version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "instant", "libc", "redox_syscall", @@ -1387,6 +1413,15 @@ dependencies = [ "serde", ] +[[package]] +name = "session_types" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "149e4a189f59b63f351e9cc877ba983c03a322b95663ed58324e35be23aad7ac" +dependencies = [ + "crossbeam-channel 0.3.9", +] + [[package]] name = "sha2" version = "0.9.8" @@ -1394,7 +1429,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" dependencies = [ "block-buffer", - "cfg-if", + "cfg-if 1.0.0", "cpufeatures", "digest", "opaque-debug", @@ -1482,9 +1517,9 @@ dependencies = [ "bytes", "chrono", "crc", - "crossbeam-channel", + "crossbeam-channel 0.5.1", "crossbeam-queue", - "crossbeam-utils", + "crossbeam-utils 0.8.5", "either", "futures-channel", "futures-core", @@ -1663,9 +1698,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2c2416fdedca8443ae44b4527de1ea633af61d8f7169ffa6e72c5b53d24efcc" +checksum = "588b2d10a336da58d877567cd8fb8a14b463e2104910f8132cd054b4b96e29ee" dependencies = [ "autocfg", "bytes", @@ -1683,9 +1718,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2dd85aeaba7b68df939bd357c6afb36c87951be9e80bf9c859f2fc3e9fca0fd" +checksum = "114383b041aa6212c579467afa0075fbbdd0718de036100bc0ba7961d8cb9095" dependencies = [ "proc-macro2", "quote", @@ -1705,9 +1740,9 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49194a46b06a69f2498a34a595ab4a9c1babd2642ffa3dbccf6c6778d1426f2" +checksum = "4baa378e417d780beff82bf54ceb0d195193ea6a00c14e22359e7f39456b5689" dependencies = [ "rustls 0.20.0", "tokio", @@ -1716,9 +1751,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" +checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", "pin-project-lite", @@ -1727,9 +1762,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.8" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d3725d3efa29485e87311c5b699de63cde14b00ed4d256b8318aa30ca452cd" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes", "futures-core", @@ -1760,7 +1795,7 @@ version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "pin-project-lite", "tracing-core", ] @@ -1897,7 +1932,7 @@ version = "0.2.78" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" dependencies = [ - "cfg-if", + "cfg-if 1.0.0", "wasm-bindgen-macro", ] diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml index d278c36..cc2dc94 100644 --- a/daemon/Cargo.toml +++ b/daemon/Cargo.toml @@ -9,7 +9,7 @@ default = ["config-watch"] config-watch = ["notify"] [dependencies] -anyhow = { version = "1.0.44", features = ["backtrace"] } +anyhow = { version = "1.0.45", features = ["backtrace"] } async-trait = "0.1.51" clap = "3.0.0-beta.5" derivative = "2.2.0" @@ -20,12 +20,13 @@ panorama-imap = { path = "../imap" } panorama-smtp = { path = "../smtp" } serde = { version = "1.0.130", features = ["derive"] } stderrlog = "0.5.1" -tokio = { version = "1.12.0", features = ["full"] } -tokio-rustls = "0.23.0" +tokio = { version = "1.13.0", features = ["full"] } +tokio-rustls = "0.23.1" toml = "0.5.8" xdg = "2.4.0" notify = { version = "5.0.0-pre.13", optional = true } +session_types = "0.3.1" [dependencies.sqlx] version = "0.5.9" diff --git a/imap/Cargo.toml b/imap/Cargo.toml index 1b6312d..863f349 100644 --- a/imap/Cargo.toml +++ b/imap/Cargo.toml @@ -23,7 +23,7 @@ rfc6154 = [] # list fuzzing = ["arbitrary", "panorama-proto-common/fuzzing"] [dependencies] -anyhow = { version = "1.0.44", features = ["backtrace"] } +anyhow = { version = "1.0.45", features = ["backtrace"] } async-trait = "0.1.51" bitflags = "1.3.2" bytes = "1.1.0" @@ -35,9 +35,9 @@ futures = "0.3.17" log = "0.4.14" nom = "7.0.0" stderrlog = { version = "0.5.1", optional = true } -tokio = { version = "1.12.0", features = ["full"] } -tokio-rustls = { version = "0.23.0", features = ["dangerous_configuration"] } -tokio-util = { version = "0.6.8", features = ["codec"] } +tokio = { version = "1.13.0", features = ["full"] } +tokio-rustls = { version = "0.23.1", features = ["dangerous_configuration"] } +tokio-util = { version = "0.6.9", features = ["codec"] } webpki-roots = "0.22.1" panorama-proto-common = { path = "../proto-common" } diff --git a/proto-common/Cargo.toml b/proto-common/Cargo.toml index f3ee6b2..9792964 100644 --- a/proto-common/Cargo.toml +++ b/proto-common/Cargo.toml @@ -13,7 +13,7 @@ default = [] fuzzing = ["arbitrary"] [dependencies] -anyhow = { version = "1.0.44", features = ["backtrace"] } +anyhow = { version = "1.0.45", features = ["backtrace"] } bstr = "0.2.17" bytes = "1.1.0" format-bytes = "0.2.2"