From 7245cd2a7fd28704c08a27e6a11e97affd5c324c Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 5 May 2024 13:48:00 +0100 Subject: dev-util/elfshaker: fix build w/ rust-1.76.0 (bump rustc-serialize crate) Thanks to Ionen for the hint. It's just an annotation so looks like no need to revbump. Closes: https://bugs.gentoo.org/926668 Signed-off-by: Sam James --- dev-util/elfshaker/Manifest | 2 +- dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild | 8 ++++++-- ...lfshaker-0.9.0_p20230918-update-rustc-serialize.patch | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 dev-util/elfshaker/files/elfshaker-0.9.0_p20230918-update-rustc-serialize.patch diff --git a/dev-util/elfshaker/Manifest b/dev-util/elfshaker/Manifest index ff220f9308f3..2f61533a44d8 100644 --- a/dev-util/elfshaker/Manifest +++ b/dev-util/elfshaker/Manifest @@ -62,7 +62,7 @@ DIST ring-0.16.20.crate 5082615 BLAKE2B 6011eb7148c2d2ab410e564a06604f4350e07ea0 DIST rmp-0.8.11.crate 28829 BLAKE2B 42aeff1a8d4874f1cec8a19085e4f23ae33cebcfd024c28772c0cea36e096d5ff012e6063647f31b9e9c3ca311f1036566411675fe2f632dd9dc1d5d1f7f929c SHA512 27a499316542722a4d9fe4fa9cc005b6b5fa75dcf66686a5c08aa6130497b67511c0283419adb64fec09a51a563f4991f2039280d2e74f8ea4102afbe4977f38 DIST rmp-serde-0.15.5.crate 28657 BLAKE2B bf2db6d713e8c105b337c06b97c5ba607d509fd0de1356c7b711eff47b77f5e5246a8d2b6c876f8db4baa9c0f308cbb5b447a2a5327734711701b9d8ea6f13e5 SHA512 d546e170452eb58fd684cd0b4c150b99005a39611f40cf2b6f2919822246d36206e94808569ff8249f14e50f17989b885ef6016477bab9d16be5a18a0c8428fa DIST rust-crypto-0.2.36.crate 857879 BLAKE2B c486a2e43eb9ac9d2558bb39a249dcd689e86eef51d9a7613a3964baa633cebec824d5a490254dc06eca7a5faa471126de92452d62c522a3dbf494b9940a13e1 SHA512 0fac026d8799ecde523f20e7b34b9486343e48b95e79cd76bb6c8bfaeaebed550e45d59d85d8a3a58595f10c02a4a5e55691da15c203a4336a9bdb5480cd2e90 -DIST rustc-serialize-0.3.24.crate 45926 BLAKE2B 11dee8dac7eb007067ee0eb19d122bf45d912e6cefa95fd5ae3db7a4585a3f37e66b123c8c7bb761cc451b402cb9191dd5c974618331bb9aa9efbe9215115abc SHA512 60b40a0b41678287627cf5898e0ff6ac5668865f1ce5a482190ecd7539b59a955a73c675fedac76e68a5126efb92ff0cf1d1b4f24359a932463434bb76d9e884 +DIST rustc-serialize-0.3.25.crate 46114 BLAKE2B 54feaa72c7cda8aa4d4de225a99b3e2c78fa3893eef47c7666b6503e183bfd830d9693676a274e0dbf1d2f650489c4ba924ebf8650c47d11d561ec8bf8e85a11 SHA512 d7023ab949a1bcb43b3458a7bf3f6a8903a5a8e43ad87e8c635f5b1a43c72a27052b96bd9f2e9e8da4a532b5a97674850e5a11537ef8a1b17ef44017c7be1be8 DIST rustls-0.20.8.crate 270142 BLAKE2B 0d9563e302eac78871eb8346c72fde2a05618dc8a966198cb4d607b41930dd54487d9f4d9c8ebbdf943b4593d4cbb75543c3aea9dddc61a06500b4b322aa726f SHA512 4f56494987cd3a56f47dd07d31c7f73d262a4d003cf9cc11e0bce5fa85c87f18124b1c364186501736f0d40a1f193a24d5d73f37a491ff81ca8eff568559e547 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c DIST scratch-1.0.3.crate 8198 BLAKE2B 804af80d09da85a88221c7aed7740a25a327bece99eeda0d7adceb3e5111917b70fb4a4e4e39c83b041d57baad2e3582e877356d58386e05ccd65e0a5334f86d SHA512 8fb3c0d36adbcd915e3adad108e35665ddd6e5622b252833349f89448a620bac6eaf1c212ffc172ec015e5af46e5637901c3442083b17ed29a2bdd9c0c48d595 diff --git a/dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild b/dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild index 92badeb52671..9a2fcdfb2d8c 100644 --- a/dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild +++ b/dev-util/elfshaker/elfshaker-0.9.0_p20230918.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2023-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Autogenerated by pycargoebuild 0.10 @@ -69,7 +69,7 @@ CRATES=" rmp-serde@0.15.5 rmp@0.8.11 rust-crypto@0.2.36 - rustc-serialize@0.3.24 + rustc-serialize@0.3.25 rustls@0.20.8 same-file@1.0.6 scratch@1.0.3 @@ -131,3 +131,7 @@ SLOT="0" KEYWORDS="~amd64" QA_FLAGS_IGNORED="usr/bin/elfshaker" + +PATCHES=( + "${FILESDIR}"/elfshaker-0.9.0_p20230918-update-rustc-serialize.patch +) diff --git a/dev-util/elfshaker/files/elfshaker-0.9.0_p20230918-update-rustc-serialize.patch b/dev-util/elfshaker/files/elfshaker-0.9.0_p20230918-update-rustc-serialize.patch new file mode 100644 index 000000000000..619fcf9c2bf1 --- /dev/null +++ b/dev-util/elfshaker/files/elfshaker-0.9.0_p20230918-update-rustc-serialize.patch @@ -0,0 +1,16 @@ +https://github.com/elfshaker/elfshaker/issues/129 +https://bugs.gentoo.org/926668 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -601,9 +601,9 @@ dependencies = [ + + [[package]] + name = "rustc-serialize" +-version = "0.3.24" ++version = "0.3.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" + + [[package]] + name = "rustls" -- cgit v1.2.3-65-gdbad