Christian Hesse <mail@xxxxxxxx> writes:
> GnuPG 2.1 homedir looks different, so just creat it on the fly by
> importing needed private and public keys and ownertrust.
> This solves an issue with gnupg 2.1 running interactive pinentry when
> old secret key is present.
>
> Additionally GnuPG 2.1 does not longer support RFC1991, so skip these
> tests.
> ---
Needs a sign-off.
Are older GPG implementations still happy with this new way to
initialize their gpghome?
> t/lib-gpg.sh | 13 ++++++++++---
> t/lib-gpg/ownertrust | 4 ++++
> t/lib-gpg/random_seed | Bin 600 -> 0 bytes
> t/lib-gpg/trustdb.gpg | Bin 1360 -> 0 bytes
> t/t7004-tag.sh | 14 +++++++-------
> 5 files changed, 21 insertions(+), 10 deletions(-)
> create mode 100644 t/lib-gpg/ownertrust
> delete mode 100644 t/lib-gpg/random_seed
> delete mode 100644 t/lib-gpg/trustdb.gpg
Do these trust files need to be shipped? In other words, would it
be insufficient to just import private-public keyrings? I know we
have been shipping trustdb.gpg, and I do not think it is a problem
to ship export-ownertrust output, but as long as we are cleaning
things up to make us compatible with both older and newer GPG,
I thought I'd ask ;-)
> diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
> index cd2baef..17c45ad 100755
> --- a/t/lib-gpg.sh
> +++ b/t/lib-gpg.sh
> @@ -16,12 +16,19 @@ else
> # Type DSA and Elgamal, size 2048 bits, no expiration date.
> # Name and email: C O Mitter <committer@xxxxxxxxxxx>
> # No password given, to enable non-interactive operation.
> - cp -R "$TEST_DIRECTORY"/lib-gpg ./gpghome
> - chmod 0700 gpghome
> - chmod 0600 gpghome/*
> + mkdir ./gpghome
> + chmod 0700 ./gpghome
> GNUPGHOME="$(pwd)/gpghome"
> export GNUPGHOME
> + gpg --homedir "${GNUPGHOME}" --import \
> + "$TEST_DIRECTORY"/lib-gpg/pubring.gpg \
> + "$TEST_DIRECTORY"/lib-gpg/secring.gpg
> + gpg --homedir "${GNUPGHOME}" --import-ownertrust \
> + "$TEST_DIRECTORY"/lib-gpg/ownertrust
> test_set_prereq GPG
> + if [ -e "${GNUPGHOME}"/pubring.kbx ]; then
> + test_set_prereq GNUPG21
> + fi
Instead of !GNUPG21 prerequisite, how about using a RFC1991
prerequisite, which is satisfied by older GPG but not by the ones
that lack support? That is,
...
test_set_prereq GPG
if ! test "${GNUPGHOME}"/pubring.kbx
then
test_set_prereq GPG_RFC1991
fi
or something. That way, we do not have to be in a funny situation
where we say a version of GPG satisfies GNUPG21 prereq but it in
fact is GPG version 4.3 in the future.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html