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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1FE911382C5 for ; Thu, 1 Feb 2018 06:18:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 36670E0999; Thu, 1 Feb 2018 06:18:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0FAA9E0999 for ; Thu, 1 Feb 2018 06:18:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59F7B335C53 for ; Thu, 1 Feb 2018 06:18:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B10A31C9 for ; Thu, 1 Feb 2018 06:18:19 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1517465805.52d5d444ffb144911ca9b6e70b383405a8bd8af6.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: misc/ X-VCS-Repository: proj/portage X-VCS-Files: misc/emerge-delta-webrsync X-VCS-Directories: misc/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 52d5d444ffb144911ca9b6e70b383405a8bd8af6 X-VCS-Branch: master Date: Thu, 1 Feb 2018 06:18:19 +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-Archives-Salt: ba8f1c60-79cf-4651-8bdc-63350f5c314e X-Archives-Hash: 762f954a2f5340e01b7e9a9b2e1d0865 commit: 52d5d444ffb144911ca9b6e70b383405a8bd8af6 Author: Zac Medico gentoo org> AuthorDate: Thu Feb 1 06:16:45 2018 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Feb 1 06:16:45 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=52d5d444 emerge-delta-webrsync: uses gpg --status-fd misc/emerge-delta-webrsync | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/misc/emerge-delta-webrsync b/misc/emerge-delta-webrsync index f2dc8220c..868c6a347 100755 --- a/misc/emerge-delta-webrsync +++ b/misc/emerge-delta-webrsync @@ -267,13 +267,22 @@ check_file_signature() { local signature="$1" local file="$2" local r=1 + local gnupg_status line if [[ ${WEBSYNC_VERIFY_SIGNATURE} != 0 ]] ; then __vecho "Checking signature ..." if type -P gpg > /dev/null; then - gpg --homedir "${PORTAGE_GPG_DIR}" --verify "$signature" "$file" && r=0 + if gnupg_status=$(gpg --homedir "${PORTAGE_GPG_DIR}" --batch \ + --status-fd 1 --verify "${signature}" "${file}"); then + while read -r line; do + if [[ ${line} == "[GNUPG:] GOODSIG"* ]]; then + r=0 + break + fi + done <<< "${gnupg_status}" + fi else eecho "cannot check signature: gpg binary not found" exit 1