From: "Ludovic Courtès" <ludo@gnu.org>
To: Justus Winter <justus@sequoia-pgp.org>
Cc: 42404@debbugs.gnu.org
Subject: [bug#42404] [PATCH 3/5] gnu: Add rnp.
Date: Fri, 24 Jul 2020 15:20:45 +0200 [thread overview]
Message-ID: <87tuxx82xe.fsf@gnu.org> (raw)
In-Reply-To: <20200724124341.18545-1-justus@sequoia-pgp.org> (Justus Winter's message of "Fri, 24 Jul 2020 14:43:41 +0200")
Hi!
Justus Winter <justus@sequoia-pgp.org> skribis:
> * gnu/packages/openpgp.scm (rnp): New variable.
> * gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch: New file.
> * gnu/packages/patches/rnp-fix-gnupg-list-packets.patch: New file.
> * gnu/packages/patches/rnp-fix-test-setup.patch: New file.
> * gnu/packages/patches/rnp-fix-test.patch: New file.
> * gnu/packages/patches/rnp-fix-true-false.patch: New file.
> * gnu/packages/patches/rnp-unbundle-googletest.patch: New file.
Thanks for the quick update!
Some (hopefully final!) comments:
> +++ b/gnu/packages/patches/rnp-fix-gnupg-list-packets.patch
> @@ -0,0 +1,37 @@
> +From 4cb5b2c1d3783bfad3c4f77b2ad2ac89921e91f4 Mon Sep 17 00:00:00 2001
> +From: Justus Winter <teythoon@avior.uberspace.de>
> +Date: Tue, 21 Jul 2020 16:03:32 +0200
> +Subject: [PATCH 4/6] Make invoking GnuPG more robust.
> +
> +GnuPG will try to read its state even for operations that do not
> +require it, e.g. listing packets. If the state directory does not
> +exist, GnuPG will try to create it. If this fails, GnuPG errors out.
> +
> +In some build environments, $HOME may not exist or may not be
> +writable (e.g. in Guix and Nix, $HOME does not exist). This leads to
> +a spurious test failures when GnuPG is invoked to inspect packets.
> +
> +Fix this by using the current directory as GnuPG state directory.
> +
> +Merged upstream as 681e3be65594469f2e6e5912b4371d1af981d7c7.
> +---
> + src/tests/cli_tests.py | 3 ++-
> + 1 file changed, 2 insertions(+), 1 deletion(-)
> +
> +diff --git a/src/tests/cli_tests.py b/src/tests/cli_tests.py
> +index 74b28983..2b7d772a 100755
> +--- a/src/tests/cli_tests.py
> ++++ b/src/tests/cli_tests.py
> +@@ -106,7 +106,8 @@ RNP_TO_GPG_CIPHERS = {'AES' : 'aes128', 'AES192' : 'aes192', 'AES256' : 'aes256'
> + 'IDEA' : 'idea', '3DES' : '3des', 'CAST5' : 'cast5', 'BLOWFISH' : 'blowfish'}
> +
> + def check_packets(fname, regexp):
> +- ret, output, err = run_proc(GPG, ['--list-packets', path_for_gpg(fname)])
> ++ ret, output, err = run_proc(GPG, ['--homedir', '.',
For the purposes of the tests, how about simply adding a pre-check phase
that does: (setenv "HOME" (getpwd)) ? That way we won’t have to carry
another patch.
> +++ b/gnu/packages/patches/rnp-fix-test-setup.patch
> @@ -0,0 +1,36 @@
> +From f544b3e63416f3a824ed2955d119ea0d36c88b36 Mon Sep 17 00:00:00 2001
> +From: Justus Winter <teythoon@avior.uberspace.de>
> +Date: Tue, 21 Jul 2020 16:00:37 +0200
> +Subject: [PATCH] Make test environment setup more robust.
> +
> +Previously, a failing test leaving RNP or GnuPG state directories
> +behind would cause all tests following it to fail. Improve this by
> +removing the directories first should they exist.
> +
> +Merged upstream as 203224f0b1505dba17837c03da603e5b98ab125a.
[...]
> +Subject: [PATCH 2/6] Fix possible rare failure in test_key_unlock_pgp() test.
> +
> +Fixed upstream in ba5030620dba3e8684b31ef28687390ca693bf9d.
[...]
> +Subject: [PATCH 3/6] Use 'true' and 'false' instead of 'TRUE' and 'FALSE'.
> +
> +The latter are not guaranteed to be defined.
> +
> +Fixed upstream in 0a28a7e982cb229ba041290af073e6d7ede19955.
Should we just pick a Git snapshot for now instead of carrying these
patches? I tend to freak out when I see many patches. ;-)
Thanks,
Ludo’.
next prev parent reply other threads:[~2020-07-24 13:21 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-17 9:36 [bug#42404] [PATCH] gnu: Add libtmcg and dkgpg Justus Winter
[not found] ` <87y2nfp5c6.fsf@gnu.org>
2020-07-20 8:53 ` Justus Winter
2020-07-20 9:28 ` [bug#42404] [PATCH 1/2] gnu: Add libtmcg Justus Winter
2020-07-20 9:28 ` [bug#42404] [PATCH 2/2] gnu: Add dkgpg Justus Winter
2020-07-23 12:03 ` [bug#42404] [PATCH 1/5] gnu: Add libtmcg Justus Winter
2020-07-23 12:03 ` [bug#42404] [PATCH 2/5] gnu: Add dkgpg Justus Winter
2020-07-23 12:03 ` [bug#42404] [PATCH 3/5] gnu: Add rnp Justus Winter
2020-07-24 10:27 ` Ludovic Courtès
2020-07-24 11:18 ` Justus Winter
2020-07-24 12:43 ` Justus Winter
2020-07-24 13:20 ` Ludovic Courtès [this message]
2020-07-27 13:38 ` [bug#42404] [PATCH 1/3] " Justus Winter
2020-07-27 13:44 ` Justus Winter
2020-07-28 22:16 ` Ludovic Courtès
2020-07-23 12:03 ` [bug#42404] [PATCH 4/5] gnu: Add python-pgpy Justus Winter
2020-07-23 12:03 ` [bug#42404] [PATCH 5/5] gnu: Add python-sop Justus Winter
2020-07-28 22:19 ` bug#42404: " Ludovic Courtès
2020-07-24 12:21 ` [bug#42404] [PATCH 1/5] gnu: Add libtmcg Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87tuxx82xe.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=42404@debbugs.gnu.org \
--cc=justus@sequoia-pgp.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).