From 27799ccb6d77228c0e1a87cf8f40304db40b9000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 3 Dec 2020 11:34:56 +0100 Subject: [PATCH] Cargo.toml: update to tokio 1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- proxmox/Cargo.toml | 13 ++++----- proxmox/debian/control | 61 ++++++++++++++++++++++++++++-------------- 2 files changed, 48 insertions(+), 26 deletions(-) diff --git a/proxmox/Cargo.toml b/proxmox/Cargo.toml index b3d60307..46037b9d 100644 --- a/proxmox/Cargo.toml +++ b/proxmox/Cargo.toml @@ -13,14 +13,14 @@ exclude = [ "debian" ] [[example]] name = "u2ftest" -required-features = [ "tokio", "u2f" ] +required-features = [ "tokio", "tokio-stream", "u2f" ] [dependencies] # General dependencies anyhow = "1.0" lazy_static = "1.4" libc = "0.2" -nix = "0.19" +nix = "0.19.1" # tools module: base32 = { version = "0.4", optional = true } @@ -36,16 +36,17 @@ serde_json = "1.0" # libc, nix, lazy_static # api module: -bytes = "0.5" +bytes = "1.0" futures = { version = "0.3", optional = true } http = "0.2" -hyper = { version = "0.13", optional = true } +hyper = { version = "0.14", features = [ "full" ], optional = true } percent-encoding = "2.1" openssl = { version = "0.10", optional = true } -rustyline = "6" +rustyline = "7" serde_derive = "1.0" textwrap = "0.11" -tokio = { version = "0.2", features = [], optional = true } +tokio = { version = "1.0", features = [], optional = true } +tokio-stream = { version = "0.1.1", optional = true } url = "2.1" #regex, serde, serde_json diff --git a/proxmox/debian/control b/proxmox/debian/control index 47226da9..feac20cb 100644 --- a/proxmox/debian/control +++ b/proxmox/debian/control @@ -9,27 +9,28 @@ Build-Depends: debhelper (>= 11), librust-anyhow-1+default-dev , librust-base32-0.4+default-dev , librust-base64-0.12+default-dev , - librust-bytes-0.5+default-dev , + librust-bytes-1+default-dev , librust-endian-trait-0.6+arrays-dev , librust-endian-trait-0.6+default-dev , librust-futures-0.3+default-dev , librust-http-0.2+default-dev , - librust-hyper-0.13+default-dev , + librust-hyper-0.14+default-dev , + librust-hyper-0.14+full-dev , librust-lazy-static-1+default-dev (>= 1.4-~~) , librust-libc-0.2+default-dev , - librust-nix-0.19+default-dev , + librust-nix-0.19+default-dev (>= 0.19.1-~~) , librust-openssl-0.10+default-dev , librust-percent-encoding-2+default-dev (>= 2.1-~~) , librust-regex-1+default-dev (>= 1.2-~~) , - librust-rustyline-6+default-dev , + librust-rustyline-7+default-dev , librust-serde-1+default-dev , librust-serde-1+derive-dev , librust-serde-derive-1+default-dev , librust-serde-json-1+default-dev , librust-textwrap-0.11+default-dev , - librust-tokio-0.2+default-dev , - librust-tokio-0.2+io-util-dev , - librust-tokio-0.2+sync-dev , + librust-tokio-1+default-dev , + librust-tokio-1+io-util-dev , + librust-tokio-1+sync-dev , librust-url-2+default-dev (>= 2.1-~~) , uuid-dev , uuid-dev , @@ -50,16 +51,16 @@ Depends: ${misc:Depends}, librust-anyhow-1+default-dev, librust-base64-0.12+default-dev, - librust-bytes-0.5+default-dev, + librust-bytes-1+default-dev, librust-endian-trait-0.6+arrays-dev, librust-endian-trait-0.6+default-dev, librust-http-0.2+default-dev, librust-lazy-static-1+default-dev (>= 1.4-~~), librust-libc-0.2+default-dev, - librust-nix-0.19+default-dev, + librust-nix-0.19+default-dev (>= 0.19.1-~~), librust-percent-encoding-2+default-dev (>= 2.1-~~), librust-regex-1+default-dev (>= 1.2-~~), - librust-rustyline-6+default-dev, + librust-rustyline-7+default-dev, librust-serde-1+default-dev, librust-serde-1+derive-dev, librust-serde-derive-1+default-dev, @@ -80,6 +81,7 @@ Suggests: librust-proxmox+proxmox-sortable-macro-dev (= ${binary:Version}), librust-proxmox+router-dev (= ${binary:Version}), librust-proxmox+tokio-dev (= ${binary:Version}), + librust-proxmox+tokio-stream-dev (= ${binary:Version}), librust-proxmox+websocket-dev (= ${binary:Version}) Provides: librust-proxmox+test-harness-dev (= ${binary:Version}), @@ -142,8 +144,9 @@ Depends: ${misc:Depends}, librust-proxmox-dev (= ${binary:Version}), librust-proxmox+router-dev (= ${binary:Version}), - librust-hyper-0.13+default-dev, - librust-tokio-0.2+default-dev + librust-hyper-0.14+default-dev, + librust-hyper-0.14+full-dev, + librust-tokio-1+default-dev Provides: librust-proxmox-0+cli-dev (= ${binary:Version}), librust-proxmox-0.9+cli-dev (= ${binary:Version}), @@ -178,7 +181,7 @@ Depends: ${misc:Depends}, librust-proxmox-dev (= ${binary:Version}), librust-proxmox+u2f-dev (= ${binary:Version}), - librust-tokio-0.2+macros-dev + librust-tokio-1+macros-dev Provides: librust-proxmox-0+examples-dev (= ${binary:Version}), librust-proxmox-0.9+examples-dev (= ${binary:Version}), @@ -208,7 +211,8 @@ Multi-Arch: same Depends: ${misc:Depends}, librust-proxmox-dev (= ${binary:Version}), - librust-hyper-0.13+default-dev + librust-hyper-0.14+default-dev, + librust-hyper-0.14+full-dev Provides: librust-proxmox-0+hyper-dev (= ${binary:Version}), librust-proxmox-0.9+hyper-dev (= ${binary:Version}), @@ -265,8 +269,9 @@ Multi-Arch: same Depends: ${misc:Depends}, librust-proxmox-dev (= ${binary:Version}), - librust-hyper-0.13+default-dev, - librust-tokio-0.2+default-dev + librust-hyper-0.14+default-dev, + librust-hyper-0.14+full-dev, + librust-tokio-1+default-dev Provides: librust-proxmox-0+router-dev (= ${binary:Version}), librust-proxmox-0.9+router-dev (= ${binary:Version}), @@ -281,7 +286,7 @@ Multi-Arch: same Depends: ${misc:Depends}, librust-proxmox-dev (= ${binary:Version}), - librust-tokio-0.2+default-dev + librust-tokio-1+default-dev Provides: librust-proxmox-0+tokio-dev (= ${binary:Version}), librust-proxmox-0.9+tokio-dev (= ${binary:Version}), @@ -290,6 +295,21 @@ Description: Proxmox library - feature "tokio" This metapackage enables feature "tokio" for the Rust proxmox crate, by pulling in any additional dependencies needed by that feature. +Package: librust-proxmox+tokio-stream-dev +Architecture: any +Multi-Arch: same +Depends: + ${misc:Depends}, + librust-proxmox-dev (= ${binary:Version}), + librust-tokio-stream-0.1+default-dev (>= 0.1.1-~~) +Provides: + librust-proxmox-0+tokio-stream-dev (= ${binary:Version}), + librust-proxmox-0.9+tokio-stream-dev (= ${binary:Version}), + librust-proxmox-0.9.1+tokio-stream-dev (= ${binary:Version}) +Description: Proxmox library - feature "tokio-stream" + This metapackage enables feature "tokio-stream" for the Rust proxmox crate, by + pulling in any additional dependencies needed by that feature. + Package: librust-proxmox+websocket-dev Architecture: any Multi-Arch: same @@ -297,10 +317,11 @@ Depends: ${misc:Depends}, librust-proxmox-dev (= ${binary:Version}), librust-futures-0.3+default-dev, - librust-hyper-0.13+default-dev, + librust-hyper-0.14+default-dev, + librust-hyper-0.14+full-dev, librust-openssl-0.10+default-dev, - librust-tokio-0.2+io-util-dev, - librust-tokio-0.2+sync-dev + librust-tokio-1+io-util-dev, + librust-tokio-1+sync-dev Provides: librust-proxmox-0+websocket-dev (= ${binary:Version}), librust-proxmox-0.9+websocket-dev (= ${binary:Version}),