ipc: Update to the latest versions of capnproto and tokio.

  - Use the latest versions of capnp and tokio.

  - The ipc crate exposes capnp and tokio symbols via its public
    API (sequoia_ipc::Handler).  Thus any user of the ipc crate has
    to use the same version.  Upgrade the dependencies so that
    downstream users can use the latest features.

2 files changed, 15 insertions, 28 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 37f78aa7..f3359956 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -304,15 +304,15 @@ dependencies = [
 
 [[package]]
 name = "capnp"
-version = "0.13.6"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e76a319e55a4ef27c8c383215fa3160167bd8a883e8d27c0ecd57ed81bca2af"
+checksum = "21d5d7da973146f1720672faa44f1523cc8f923636190ca1a931c7bc8834de68"
 
 [[package]]
 name = "capnp-futures"
-version = "0.13.2"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc7bd6f6a6240f4f0a39b89c731916b15eefa26d31f90dffc1d232b7981d09a3"
+checksum = "4a15248c8facb189a3c5fee74fbf1ff3adc134261d27da663b89c7d19ebaf983"
 dependencies = [
  "capnp",
  "futures",
@@ -320,9 +320,9 @@ dependencies = [
 
 [[package]]
 name = "capnp-rpc"
-version = "0.13.1"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37998522d42bbe4a1d266f418b1a053b679a338e904e55afd5ff22333df0e09e"
+checksum = "4c4f17f96f68f2c1168ed7105d9e5cb4a095a5bef3578aee0f9c0644b85ca95e"
 dependencies = [
  "capnp",
  "capnp-futures",
@@ -1277,7 +1277,7 @@ dependencies = [
  "indexmap",
  "slab",
  "tokio",
- "tokio-util 0.7.1",
+ "tokio-util",
  "tracing",
 ]
 
@@ -2608,7 +2608,7 @@ dependencies = [
  "tempfile",
  "thiserror",
  "tokio",
- "tokio-util 0.6.9",
+ "tokio-util",
  "winapi",
 ]
 
@@ -3312,15 +3312,16 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
 
 [[package]]
 name = "tokio"
-version = "1.17.0"
+version = "1.19.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee"
+checksum = "c51a52ed6686dd62c320f9b89299e9dfb46f730c7a48e635c19f21d116cb1439"
 dependencies = [
  "bytes",
  "libc",
  "memchr",
  "mio",
  "num_cpus",
+ "once_cell",
  "pin-project-lite",
  "socket2",
  "tokio-macros",
@@ -3350,27 +3351,13 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-io",
- "futures-sink",
- "log",
- "pin-project-lite",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
 version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764"
 dependencies = [
  "bytes",
  "futures-core",
+ "futures-io",
  "futures-sink",
  "pin-project-lite",
  "tokio",
diff --git a/ipc/Cargo.toml b/ipc/Cargo.toml
index 71d7397b..8cfeafb9 100644
--- a/ipc/Cargo.toml
+++ b/ipc/Cargo.toml
@@ -24,7 +24,7 @@ sequoia-openpgp = { path = "../openpgp", version = "1.0.0", default-features = f
 
 anyhow = "1.0.18"
 buffered-reader = { path = "../buffered-reader", version = "1.0.0", default-features = false }
-capnp-rpc = "0.13"
+capnp-rpc = "0.14"
 fs2 = "0.4.2"
 futures = "0.3.5"
 lalrpop-util = ">=0.17"
@@ -34,8 +34,8 @@ memsec = { version = ">=0.5", default-features = false }
 rand = { version = "0.8" }
 tempfile = "3.1"
 thiserror = "1.0.2"
-tokio = { version = "1.13.1", features = [ "rt-multi-thread", "io-util", "net" ] }
-tokio-util = { version = "0.6", features = ["compat"] }
+tokio = { version = "1.19", features = [ "rt-multi-thread", "io-util", "net" ] }
+tokio-util = { version = "0.7", features = ["compat"] }
 socket2 = "0.4"
 dirs = "4.0"