From db1f66a8eccdc8451f1d61d90d5a6b09fa66ca89 Mon Sep 17 00:00:00 2001 From: mio Date: Mon, 9 Sep 2024 04:12:12 +0000 Subject: [PATCH] community/acmed: bump time crate to fix build with 1.80+ --- community/acmed/APKBUILD | 5 +-- community/acmed/update-libc-time-crate.patch | 38 +++++++++++++++++++ ...ade-rust-libc-to-support-loongarch64.patch | 16 -------- 3 files changed, 40 insertions(+), 19 deletions(-) create mode 100644 community/acmed/update-libc-time-crate.patch delete mode 100644 community/acmed/upgrade-rust-libc-to-support-loongarch64.patch diff --git a/community/acmed/APKBUILD b/community/acmed/APKBUILD index 9d21f6cec84..1ea886360e6 100644 --- a/community/acmed/APKBUILD +++ b/community/acmed/APKBUILD @@ -14,15 +14,14 @@ makedepends="cargo openssl-dev>3 cargo-auditable" subpackages="$pkgname-doc $pkgname-openrc $pkgname-tacd $pkgname-tacd-doc:tacd_doc" install="acmed.pre-install" source="https://github.com/breard-r/acmed/archive/refs/tags/v$pkgver/acmed-$pkgver.tar.gz - upgrade-rust-libc-to-support-loongarch64.patch acmed.confd acmed.initd + update-libc-time-crate.patch " prepare() { default_prepare cargo fetch --target="$CTARGET" --locked - } build() { @@ -68,7 +67,7 @@ tacd_doc() { sha512sums=" 2b66008f63668bb78e4e903ee65765354af6b5c281eeae16684c99624861781f3efd2e95dd6d38f53d488e31cd9f68d7400dd3af0ad969588a34f2fda0e41004 acmed-0.23.0.tar.gz -6794a749ff759f659029a9e307bab1ec2a73d97b822cc36374d8979d94baa6b9b54710398c261b231efca69e5e92dbf9e1c1e929e201978eda6c0f584bdcc1c7 upgrade-rust-libc-to-support-loongarch64.patch 2fb5cb330ba4f91c49e34e5808034cbeeb23a9637f4b03cff80ea26338b0a4a232042d7888ee7305afac945402520433828db4064c4274d8ead431aa16a668c1 acmed.confd 126ce93a32c4eace6d41635947c7ecfa3fea3fd731f5ef2b528e911259305e2fdfa115bc78475d6fba57e0717facc27ac4cc341a4c24511c75ef96772e354c1b acmed.initd +68aeee9891b7d94c6c1e916ab0a390f3db0b3315b9f4d4a72b078e11a825c0b9312deafb1a2b4eb41707fe744ea85f3f7fc893e379d88ff1f0eee4fad13d9d11 update-libc-time-crate.patch " diff --git a/community/acmed/update-libc-time-crate.patch b/community/acmed/update-libc-time-crate.patch new file mode 100644 index 00000000000..d0eab63e45f --- /dev/null +++ b/community/acmed/update-libc-time-crate.patch @@ -0,0 +1,38 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -831,9 +831,9 @@ + + [[package]] + name = "libc" +-version = "0.2.153" ++version = "0.2.155" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" ++checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" + + [[package]] + name = "linux-raw-sys" +@@ -1526,9 +1526,9 @@ + + [[package]] + name = "time" +-version = "0.3.34" ++version = "0.3.36" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" ++checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" + dependencies = [ + "deranged", + "itoa", +@@ -1549,9 +1549,9 @@ + + [[package]] + name = "time-macros" +-version = "0.2.17" ++version = "0.2.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" ++checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" + dependencies = [ + "num-conv", + "time-core", diff --git a/community/acmed/upgrade-rust-libc-to-support-loongarch64.patch b/community/acmed/upgrade-rust-libc-to-support-loongarch64.patch deleted file mode 100644 index 05cf362bdd5..00000000000 --- a/community/acmed/upgrade-rust-libc-to-support-loongarch64.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 4a744e1..ef24203 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -831,9 +831,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - - [[package]] - name = "libc" --version = "0.2.153" -+version = "0.2.154" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" -+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" - - [[package]] - name = "linux-raw-sys"