diff --git a/0001-update-crate-time-to-fix-building-error-in-rust-1.82.patch b/0001-update-crate-time-to-fix-building-error-in-rust-1.82.patch new file mode 100644 index 0000000000000000000000000000000000000000..9ee03e0de1fe77d37fb85c3a297a67c55ed11ac8 --- /dev/null +++ b/0001-update-crate-time-to-fix-building-error-in-rust-1.82.patch @@ -0,0 +1,92 @@ +From 55a215330c9e2585f2730e3585897d28cc18ce3e Mon Sep 17 00:00:00 2001 +From: Your Name +Date: Mon, 16 Dec 2024 01:40:27 +0000 +Subject: [PATCH] update crate time to fix building error in rust 1.82 + +--- + Cargo.lock | 19 ++++++++++++++----- + Cargo.toml | 3 +++ + 2 files changed, 17 insertions(+), 5 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 71b2426..6f2b476 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -37,7 +37,7 @@ dependencies = [ + "mailparse", + "maplit", + "mockito", +- "nix 0.26.4", ++ "nix 0.27.1", + "openssh-keys", + "openssl", + "pnet_base", +@@ -52,6 +52,7 @@ dependencies = [ + "slog-scope", + "slog-term", + "tempfile", ++ "time", + "uzers", + "vmw_backdoor", + "zbus", +@@ -1295,6 +1296,12 @@ dependencies = [ + "minimal-lexical", + ] + ++[[package]] ++name = "num-conv" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" ++ + [[package]] + name = "num_cpus" + version = "1.16.0" +@@ -2100,13 +2107,14 @@ dependencies = [ + + [[package]] + name = "time" +-version = "0.3.31" ++version = "0.3.37" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" ++checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" + dependencies = [ + "deranged", + "itoa", + "libc", ++ "num-conv", + "num_threads", + "powerfmt", + "serde", +@@ -2122,10 +2130,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" + + [[package]] + name = "time-macros" +-version = "0.2.16" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" ++checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" + dependencies = [ ++ "num-conv", + "time-core", + ] + +diff --git a/Cargo.toml b/Cargo.toml +index 97d3f47..8a2532f 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -142,6 +142,9 @@ version = ">= 2.6, < 3" + [dependencies.tempfile] + version = ">= 3.2, < 4" + ++[dependencies.time] ++version = ">= 0.3.35" ++ + [dependencies.uzers] + version = "0.11" + +-- +2.43.0 + diff --git a/afterburn-5.5.1-vendor.tar.gz b/afterburn-5.5.1-rust1.82-vendor.tar.gz similarity index 37% rename from afterburn-5.5.1-vendor.tar.gz rename to afterburn-5.5.1-rust1.82-vendor.tar.gz index 2a4d799d9243e3eecfcc256d58dc2586441eadbb..2555c6449a2a9ecce4c03a2a54d2b37a512a3265 100644 Binary files a/afterburn-5.5.1-vendor.tar.gz and b/afterburn-5.5.1-rust1.82-vendor.tar.gz differ diff --git a/rust-afterburn.spec b/rust-afterburn.spec index a8c1dcd59dc2d76e8afc0ed45e9005f2e8371674..2cc4757ac52c35d4a5cc82932ba5956d00a9d012 100644 --- a/rust-afterburn.spec +++ b/rust-afterburn.spec @@ -7,13 +7,15 @@ Name: rust-%{crate} Version: 5.5.1 -Release: 1 +Release: 2 Summary: Simple cloud provider agent License: Apache-2.0 URL: https://crates.io/crates/afterburn Source0: %{crate}-%{version}.crate -Source1: %{crate}-%{version}-vendor.tar.gz +# Re-vendor in rust1.82 environment +SOurce1: %{crate}-%{version}-rust1.82-vendor.tar.gz +Patch0: 0001-update-crate-time-to-fix-building-error-in-rust-1.82.patch BuildRequires: rust-packaging openssl-devel glibc-devel BuildRequires: systemd @@ -106,6 +108,12 @@ cp -a dracut/* %{buildroot}%{dracutmodulesdir} cp -r $RPM_BUILD_DIR/afterburn-5.5.1/.cargo/bin %{buildroot}/usr %changelog +* Fri Dec 13 2024 chendexi - 5.5.1-2 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: fix build error in rust 1.82 + * Fri Mar 15 2024 lilu - 5.5.1-1 - upgrade version to 5.5.1