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 9113515ACFD for ; Mon, 1 May 2023 07:22:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE19AE085E; Mon, 1 May 2023 07:22:02 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9F080E085E for ; Mon, 1 May 2023 07:22:02 +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 B32B1341489 for ; Mon, 1 May 2023 07:22:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7D17A5D for ; Mon, 1 May 2023 07:21:58 +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: <1682925657.526bda2cd1ed30465c15b86658f9ecbdf8e6cdeb.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: /, bin/ X-VCS-Repository: proj/portage X-VCS-Files: NEWS bin/emerge-webrsync X-VCS-Directories: / bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 526bda2cd1ed30465c15b86658f9ecbdf8e6cdeb X-VCS-Branch: master Date: Mon, 1 May 2023 07:21:58 +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: e231e685-d2b4-47b0-b7f9-cf1663cf15b3 X-Archives-Hash: c94d5803e637a8f6adc3badfd4ec8de4 commit: 526bda2cd1ed30465c15b86658f9ecbdf8e6cdeb Author: Sam James gentoo org> AuthorDate: Sun Apr 30 05:20:00 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 1 07:20:57 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=526bda2c emerge-webrsync: switch Portage-caller case to gemato This changes the common case where Portage calls emerge-webrsync for repos configured w/ sync-type='webrsync' to use gemato rather than legacy manual gpg invocations. Bug: https://bugs.gentoo.org/905358 Signed-off-by: Sam James gentoo.org> NEWS | 6 ++---- bin/emerge-webrsync | 11 ++++++----- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/NEWS b/NEWS index f0b500471..36ffee0c9 100644 --- a/NEWS +++ b/NEWS @@ -3,10 +3,8 @@ portage-3.0.48 (UNRELEASED) Bug fixes: * fowners, fperms: Fix handling of relative pathnames (bug #905223). -* emerge-webrsync: Be less alarmist when a user is syncing with Portage - (not calling emerge-webrsync directly) with sync-type='webrsync'. We - were emitting a misleading warning about the validation method in use - which might in fact encourage people to use the older method. +* emerge-webrsync: Switch Portage to use gemato for when it shells out + to emerge-webrsync for repositories configured with sync-type=webrsync. Cleanups: * Convert printf-style %-formats into fstrings. diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 4686d7b5f..4546f510c 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -129,11 +129,12 @@ handle_pgp_setup() { die "Do not call ${argv0##*/} directly, instead call emerge --sync or emaint sync." fi - WEBRSYNC_VERIFY_SIGNATURE=2 - elif [[ ${webrsync_gpg} -eq 1 ]] then + # Use gemato for the standard Portage-calling-us case w/ sync-type='webrsync'. + WEBRSYNC_VERIFY_SIGNATURE=1 + elif [[ ${webrsync_gpg} -eq 1 ]]; then # We only warn if FEATURES="webrsync-gpg" is in make.conf, not if - # Portage is calling us for 'type=webrsync' with verification. - # TODO: Change the Portage path to fully use gemato and unify the lot. + # Portage is calling us for 'sync-type=webrsync' with verification, because + # that path uses gemato now (plus the user can't help it, obviously). ewarn "FEATURES=webrsync-gpg is deprecated, see the make.conf(5) man page." WEBRSYNC_VERIFY_SIGNATURE=2 elif [[ -n ${no_pgp_verify} ]]; then @@ -152,7 +153,7 @@ handle_pgp_setup() { [[ ${PORTAGE_QUIET} -eq 1 ]] || einfo "PGP verification method: gemato" ;; 2) - [[ ${PORTAGE_QUIET} -eq 1 ]] || ewarn "PGP verification method: legacy gpg path" + ewarn "PGP verification method: legacy gpg path" ;; *) die "Unknown WEBRSYNC_VERIFY_SIGNATURE state: \${WEBRSYNC_VERIFY_SIGNATURE}=${WEBRSYNC_VERIFY_SIGNATURE}"