Re: [arch-projects] [devtools] [PATCH v2] makechrootpkg: respect GNUPGHOME
Le 27/02/2018 à 17:16, Emiel Wiedijk via arch-projects a écrit :
> 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")
Does not seem to work for me:
GNUPGHOME=/path/to/svn-community/.gnupg/ extra-x86_64-build
…
==> Verifying source file signatures with gpg...
flickcurl-1.26.tar.gz ... FAILED (unknown public key 43EC92504F71955A)
…
(I have previously retrieved this key using
`GNUPGHOME=/path/to/svn-community/.gnupg/ gpg --recv-keys
43EC92504F71955A` of course)
signature.asc
Description: OpenPGP digital signature
[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20170824 created. 20170824
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official devtools repository". The annotated tag, 20170824 has been created at 97687a9ed53b5f10e6e2768770706cc3e8a02e7e (tag) tagging 24a298d475ae0af6d8d0a109b9476dd567cbdf7b (commit) replaces 20170813 tagged by Jan Alexander Steffens (heftig) on Thu Aug 24 17:21:17 2017 +0200 - Log - Version 20170824 -BEGIN PGP SIGNATURE- iQEzBAABCAAdFiEEghj4iEmqxSLpTPRwpekojE+kFfoFAlme7u0ACgkQpekojE+k FfqleggAsM3cViq2lFxHvwN+vlx5me3MJOJ1vnc6zQZwn4GFSWDZXXMUTBWogPXh Ahrs3FCZjUQdI3ZB+3ph5ztQVRWF36UbMAq6Q9IO6XfpMyidJynq7ly6VPdRDA3v B6f5BiofKlRN3ExLi3wATaBXBemrrqH10LoQUcnqdAN3Gh66oIv8p4Ti749UaLC/ MDxLjZFYuzB5P91RQ0Puv26sHrkDFgMjMoGB9GaZ+GIN51UNBQRjh9IuUX8xNfrr xmG/ojtKSWkVSpdyRIV3sGm6Cjs84AhXdiV3LdbWuXCjO9741FEyzyQSzD6t4crj nYWaIOBVNdkhX9ZRnubLHcDCZhLVqw== =VhQP -END PGP SIGNATURE- Jan Alexander Steffens (heftig) (3): arch-nspawn: Add --keep-unit to prevent scope conflicts makechrootpkg: Also look for -e as --noextract Version 20170824 Martchus (1): makechrootpkg: Prevent removing build dir when --noextract specified --- hooks/post-receive -- The official devtools repository
[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20180528-3-g6364b3c
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The official devtools repository".
The branch, master has been updated
via 6364b3c9b9fae2b43bf3e02b9e84c814fc3f502f (commit)
via 98ff92f4675aeab379b9d5ed85e68778e1cc0dfe (commit)
from e414173f8984485ff850e1fba0f8cf97cd970064 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 6364b3c9b9fae2b43bf3e02b9e84c814fc3f502f
Author: Jan Alexander Steffens (heftig)
Date: Thu May 31 16:05:49 2018 +0200
Version 20180531
commit 98ff92f4675aeab379b9d5ed85e68778e1cc0dfe
Author: Eli Schwartz via arch-projects
Date: Tue May 29 17:23:10 2018 -0400
makechrootpkg: whitelist return code 14 from makepkg
makepkg 5.1 implements error codes, and 14 means that installing the
packages after they were built has failed. We don't care about this
error and would like makechrootpkg to succeed regardless, e.g. for split
packages that are mutually exclusive.
Signed-off-by: Eli Schwartz
---
Summary of changes:
Makefile | 2 +-
makechrootpkg.in | 7 +++
2 files changed, 8 insertions(+), 1 deletion(-)
hooks/post-receive
--
The official devtools repository
