From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9090E67638 for ; Tue, 12 Jan 2021 14:58:37 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8E9A026B2D for ; Tue, 12 Jan 2021 14:58:37 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id CB5AF26A84 for ; Tue, 12 Jan 2021 14:58:36 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 910DD45F5B for ; Tue, 12 Jan 2021 14:58:36 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Tue, 12 Jan 2021 14:58:15 +0100 Message-Id: <20210112135830.2798301-6-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210112135830.2798301-1-f.gruenbichler@proxmox.com> References: <20210112135830.2798301-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.224 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lib.rs, zip.rs, proxmox.com] Subject: [pbs-devel] [PATCH proxmox-backup 01/12] update to tokio 1.0 X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Jan 2021 13:58:37 -0000 and various related crates Signed-off-by: Fabian Grünbichler --- Cargo.toml | 25 ++++++++++++------------ debian/control | 49 ++++++++++++++++++++++++------------------------ src/tools/zip.rs | 1 - 3 files changed, 37 insertions(+), 38 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 0fc4d317..01fd0e96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,19 +26,19 @@ path = "src/lib.rs" apt-pkg-native = "0.3.1" # custom patched version base64 = "0.12" bitflags = "1.2.1" -bytes = "0.5" +bytes = "1.0" crc32fast = "1" endian_trait = { version = "0.6", features = ["arrays"] } anyhow = "1.0" futures = "0.3" -h2 = { version = "0.2", features = ["stream"] } +h2 = { version = "0.3", features = [ "stream" ] } handlebars = "3.0" http = "0.2" -hyper = "0.13.6" +hyper = { version = "0.14", features = [ "full" ] } lazy_static = "1.4" libc = "0.2" log = "0.4" -nix = "0.19" +nix = "0.19.1" num-traits = "0.2" once_cell = "1.3.1" openssl = "0.10" @@ -46,23 +46,24 @@ pam = "0.7" pam-sys = "0.5" percent-encoding = "2.1" pin-utils = "0.1.0" -pin-project = "0.4" +pin-project = "1.0" pathpatterns = "0.1.2" proxmox = { version = "0.9.1", features = [ "sortable-macro", "api-macro", "websocket" ] } #proxmox = { git = "git://git.proxmox.com/git/proxmox", version = "0.1.2", features = [ "sortable-macro", "api-macro" ] } #proxmox = { path = "../proxmox/proxmox", features = [ "sortable-macro", "api-macro", "websocket" ] } proxmox-fuse = "0.1.0" -pxar = { version = "0.6.2", features = [ "tokio-io", "futures-io" ] } -#pxar = { path = "../pxar", features = [ "tokio-io", "futures-io" ] } +pxar = { version = "0.6.2", features = [ "tokio-io" ] } +#pxar = { path = "../pxar", features = [ "tokio-io" ] } regex = "1.2" -rustyline = "6" +rustyline = "7" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" siphasher = "0.3" syslog = "4.0" -tokio = { version = "0.2.9", features = [ "blocking", "fs", "dns", "io-util", "macros", "process", "rt-threaded", "signal", "stream", "tcp", "time", "uds" ] } -tokio-openssl = "0.4.0" -tokio-util = { version = "0.3", features = [ "codec" ] } +tokio = { version = "1.0", features = [ "fs", "io-util", "macros", "net", "parking_lot", "process", "rt", "rt-multi-thread", "signal", "time" ] } +tokio-openssl = "0.6.1" +tokio-stream = "0.1.0" +tokio-util = { version = "0.6", features = [ "codec" ] } tower-service = "0.3.0" udev = ">= 0.3, <0.5" url = "2.1" @@ -72,7 +73,7 @@ webauthn-rs = "0.2.5" xdg = "2.2" zstd = { version = "0.4", features = [ "bindgen" ] } nom = "5.1" -crossbeam-channel = "0.4" +crossbeam-channel = "0.5" [features] default = [] diff --git a/debian/control b/debian/control index 275acf35..6903155b 100644 --- a/debian/control +++ b/debian/control @@ -10,21 +10,22 @@ Build-Depends: debhelper (>= 11), librust-apt-pkg-native-0.3+default-dev (>= 0.3.1-~~), librust-base64-0.12+default-dev, librust-bitflags-1+default-dev (>= 1.2.1-~~), - librust-bytes-0.5+default-dev, + librust-bytes-1+default-dev, librust-crc32fast-1+default-dev, - librust-crossbeam-channel-0.4+default-dev, + librust-crossbeam-channel-0.5+default-dev, librust-endian-trait-0.6+arrays-dev, librust-endian-trait-0.6+default-dev, librust-futures-0.3+default-dev, - librust-h2-0.2+default-dev, - librust-h2-0.2+stream-dev, + librust-h2-0.3+default-dev, + librust-h2-0.3+stream-dev, librust-handlebars-3+default-dev, librust-http-0.2+default-dev, - librust-hyper-0.13+default-dev (>= 0.13.6-~~), + 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-log-0.4+default-dev, - librust-nix-0.19+default-dev, + librust-nix-0.19+default-dev (>= 0.19.1-~~), librust-nom-5+default-dev (>= 5.1-~~), librust-num-traits-0.2+default-dev, librust-once-cell-1+default-dev (>= 1.3.1-~~), @@ -33,7 +34,7 @@ Build-Depends: debhelper (>= 11), librust-pam-sys-0.5+default-dev, librust-pathpatterns-0.1+default-dev (>= 0.1.2-~~), librust-percent-encoding-2+default-dev (>= 2.1-~~), - librust-pin-project-0.4+default-dev, + librust-pin-project-1+default-dev, librust-pin-utils-0.1+default-dev, librust-proxmox-0.9+api-macro-dev (>= 0.9.1-~~), librust-proxmox-0.9+default-dev (>= 0.9.1-~~), @@ -41,31 +42,29 @@ Build-Depends: debhelper (>= 11), librust-proxmox-0.9+websocket-dev (>= 0.9.1-~~), librust-proxmox-fuse-0.1+default-dev, librust-pxar-0.6+default-dev (>= 0.6.2-~~), - librust-pxar-0.6+futures-io-dev (>= 0.6.2-~~), librust-pxar-0.6+tokio-io-dev (>= 0.6.2-~~), 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-json-1+default-dev, librust-siphasher-0.3+default-dev, librust-syslog-4+default-dev, - librust-tokio-0.2+blocking-dev (>= 0.2.9-~~), - librust-tokio-0.2+default-dev (>= 0.2.9-~~), - librust-tokio-0.2+dns-dev (>= 0.2.9-~~), - librust-tokio-0.2+fs-dev (>= 0.2.9-~~), - librust-tokio-0.2+io-util-dev (>= 0.2.9-~~), - librust-tokio-0.2+macros-dev (>= 0.2.9-~~), - librust-tokio-0.2+process-dev (>= 0.2.9-~~), - librust-tokio-0.2+rt-threaded-dev (>= 0.2.9-~~), - librust-tokio-0.2+signal-dev (>= 0.2.9-~~), - librust-tokio-0.2+stream-dev (>= 0.2.9-~~), - librust-tokio-0.2+tcp-dev (>= 0.2.9-~~), - librust-tokio-0.2+time-dev (>= 0.2.9-~~), - librust-tokio-0.2+uds-dev (>= 0.2.9-~~), - librust-tokio-openssl-0.4+default-dev, - librust-tokio-util-0.3+codec-dev, - librust-tokio-util-0.3+default-dev, + librust-tokio-1+default-dev, + librust-tokio-1+fs-dev, + librust-tokio-1+io-util-dev, + librust-tokio-1+macros-dev, + librust-tokio-1+net-dev, + librust-tokio-1+parking-lot-dev, + librust-tokio-1+process-dev, + librust-tokio-1+rt-dev, + librust-tokio-1+rt-multi-thread-dev, + librust-tokio-1+signal-dev, + librust-tokio-1+time-dev, + librust-tokio-openssl-0.6+default-dev (>= 0.6.1-~~), + librust-tokio-stream-0.1+default-dev, + librust-tokio-util-0.6+codec-dev, + librust-tokio-util-0.6+default-dev, librust-tower-service-0.3+default-dev, librust-udev-0.4+default-dev | librust-udev-0.3+default-dev, librust-url-2+default-dev (>= 2.1-~~), diff --git a/src/tools/zip.rs b/src/tools/zip.rs index d651b092..1f9ee517 100644 --- a/src/tools/zip.rs +++ b/src/tools/zip.rs @@ -354,7 +354,6 @@ impl ZipEntry { /// ```no_run /// use proxmox_backup::tools::zip::*; /// use tokio::fs::File; -/// use tokio::prelude::*; /// use anyhow::{Error, Result}; /// /// #[tokio::main] -- 2.20.1