From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id SPZzOUXgGl+0dwAA0tVLHw (envelope-from ) for ; Fri, 24 Jul 2020 13:21:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id cDpINUXgGl/BFAAA1q6Kng (envelope-from ) for ; Fri, 24 Jul 2020 13:21:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id E08DC940AEC for ; Fri, 24 Jul 2020 13:21:08 +0000 (UTC) Received: from localhost ([::1]:46620 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyxdL-0004cA-7O for larch@yhetil.org; Fri, 24 Jul 2020 09:21:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42702) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyxdG-0004Yl-6y for guix-patches@gnu.org; Fri, 24 Jul 2020 09:21:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35749) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jyxdF-00009z-St for guix-patches@gnu.org; Fri, 24 Jul 2020 09:21:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jyxdF-0005cb-Ps for guix-patches@gnu.org; Fri, 24 Jul 2020 09:21:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42404] [PATCH 3/5] gnu: Add rnp. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 Jul 2020 13:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42404 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Justus Winter Cc: 42404@debbugs.gnu.org Received: via spool by 42404-submit@debbugs.gnu.org id=B42404.159559685621577 (code B ref 42404); Fri, 24 Jul 2020 13:21:01 +0000 Received: (at 42404) by debbugs.gnu.org; 24 Jul 2020 13:20:56 +0000 Received: from localhost ([127.0.0.1]:47295 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyxdA-0005bx-5d for submit@debbugs.gnu.org; Fri, 24 Jul 2020 09:20:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49134) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyxd9-0005bl-A7 for 42404@debbugs.gnu.org; Fri, 24 Jul 2020 09:20:55 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:51748) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyxd3-00008m-97; Fri, 24 Jul 2020 09:20:49 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=49626 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jyxd2-0004q2-BE; Fri, 24 Jul 2020 09:20:48 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <87365hw48b.fsf@europa.jade-hamburg.de> <20200724124341.18545-1-justus@sequoia-pgp.org> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 7 Thermidor an 228 de la =?UTF-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Fri, 24 Jul 2020 15:20:45 +0200 In-Reply-To: <20200724124341.18545-1-justus@sequoia-pgp.org> (Justus Winter's message of "Fri, 24 Jul 2020 14:43:41 +0200") Message-ID: <87tuxx82xe.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: Z5WSBGY+GnbQ Hi! Justus Winter 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 > +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 =3D {'AES' : 'aes128', 'AES192' := 'aes192', 'AES256' : 'aes256' > + 'IDEA' : 'idea', '3DES' : '3des', 'CAST5' : 'cast5', 'BLOWFISH'= : 'blowfish'} > +=20 > + def check_packets(fname, regexp): > +- ret, output, err =3D run_proc(GPG, ['--list-packets', path_for_gpg(= fname)]) > ++ ret, output, err =3D 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=E2=80=99t have to ca= rry 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 > +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=E2=80=99.