From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1542720-garchives=archives.gentoo.org@lists.gentoo.org>
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 1E95315800A
for <garchives@archives.gentoo.org>; Wed, 2 Aug 2023 12:39:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5EF68E0AF2;
Wed, 2 Aug 2023 12:39:12 +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 pigeon.gentoo.org (Postfix) with ESMTPS id 43586E0AF2
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Aug 2023 12:39:12 +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 2C75A33BDF0
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Aug 2023 12:39:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id BB427EB2
for <gentoo-commits@lists.gentoo.org>; Wed, 2 Aug 2023 12:39:09 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1690979937.af815ce4c7a7933c36b36b24c29b655bfec37105.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-misc/openssh/openssh-9.3_p2.ebuild
X-VCS-Directories: net-misc/openssh/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: af815ce4c7a7933c36b36b24c29b655bfec37105
X-VCS-Branch: master
Date: Wed, 2 Aug 2023 12:39:09 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 6ede3782-b3cb-4768-b352-97ad8a452b8d
X-Archives-Hash: a373317310f122638f3716a6dbd93db7
commit: af815ce4c7a7933c36b36b24c29b655bfec37105
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 2 12:38:57 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 2 12:38:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af815ce4
net-misc/openssh: skip sanity-check for binpkgs
Because of environment saving, we can't allow users to override for binpkgs, so just
elide the check there.
Closes: https://bugs.gentoo.org/907892
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/openssh/openssh-9.3_p2.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net-misc/openssh/openssh-9.3_p2.ebuild b/net-misc/openssh/openssh-9.3_p2.ebuild
index e3184f35c252..8e57bfe2061c 100644
--- a/net-misc/openssh/openssh-9.3_p2.ebuild
+++ b/net-misc/openssh/openssh-9.3_p2.ebuild
@@ -100,6 +100,9 @@ pkg_pretend() {
done
if [[ -n ${enabled_eol_flags} && ${OPENSSH_EOL_USE_FLAGS_I_KNOW_WHAT_I_AM_DOING} != yes ]]; then
+ # Skip for binary packages entirely because of environment saving, bug #907892
+ [[ ${MERGE_TYPE} == binary ]] && return
+
ewarn "net-misc/openssh does not support USE='${enabled_eol_flags%,}' anymore."
ewarn "The Base system team *STRONGLY* recommends you not rely on this functionality,"
ewarn "since these USE flags required third-party patches that often trigger bugs"