summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2018-01-03 00:47:36 -0500
committerLuke Shumaker <lukeshu@parabola.nu>2018-05-20 21:57:40 -0400
commitfc371c3c7149f23a6ddcebaf8c95133284a904e8 (patch)
tree47f6d8e70f1d76356406b37e903cac506563fa7c
parent172abd9998cffa3622fb8afbd0d241840dfc3946 (diff)
downloaddevtools32-fc371c3c7149f23a6ddcebaf8c95133284a904e8.tar.xz
makechrootpkg: Put "keyserver-options auto-key-retrieve" in gpg.conf
This allows signature verification by `makepkg --verifysource`, `git verify-tag`, and such without requiring the user to manually retrieve the keys first. This is based off of devtools32 commit 009695b (2017-06-27) by Erich Eckner <git@eckner.net>. There are 2 differences from that commit: - In this version, gpg.conf is owned by builduser, not by root - In this version, we don't keep appending duplicate lines if we re-use a chroot
-rw-r--r--makechrootpkg.in1
1 files changed, 1 insertions, 0 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 041e591..6105a64 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -187,6 +187,7 @@ prepare_chroot() {
[[ -r $USER_HOME/$x ]] || continue
$install -m 644 "$USER_HOME/$x" "$copydir/build/$x"
done
+ $install -m644 /dev/stdin "$copydir/build/.gnupg/gpg.conf" <<<'keyserver-options auto-key-retrieve'
sed -e '/^MAKEFLAGS=/d' -e '/^PACKAGER=/d' -i "$copydir/etc/makepkg.conf"
for x in BUILDDIR=/build PKGDEST=/pkgdest SRCPKGDEST=/srcpkgdest SRCDEST=/srcdest LOGDEST=/logdest \