From patchwork Tue Feb 27 16:16:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Velikov via arch-projects X-Patchwork-Id: 445 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 3E69C22DB240 for ; Tue, 27 Feb 2018 16:16:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIM_SIGNED=0.1, DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,RCVD_IN_DNSWL_MED=-2.3 autolearn=ham autolearn_force=no version=3.4.1 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Tue, 27 Feb 2018 16:16:58 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 705B58FFD818F; Tue, 27 Feb 2018 16:16:50 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Tue, 27 Feb 2018 16:16:50 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 497B02DC91; Tue, 27 Feb 2018 16:16:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1519748210; bh=Ec7gjzzyNeWKy/zYLSjxKebmuOpNpNHQNDZIykS6lu0=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=tXRImGKqR25miioYZx7zRw6OEbem9jRtAvXTUg8XbWkWJgwbVlIZkkOZqtCWP3rR8 qzM1UYE5f45kQYV6pADkL37Nvu43jhR/qqNzXzlk4/DnVFjeNvQguXgxS6zB5bgT+v wVn89YUOKEckCzHTfd6CAV6qfYNwHMYHLz3zhj+pBE7i6Wk24/qeglGNBQED9WJHMP IbCuYtkZ4zXpLfshC/FIp5Jrqw7tlEbUzVvuRix+8JYEK5ChjIjZYyRgHDSjds3sKw blS6RUUgFmPptcjpmlDckLAePmku0Mh97ecaTjsIQHANUi2WbA6smmo0fO+QceF3Zv bS2uLHhi3+cjn4jhbMeVvfSZlNkCKxSt9ru8Vr0uzHSJJc5GK4vdf0/n+4wjZ2YkSX J29ND1VvrA3wQmiTqTCAd3CIoVZkRJEmmSVGSJbPuq8QDdlt6AL9BBmLEUugi0MeBf kE3MW7lQZ+/6JGKjc9jNffW9bifQay9b6ou1xSfw+uPGVEqNPqOH8TQW577lVmFFf+ K9J7b4rk8C+pFWCYq29fe/rSUduqkiC8lEIMsDIjkyjgIywNyaUh9mwNHx9SK3ufAs Da73Vf4Bdn2UAM/FDU0Y6OJTTdjDfe1xpzhblRXBWAjah6xQXcAWToM+ycJq+8WoWM OjlKB+H7lM/wTRDCfLLBjbL8= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 7468A2DB43 for ; Tue, 27 Feb 2018 16:16:47 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Tue, 27 Feb 2018 16:16:47 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id B03748FFD818B for ; Tue, 27 Feb 2018 16:16:40 +0000 (UTC) Received: from mail2.protonmail.ch (mail2.protonmail.ch [185.70.40.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS for ; Tue, 27 Feb 2018 16:16:40 +0000 (UTC) Date: Tue, 27 Feb 2018 11:16:24 -0500 To: arch-projects@archlinux.org Message-ID: <20180227161529.1637-1-me@aimileus.nl> Feedback-ID: hxsTZJYcGt_NTRNSNOV_33uEybNGpD-t00PM_ASRbVRQ2xnP85Iux-UylWKVYfnwDYjw7ggwgdeqoKAAo6-TxQ==:Ext:ProtonMail MIME-Version: 1.0 Subject: [arch-projects] [devtools] [PATCH v2] makechrootpkg: respect GNUPGHOME X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Emiel Wiedijk via arch-projects Reply-To: Emiel Wiedijk , Arch Linux projects development discussion Cc: Emiel Wiedijk Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" Previously, makechrootpkg hardcoded ~/.gnupg. Therefore, if a user uses a custom GPG home directory, the siganture checking would fail. Now makechrootpkg uses $GNUPGHOME, with a fallback to ~/.gnupg. Signed-off-by: Emiel Wiedijk --- makechrootpkg.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index afcd121..653847f 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -252,7 +252,8 @@ download_sources() { chmod 1777 "$builddir" # Ensure sources are downloaded - sudo -u "$makepkg_user" env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \ + sudo -u "$makepkg_user" --preserve-env=GNUPGHOME \ + env SRCDEST="$SRCDEST" BUILDDIR="$builddir" \ makepkg --config="$copydir/etc/makepkg.conf" --verifysource -o || die "Could not download sources." @@ -341,7 +342,7 @@ main() { [[ -n $makepkg_user && -z $(id -u "$makepkg_user") ]] && die 'Invalid makepkg user.' makepkg_user=${makepkg_user:-${SUDO_USER:-$USER}} - check_root SOURCE_DATE_EPOCH + check_root SOURCE_DATE_EPOCH,GNUPGHOME # Canonicalize chrootdir, getting rid of trailing / chrootdir=$(readlink -e "$passeddir")