KubeOS: Bump tokio to version 1.28.0
Signed-off-by: Yuhang Wei <weiyuhang3@huawei.com>
This commit is contained in:
Yuhang Wei
parent
f11eceb441
commit
bb813952f0
127
0018-Bump-tokio-to-1.28.0.patch
Normal file
127
0018-Bump-tokio-to-1.28.0.patch
Normal file
@ -0,0 +1,127 @@
|
||||
From d6a1854785e9e4ec854654baf024a32ce72d4962 Mon Sep 17 00:00:00 2001
|
||||
From: Yuhang Wei <weiyuhang3@huawei.com>
|
||||
Date: Mon, 5 Feb 2024 10:04:46 +0800
|
||||
Subject: [PATCH 1/3] Bump tokio to 1.28.0
|
||||
|
||||
Signed-off-by: Yuhang Wei <weiyuhang3@huawei.com>
|
||||
---
|
||||
KubeOS-Rust/Cargo.lock | 42 ++++++++++--------------------------
|
||||
KubeOS-Rust/proxy/Cargo.toml | 6 ++++--
|
||||
2 files changed, 15 insertions(+), 33 deletions(-)
|
||||
|
||||
diff --git a/KubeOS-Rust/Cargo.lock b/KubeOS-Rust/Cargo.lock
|
||||
index 2342c7b2..004ef234 100644
|
||||
--- a/KubeOS-Rust/Cargo.lock
|
||||
+++ b/KubeOS-Rust/Cargo.lock
|
||||
@@ -1133,24 +1133,14 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
|
||||
|
||||
[[package]]
|
||||
name = "mio"
|
||||
-version = "0.7.14"
|
||||
+version = "0.8.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc"
|
||||
+checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"log",
|
||||
- "miow",
|
||||
- "ntapi",
|
||||
- "winapi",
|
||||
-]
|
||||
-
|
||||
-[[package]]
|
||||
-name = "miow"
|
||||
-version = "0.3.7"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21"
|
||||
-dependencies = [
|
||||
- "winapi",
|
||||
+ "wasi 0.11.0+wasi-snapshot-preview1",
|
||||
+ "windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -1234,15 +1224,6 @@ version = "0.3.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
|
||||
|
||||
-[[package]]
|
||||
-name = "ntapi"
|
||||
-version = "0.3.7"
|
||||
-source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
|
||||
-dependencies = [
|
||||
- "winapi",
|
||||
-]
|
||||
-
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.17"
|
||||
@@ -2077,21 +2058,20 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
|
||||
|
||||
[[package]]
|
||||
name = "tokio"
|
||||
-version = "1.14.0"
|
||||
+version = "1.28.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144"
|
||||
+checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
"bytes",
|
||||
"libc",
|
||||
- "memchr",
|
||||
"mio",
|
||||
"num_cpus",
|
||||
- "once_cell",
|
||||
"pin-project-lite",
|
||||
"signal-hook-registry",
|
||||
+ "socket2",
|
||||
"tokio-macros",
|
||||
- "winapi",
|
||||
+ "windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2106,13 +2086,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tokio-macros"
|
||||
-version = "1.8.2"
|
||||
+version = "2.1.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
-checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8"
|
||||
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
- "syn 1.0.109",
|
||||
+ "syn 2.0.37",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
diff --git a/KubeOS-Rust/proxy/Cargo.toml b/KubeOS-Rust/proxy/Cargo.toml
|
||||
index 94e3b3c8..429c5fdb 100644
|
||||
--- a/KubeOS-Rust/proxy/Cargo.toml
|
||||
+++ b/KubeOS-Rust/proxy/Cargo.toml
|
||||
@@ -35,7 +35,10 @@ serde_json = "1.0.68"
|
||||
socket2 = "=0.4.9"
|
||||
thiserror = "1.0.29"
|
||||
thread_local = "=1.1.4"
|
||||
-tokio = { version = "=1.14.0", features = ["macros", "rt-multi-thread"] }
|
||||
+tokio = { version = "=1.28.0", default-features = false, features = [
|
||||
+ "macros",
|
||||
+ "rt-multi-thread",
|
||||
+] }
|
||||
tokio-retry = "0.3"
|
||||
|
||||
[dev-dependencies]
|
||||
@@ -44,4 +47,3 @@ http = "0.2.9"
|
||||
hyper = "0.14.25"
|
||||
tower-test = "0.4.0"
|
||||
mockall = { version = "=0.11.3" }
|
||||
-
|
||||
--
|
||||
2.34.1
|
||||
|
||||
89134
0019-build-update-vendor.patch
Normal file
89134
0019-build-update-vendor.patch
Normal file
File diff suppressed because one or more lines are too long
@ -23,6 +23,8 @@ Patch14: 0014-fix-os-agent-add-context-when-returning-error.patch
|
||||
Patch15: 0015-proxy-Add-unit-tests-and-delete-useless-dependencies.patch
|
||||
Patch16: 0016-proxy-fix-code-review-issues.patch
|
||||
Patch17: 0017-fix-clippy-warnings-and-fmt-code.patch
|
||||
Patch18: 0018-Bump-tokio-to-1.28.0.patch
|
||||
Patch19: 0019-build-update-vendor.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: make rust cargo openssl-devel
|
||||
@ -134,6 +136,12 @@ install -p -m 0600 ./files/os-release %{buildroot}/opt/kubeOS/files
|
||||
rm -rfv %{buildroot}
|
||||
|
||||
%changelog
|
||||
* Mon Feb 05 2024 Yuhang Wei<weiyuhang3@huawei.com> - 1.0.5-3
|
||||
- Type:requirement
|
||||
- CVE:NA
|
||||
- SUG:restart
|
||||
- DESC:bump tokio to 1.28.0
|
||||
|
||||
* Mon Jan 29 2024 Yuhang Wei<weiyuhang3@huawei.com> - 1.0.5-2
|
||||
- Type:requirement
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user