From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (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 finch.gentoo.org (Postfix) with ESMTPS id 4920E158015 for ; Sat, 23 Dec 2023 20:16:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7F4F92BC036; Sat, 23 Dec 2023 20:16:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69AD52BC036 for ; Sat, 23 Dec 2023 20:16:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A19AE33F9FD for ; Sat, 23 Dec 2023 20:16:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43785AC2 for ; Sat, 23 Dec 2023 20:16:31 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1703362527.b7f871e2958b1624f3e67ab0f57dafcbb4f22710.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-lang/rust/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-lang/rust/rust-1.74.1.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: b7f871e2958b1624f3e67ab0f57dafcbb4f22710 X-VCS-Branch: master Date: Sat, 23 Dec 2023 20:16:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 91c9d04b-9d5c-41b4-87c3-fefbc7ed7607 X-Archives-Hash: 1b271c045515c4785a4449952ac01e3a commit: b7f871e2958b1624f3e67ab0f57dafcbb4f22710 Author: Hélder Rodrigues sqrtd dev> AuthorDate: Sat Dec 23 15:34:17 2023 +0000 Commit: orbea riseup net> CommitDate: Sat Dec 23 20:15:27 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=b7f871e2 dev-lang/rust: apply libressl-openssl-sys patch on 1.74.1 Signed-off-by: Hélder Rodrigues sqrtd.dev> Closes: https://github.com/gentoo/libressl/pull/546 Signed-off-by: orbea riseup.net> dev-lang/rust/rust-1.74.1.ebuild | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dev-lang/rust/rust-1.74.1.ebuild b/dev-lang/rust/rust-1.74.1.ebuild index 0851f21..0256c22 100644 --- a/dev-lang/rust/rust-1.74.1.ebuild +++ b/dev-lang/rust/rust-1.74.1.ebuild @@ -175,6 +175,14 @@ clear_vendor_checksums() { sed -i 's/\("files":{\)[^}]*/\1/' "vendor/${1}/.cargo-checksum.json" || die } +eapply_crate() { + pushd "${1:?}" > /dev/null || die + local patch="${2:?}" + eapply "${patch}" + "${EPREFIX}"/bin/sh "${FILESDIR}"/rehash-crate.sh "${patch}" || die + popd > /dev/null || die +} + toml_usex() { usex "${1}" true false } @@ -288,6 +296,7 @@ esetup_unwind_hack() { } src_prepare() { + eapply_crate vendor/openssl-sys "${FILESDIR}"/1.72.0-libressl-openssl-sys.patch # Clear vendor checksums for crates that we patched to bump libc. # NOTE: refresh this on each bump. #for i in addr2line-0.20.0 bstr cranelift-jit crossbeam-channel elasticlunr-rs handlebars icu_locid libffi \