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 EB03415ACFD 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 1F426E0867; Mon, 1 May 2023 07:22:03 +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 E6642E0863 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 043A03414C8 for ; Mon, 1 May 2023 07:22:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1920FA5F for ; Mon, 1 May 2023 07:21:59 +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: <1682925658.df797d3dd66cdacf58eb672f40f877f3870b9ae9.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/emerge-webrsync X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: df797d3dd66cdacf58eb672f40f877f3870b9ae9 X-VCS-Branch: master Date: Mon, 1 May 2023 07:21:59 +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: 856fdf1f-6f3f-402d-afaa-e40354b7a22c X-Archives-Hash: fbc9b9a2b0911d73557a770ec5e46bcc commit: df797d3dd66cdacf58eb672f40f877f3870b9ae9 Author: Sam James gentoo org> AuthorDate: Mon May 1 06:50:59 2023 +0000 Commit: Sam James gentoo org> CommitDate: Mon May 1 07:20:58 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=df797d3d emerge-webrsync: respect PORTAGE_GPG_KEY_SERVER This will allow us to switch the Portage-caller cases to the gemato path because we now respect 'sync-openpgp-keyserver'. Bug: https://bugs.gentoo.org/905358 Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 4546f510c..f1fb012c2 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -279,11 +279,17 @@ check_file_signature_gemato() { local key="${EPREFIX:-/}"/usr/share/openpgp-keys/gentoo-release.asc fi + local keyserver + if [[ -n ${PORTAGE_GPG_KEY_SERVER} ]] ; then + keyserver="--keyserver ${PORTAGE_GPG_KEY_SERVER}" + fi + local gemato_args=( openpgp-verify-detached -K "${key}" ) + [[ -n ${PORTAGE_GPG_KEY_SERVER} ]] && gemato_args+=( --keyserver "${PORTAGE_GPG_KEY_SERVER}" ) # Portage is calling us so it'll handle refreshing if configured to do so. # Don't repeat its work. [[ -n ${PORTAGE_TEMP_GPG_DIR} ]] && gemato_args+=( --no-refresh-keys --no-wkd ) @@ -291,7 +297,7 @@ check_file_signature_gemato() { [[ ${PORTAGE_QUIET} == 1 ]] && gemato_args+=( --quiet ) [[ ${do_debug} == 1 ]] && gemato_args+=( --debug ) - gemato "${gemato_args[@]}" "${signature}" "${file}" + gemato "${gemato_args[@]}" -- "${signature}" "${file}" r=$? if [[ ${r} -ne 0 ]]; then