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 8F42215808B for ; Wed, 2 Oct 2024 05:06:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8386E29A5; Wed, 2 Oct 2024 05:06:39 +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 94FE8E29A5 for ; Wed, 2 Oct 2024 05:06:39 +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 8E08B341B52 for ; Wed, 2 Oct 2024 05:06:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2E08DBE7 for ; Wed, 2 Oct 2024 05:06:37 +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: <1727845543.123a7be533161b14cacc4aa98708fbf1027ecce1.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/, misc/ X-VCS-Repository: proj/portage X-VCS-Files: bin/emerge-webrsync misc/emerge-delta-webrsync X-VCS-Directories: bin/ misc/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 123a7be533161b14cacc4aa98708fbf1027ecce1 X-VCS-Branch: master Date: Wed, 2 Oct 2024 05:06:37 +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: f98eec65-7658-4613-8b2f-80f0260ee516 X-Archives-Hash: 38e5d5f8689713cf6721d218a98bee3a commit: 123a7be533161b14cacc4aa98708fbf1027ecce1 Author: Sam James gentoo org> AuthorDate: Wed Oct 2 05:02:24 2024 +0000 Commit: Sam James gentoo org> CommitDate: Wed Oct 2 05:05:43 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=123a7be5 Revert "emerge-webrsync: actually honour the sync-webrsync-verify-signature attribute" This reverts commit f99eb91227918d5bf0cc531e78bd597c73b7ce1f. Revert for now as we understand the status quo better, and this breaks syncing w/ emerge-webrsync. I'll come back to this but I'd rather work with a known quantity for now than rush a fix. Bug: https://bugs.gentoo.org/940120 Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 9 ++++----- misc/emerge-delta-webrsync | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 124bcaddcf..caa4986da2 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -105,17 +105,16 @@ do_debug=0 keep=false handle_pgp_setup() { - local attr repo_has_webrsync_verify webrsync_gpg - # WEBRSYNC_VERIFY_SIGNATURE=0: disable PGP verification # WEBRSYNC_VERIFY_SIGNATURE=1: use gemato for verification, fallback to regular gpg # WEBRSYNC_VERIFY_SIGNATURE=2: use legacy FEATURES="webrsync-gpg" WEBRSYNC_VERIFY_SIGNATURE=1 - has webrsync-gpg ${FEATURES} && webrsync_gpg=1 + has webrsync-gpg ${FEATURES} && webrsync_gpg=1 || webrsync_gpg=0 - attr=$(__repo_attr "${repo_name}" sync-webrsync-verify-signature) - [[ ${attr,,} == @(true|yes) ]] && repo_has_webrsync_verify=1 + repo_has_webrsync_verify=$( + has $(__repo_attr "${repo_name}" sync-webrsync-verify-signature | LC_ALL=C tr '[:upper:]' '[:lower:]') true yes + ) if [[ -n ${PORTAGE_TEMP_GPG_DIR} ]] || [[ ${repo_has_webrsync_verify} -eq 1 ]]; then # If FEATURES=webrsync-gpg is enabled then allow direct emerge-webrsync diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync index 8550c15fe0..a788cdb0eb 100755 --- a/misc/emerge-delta-webrsync +++ b/misc/emerge-delta-webrsync @@ -165,17 +165,16 @@ if [[ ! -d $STATE_DIR ]]; then fi handle_pgp_setup() { - local attr repo_has_webrsync_verify webrsync_gpg - # WEBRSYNC_VERIFY_SIGNATURE=0: disable PGP verification # WEBRSYNC_VERIFY_SIGNATURE=1: use gemato for verification, fallback to regular gpg # WEBRSYNC_VERIFY_SIGNATURE=2: use legacy FEATURES="webrsync-gpg" WEBRSYNC_VERIFY_SIGNATURE=1 - has webrsync-gpg ${FEATURES} && webrsync_gpg=1 + has webrsync-gpg ${FEATURES} && webrsync_gpg=1 || webrsync_gpg=0 - attr=$(__repo_attr "${repo_name}" sync-webrsync-verify-signature) - [[ ${attr,,} == @(true|yes) ]] && repo_has_webrsync_verify=1 + repo_has_webrsync_verify=$( + has $(__repo_attr "${repo_name}" sync-webrsync-verify-signature | LC_ALL=C tr '[:upper:]' '[:lower:]') true yes + ) if [[ -n ${PORTAGE_TEMP_GPG_DIR} ]] || [[ ${repo_has_webrsync_verify} -eq 1 ]]; then # If FEATURES=webrsync-gpg is enabled then allow direct emerge-webrsync