From patchwork Mon Feb 26 19:03:40 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: 441 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 58EC522C373B for ; Mon, 26 Feb 2018 19:04:38 +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 [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Mon, 26 Feb 2018 19:04:28 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 7FF448F70ECDE; Mon, 26 Feb 2018 19:04:11 +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; Mon, 26 Feb 2018 19:04:11 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 67FAD2D86E; Mon, 26 Feb 2018 19:04:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=archlinux.org; s=luna2; t=1519671851; bh=8BlBKEYFW8XdsQZk5OGzeqBhwVfQsZItpqF0Pd5efzg=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=tkUy8I1xukyluMLlMewiPMm0tw6Ugev/Gl9YSIMTl2+ufjNl//O376caS5rjf+PKM XwFJWUJGyVcvO5P959iyieLuZWzrRr/Ex3GFnVHZ5GxBo4BeUUAK60IsT842QdTUHx tkbhEyE1Z3yqS7nZQq+fWx/xsiwYSG9bwG5Z36Q5Hyhk34hSxRpzK6Z7fff28bxHrr FvyXmCw/5kECHCEpvwWqkAa6Q3PdfZv6xHGCjL8Wx+WBB/JlsjkNzhzaFNwQL+jMZ8 V2VSJPJuS6PZK2vuASv55hjroCwGHuRq+7rIAkY2020z1UXRcQpRy82L/ZjwPzRQm4 EGzFtBI7lCwmc3AI6Hboq2z8MaIfgRdBGEgD8CvfgNNM8DtIaRaLyaffTXsspEEPqh 1wpTfcuUUlLOQl0jLfWcxloQhQ0jGnX7/m8Tt7HR0WBT77ZICAXy3T2LzqVQDXNh5u ZtchcID2Mp6AIdUU3zDyFkuCF5tu4bg19d4s3v6rhrGq6Ieaf4YokFjIs/xyHiw9aN Qm3+mLkgHIcB/MGxe8sTnx09VYzESXhCE//lgG7R5c30xZx/oJkWXavT6cF3fuFy3Z ilY9vSYMcUhjymxOp+EUKWhpzmtoOy5X1cddHbcm5V43C/sO8Omen+lxNMy7rtNfb7 Rliq1Hg77VPnsrv15FdiHLDs= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 2218F2092D for ; Mon, 26 Feb 2018 19:04:10 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [IPv6:2a01:4f8:160:6087::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Mon, 26 Feb 2018 19:04:10 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 2799D8F70ECBA for ; Mon, 26 Feb 2018 19:03:49 +0000 (UTC) Received: from mail1.protonmail.ch (mail1.protonmail.ch [185.70.40.18]) (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 ; Mon, 26 Feb 2018 19:03:44 +0000 (UTC) Date: Mon, 26 Feb 2018 14:03:40 -0500 To: arch-projects@archlinux.org Message-ID: <20180226190317.2760-1-me@aimileus.nl> Feedback-ID: hxsTZJYcGt_NTRNSNOV_33uEybNGpD-t00PM_ASRbVRQ2xnP85Iux-UylWKVYfnwDYjw7ggwgdeqoKAAo6-TxQ==:Ext:ProtonMail MIME-Version: 1.0 Subject: [arch-projects] [devtools] 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 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index afcd121..5a79dc0 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -182,9 +182,10 @@ prepare_chroot() { $install -d "$copydir"/{build,build/.gnupg,startdir,{pkg,srcpkg,src,log}dest} - for x in .gnupg/pubring.{kbx,gpg}; do - [[ -r $USER_HOME/$x ]] || continue - $install -m 644 "$USER_HOME/$x" "$copydir/build/$x" + for x in pubring.{kbx,gpg}; do + local pubring="${GNUPGHOME:-$USER_HOME/.gnupg}/$x" + [[ -r "$pubring" ]] || continue + $install -m 644 "$pubring" "$copydir/build/.gnupg/$x" done sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf" @@ -252,7 +253,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 +343,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")