From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4Js8LsG3Gl+YSwAA0tVLHw (envelope-from ) for ; Fri, 24 Jul 2020 10:28:17 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 8G36KcG3Gl96dwAAbx9fmQ (envelope-from ) for ; Fri, 24 Jul 2020 10:28:17 +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 264DE94053E for ; Fri, 24 Jul 2020 10:28:17 +0000 (UTC) Received: from localhost ([::1]:54810 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyuw2-0002NC-EW for larch@yhetil.org; Fri, 24 Jul 2020 06:28:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jyuvq-0002MS-J6 for guix-patches@gnu.org; Fri, 24 Jul 2020 06:28:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:35370) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jyuvq-0000uI-A5 for guix-patches@gnu.org; Fri, 24 Jul 2020 06:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jyuvq-00034F-6F for guix-patches@gnu.org; Fri, 24 Jul 2020 06:28:02 -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 10:28:02 +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.159558647511779 (code B ref 42404); Fri, 24 Jul 2020 10:28:02 +0000 Received: (at 42404) by debbugs.gnu.org; 24 Jul 2020 10:27:55 +0000 Received: from localhost ([127.0.0.1]:46916 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyuvj-00033v-4A for submit@debbugs.gnu.org; Fri, 24 Jul 2020 06:27:55 -0400 Received: from eggs.gnu.org ([209.51.188.92]:55384) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jyuvh-00033h-Fm for 42404@debbugs.gnu.org; Fri, 24 Jul 2020 06:27:53 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:42956) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jyuvb-0000sQ-DE; Fri, 24 Jul 2020 06:27:47 -0400 Received: from [2001:660:6102:320:e120:2c8f:8909:cdfe] (port=49028 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1jyuvb-0006ci-0w; Fri, 24 Jul 2020 06:27:47 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: <20200723120322.8385-1-justus@sequoia-pgp.org> <20200723120322.8385-3-justus@sequoia-pgp.org> Date: Fri, 24 Jul 2020 12:27:45 +0200 In-Reply-To: <20200723120322.8385-3-justus@sequoia-pgp.org> (Justus Winter's message of "Thu, 23 Jul 2020 14:03:20 +0200") Message-ID: <87h7txb42m.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: qu6wL+aTCyri Hi Justus, 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-cp.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. > * gnu/packages/patches/rnp-update-expiration-16ecb289.patch: New file. Could you add the patches to gnu/local.mk? > + (home-page "https://www.rnpgp.com/") > + (license (list license:bsd-2 license:asl2.0 license:bsd-3)))) Could you add a comment (a couple of lines) stating whether it=E2=80=99s tr= iple licensing or rather that several parts come under different licenses? The patch overall LGTM but I=E2=80=99m concerned by the relatively large nu= mber of patches and the fact that their upstream status is unknown. Seems to me that many of them ought to be upstream no? If they are upstream, can we instead either wait for a release that includes them, or take a snapshot that includes them? > diff --git a/gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch b/gnu/= packages/patches/rnp-disable-ruby-rnp-tests.patch > new file mode 100644 > index 0000000000..5c8c06524d > --- /dev/null > +++ b/gnu/packages/patches/rnp-disable-ruby-rnp-tests.patch > @@ -0,0 +1,25 @@ > +From 9f3c07601393e219cc5979f93fda57bf2d07dee7 Mon Sep 17 00:00:00 2001 > +From: Justus Winter > +Date: Tue, 21 Jul 2020 16:10:21 +0200 > +Subject: [PATCH 6/6] Disable ruby-rnp tests. What=E2=80=99s the rationale? Would #:tests? #f have the same effect? > diff --git a/gnu/packages/patches/rnp-fix-cp.patch b/gnu/packages/patches= /rnp-fix-cp.patch > new file mode 100644 > index 0000000000..039912d953 > --- /dev/null > +++ b/gnu/packages/patches/rnp-fix-cp.patch > @@ -0,0 +1,27 @@ > +From c163e1b12511e9e7df752a01767a2a8ba56c4196 Mon Sep 17 00:00:00 2001 > +From: Justus Winter > +Date: Tue, 21 Jul 2020 15:52:37 +0200 > +Subject: [PATCH 1/6] Make copying more robust. > + > +Let the shell locate 'cp'. This is more robust in environments such > +as Guix or Nix that do not provide /bin/cp. > +--- > + src/tests/support.cpp | 2 +- > + 1 file changed, 1 insertion(+), 1 deletion(-) > + > +diff --git a/src/tests/support.cpp b/src/tests/support.cpp > +index 3d6a6dc9..d260e166 100644 > +--- a/src/tests/support.cpp > ++++ b/src/tests/support.cpp > +@@ -283,7 +283,7 @@ copy_recursively(const char *src, const char *dst) > + // TODO: maybe use fts or something less hacky > + char buf[2048]; > + #ifndef _WIN32 > +- snprintf(buf, sizeof(buf), "/bin/cp -a '%s' '%s'", src, dst); > ++ snprintf(buf, sizeof(buf), "cp -a '%s' '%s'", src, dst); I=E2=80=99d rather add a build phase that replaces /bin/cp with (which "cp"= ) or similar. That way, the package would be self-contained (no need to manually add Coreutils on $PATH). > +++ b/gnu/packages/patches/rnp-fix-true-false.patch > @@ -0,0 +1,253 @@ > +From 028a2f50fbf47d989bbf79be589945bec55b4825 Mon Sep 17 00:00:00 2001 > +From: Justus Winter > +Date: Tue, 21 Jul 2020 15:57:57 +0200 > +Subject: [PATCH 3/6] Use 'true' and 'false' instead of 'TRUE' and 'FALSE= '. > + > +The latter are not guaranteed to be defined. This should probably be upstream, but if we have to have it, how about making this change with =E2=80=98substitute*=E2=80=99 instead? > +++ b/gnu/packages/patches/rnp-update-expiration-16ecb289.patch > @@ -0,0 +1,208 @@ > +commit 16ecb28974b18e51f9060c86c7229f3b7e1cbb88 > +Author: Nickolay Olshevsky > +Date: Fri Apr 10 16:29:52 2020 +0300 > + > + Update expiration date of test keys. This is bound to expire again. :-) How about using faketime instead, as is done for the =E2=80=98nss=E2=80=99 = package? Thanks! Ludo=E2=80=99.