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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E157E15827B for ; Mon, 25 Aug 2025 09:52:36 +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) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id CC24C340EE4 for ; Mon, 25 Aug 2025 09:52:36 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 470EE110567; Mon, 25 Aug 2025 09:52:24 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 37C0D110567 for ; Mon, 25 Aug 2025 09:52:24 +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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E8EA4340FD3 for ; Mon, 25 Aug 2025 09:52:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5514234E3 for ; Mon, 25 Aug 2025 09:52:21 +0000 (UTC) From: "Sam James" 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" Message-ID: <1756115494.4cf0144f2b931f93146734c0c866f727c8e0369c.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: lib/portage/package/ebuild/_config/ X-VCS-Repository: proj/portage X-VCS-Files: lib/portage/package/ebuild/_config/special_env_vars.py X-VCS-Directories: lib/portage/package/ebuild/_config/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4cf0144f2b931f93146734c0c866f727c8e0369c X-VCS-Branch: master Date: Mon, 25 Aug 2025 09:52:21 +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: 5561131f-219a-4c33-beb5-c4ba9319ce84 X-Archives-Hash: b71eefb480c977eee5e31242a9fec8f9 commit: 4cf0144f2b931f93146734c0c866f727c8e0369c Author: Kerin Millar plushkava net> AuthorDate: Mon Jul 28 16:51:38 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 25 09:51:34 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=4cf0144f special_env_vars.py: add {FETCH,RESUME}COMMAND_SSH to the environ_filter set Portage is supposed to prevent configuration variables in both the FETCHCOMMAND_ and RESUMECOMMAND_ namespaces from being propagated to the environment of the "ebuild.sh" utility and its subprocesses. To that end, the "special_env_vars.py" unit defines the 'environ_filter' set, which includes the following twelve variables among its members. - FETCHCOMMAND - FETCHCOMMAND_FTP - FETCHCOMMAND_HTTP - FETCHCOMMAND_HTTPS - FETCHCOMMAND_RSYNC - FETCHCOMMAND_SFTP - RESUMECOMMAND - RESUMECOMMAND_FTP - RESUMECOMMAND_HTTP - RESUMECOMMAND_HTTPS - RESUMECOMMAND_RSYNC - RESUMECOMMAND_SFTP However, it does not account for the fact that the SSH protocol is supported. Address this by incorporating both the 'FETCHCOMMAND_SSH' and 'RESUMECOMMAND_SSH' variables into the set. Assuming their default values, this saves 568 bytes of environment space, as well as preventing them from unnecessarily leaking into "environment.bz2" files. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> lib/portage/package/ebuild/_config/special_env_vars.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/portage/package/ebuild/_config/special_env_vars.py b/lib/portage/package/ebuild/_config/special_env_vars.py index a8e3c11419..17f7bf0f76 100644 --- a/lib/portage/package/ebuild/_config/special_env_vars.py +++ b/lib/portage/package/ebuild/_config/special_env_vars.py @@ -289,6 +289,7 @@ environ_filter = frozenset( "FETCHCOMMAND_HTTPS", "FETCHCOMMAND_RSYNC", "FETCHCOMMAND_SFTP", + "FETCHCOMMAND_SSH", "GENTOO_MIRRORS", "NOCONFMEM", "O", @@ -330,6 +331,7 @@ environ_filter = frozenset( "RESUMECOMMAND_HTTPS", "RESUMECOMMAND_RSYNC", "RESUMECOMMAND_SFTP", + "RESUMECOMMAND_SSH", "UNINSTALL_IGNORE", "USE_EXPAND_HIDDEN", "USE_ORDER",