From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AAA6F15820A for ; Thu, 10 Jul 2025 09:11:56 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 9C054341F62 for ; Thu, 10 Jul 2025 09:11:56 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 8CD511102F2; Thu, 10 Jul 2025 09:11:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 814CB1102F2 for ; Thu, 10 Jul 2025 09:11:55 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3682E341F62 for ; Thu, 10 Jul 2025 09:11:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99B592CE9 for ; Thu, 10 Jul 2025 09:11:53 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1752138694.789295f3248259c7d4421cf83ec1f8e82d012dd4.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/openssl-3.5.0.ebuild dev-libs/openssl/openssl-3.5.9999.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 789295f3248259c7d4421cf83ec1f8e82d012dd4 X-VCS-Branch: master Date: Thu, 10 Jul 2025 09:11:53 +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: a00cb728-0e89-4b2f-90b2-e919db9e6b12 X-Archives-Hash: 843348d22246ae4b2b895fe1664b2884 commit: 789295f3248259c7d4421cf83ec1f8e82d012dd4 Author: James Le Cuirot gentoo org> AuthorDate: Wed Jul 9 12:30:12 2025 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Jul 10 09:11:34 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=789295f3 dev-libs/openssl: Run openssl fipsinstall via sysroot_run_prefixed helper This fixes cross-compiling. Also make failure here fatal. We don't normally `die` in pkg_preinst, but if a user explicitly asked for FIPS, then we should ensure it works by not ignoring this failure. Closes: https://github.com/gentoo/gentoo/pull/42939 Signed-off-by: James Le Cuirot gentoo.org> dev-libs/openssl/openssl-3.5.0.ebuild | 10 +++++----- dev-libs/openssl/openssl-3.5.9999.ebuild | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dev-libs/openssl/openssl-3.5.0.ebuild b/dev-libs/openssl/openssl-3.5.0.ebuild index 41de3131f213..a7df1d73c9c6 100644 --- a/dev-libs/openssl/openssl-3.5.0.ebuild +++ b/dev-libs/openssl/openssl-3.5.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic linux-info toolchain-funcs +inherit edo flag-o-matic linux-info sysroot toolchain-funcs inherit multilib multilib-minimal multiprocessing preserve-libs DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" @@ -272,11 +272,11 @@ multilib_src_install_all() { pkg_preinst() { if use fips; then # Regen fipsmodule.cnf, bug 900625 - ebegin "Running openssl fipsinstall" - "${ED}/usr/bin/openssl" fipsinstall -quiet \ + einfo "Running openssl fipsinstall" + sysroot_run_prefixed "${ED}/usr/bin/openssl" fipsinstall \ -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ - -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" - eend $? + -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" \ + || die "fipsinstall failed" fi preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \ diff --git a/dev-libs/openssl/openssl-3.5.9999.ebuild b/dev-libs/openssl/openssl-3.5.9999.ebuild index 41de3131f213..a7df1d73c9c6 100644 --- a/dev-libs/openssl/openssl-3.5.9999.ebuild +++ b/dev-libs/openssl/openssl-3.5.9999.ebuild @@ -4,7 +4,7 @@ EAPI=8 VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openssl.org.asc -inherit edo flag-o-matic linux-info toolchain-funcs +inherit edo flag-o-matic linux-info sysroot toolchain-funcs inherit multilib multilib-minimal multiprocessing preserve-libs DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)" @@ -272,11 +272,11 @@ multilib_src_install_all() { pkg_preinst() { if use fips; then # Regen fipsmodule.cnf, bug 900625 - ebegin "Running openssl fipsinstall" - "${ED}/usr/bin/openssl" fipsinstall -quiet \ + einfo "Running openssl fipsinstall" + sysroot_run_prefixed "${ED}/usr/bin/openssl" fipsinstall \ -out "${ED}${SSL_CNF_DIR}/fipsmodule.cnf" \ - -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" - eend $? + -module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so" \ + || die "fipsinstall failed" fi preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \