GNU bug report logs - #33243
[PATCH 0/1] Update libgcrypt

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 33243 in the body.
You can then email your comments to 33243 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: <guix-patches <at> gnu.org>
Subject: [PATCH 0/1] Update libgcrypt
Date: Fri, 2 Nov 2018 18:12:07 +0100

[Message part 1 (text/plain, inline)]

This patch updates libgcrypt to 1.8.4.

The reproducibility problem was fixed upstream and thus the patch was
removed from package definition.

I applied this on core-updates-next, was that the right branch?

Björn

[Message part 2 (application/pgp-signature, inline)]

Message #8 received at 33243 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: 33243 <at> debbugs.gnu.org
Subject: [PATCH 1/1] gnu: libgcrypt: Update to 1.8.4.
Date: Fri, 2 Nov 2018 18:31:20 +0100

[Message part 1 (text/plain, inline)]

Update libgcrypt and remove reproducibility patch, it is now built-in.
See https://dev.gnupg.org/T4102

* gnu/packages/gnupg.scm (libgcrypt): Update to 1.8.4.
[source]: Remove patch.
* gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch: Delete file.
* gnu/local.mk(dist_patch_DATA): Remove it.
---
 gnu/local.mk                                  |  1 -
 gnu/packages/gnupg.scm                        |  7 ++--
 .../libgcrypt-make-yat2m-reproducible.patch   | 32 -------------------
 3 files changed, 3 insertions(+), 37 deletions(-)
 delete mode 100644 gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 4ba49e86a..ce45c64ec 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -885,7 +885,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/libevent-2.1-skip-failing-test.patch	\
   %D%/packages/patches/libexif-CVE-2016-6328.patch		\
   %D%/packages/patches/libexif-CVE-2017-7544.patch		\
-  %D%/packages/patches/libgcrypt-make-yat2m-reproducible.patch	\
   %D%/packages/patches/libgit2-mtime-0.patch			\
   %D%/packages/patches/libgdata-fix-tests.patch			\
   %D%/packages/patches/libgdata-glib-duplicate-tests.patch	\
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 3d6727bbd..0b8d3e578 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2017 Petter <petter <at> mykolab.ch>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2018 Marius Bakke <mbakke <at> fastmail.com>
+;;; Copyright © 2018 Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -97,16 +98,14 @@ Daemon and possibly more in the future.")
 (define-public libgcrypt
   (package
     (name "libgcrypt")
-    (version "1.8.3")
+    (version "1.8.4")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnupg/libgcrypt/libgcrypt-"
                                  version ".tar.bz2"))
              (sha256
               (base32
-               "0z5gs1khzyknyfjr19k8gk4q148s6q987ya85cpn0iv70fz91v36"))
-             (patches
-              (search-patches "libgcrypt-make-yat2m-reproducible.patch"))))
+               "09r27ywj9zplq6n9qw3mn7zmvf6y2jdmwx5d1kg8yqkj0qx18f7n"))))
     (build-system gnu-build-system)
     (propagated-inputs
      `(("libgpg-error-host" ,libgpg-error)))
diff --git a/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch b/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch
deleted file mode 100644
index 3056f0baa..000000000
--- a/gnu/packages/patches/libgcrypt-make-yat2m-reproducible.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Make yat2m in libgcrypt respect SOURCE_DATE_EPOCH, making
-the build reproducible.
-
-This was already fixed upstream in GnuPG:
-https://dev.gnupg.org/rG139de02b93773615bdd95e04a7f0c1ad73b4f6fb
-
-and in libgpg-error:
-https://dev.gnupg.org/rE5494a5728418938d2e42158bb646b07124184e64
-
-
---- a/doc/yat2m.c 2017-11-23 19:16:58.000000000 +0100
-+++ b/doc/yat2m.c 2017-08-28 12:22:54.000000000 +0200
-@@ -1475,6 +1484,7 @@
- main (int argc, char **argv)
- {
-   int last_argc = -1;
-+  const char *s;
- 
-   opt_source = "GNU";
-   opt_release = "";
-@@ -1608,6 +1618,11 @@
-   if (argc > 1)
-     die ("usage: " PGM " [OPTION] [FILE] (try --help for more information)\n");
- 
-+  /* Take care of supplied timestamp for reproducible builds.  See
-+   * https://reproducible-builds.org/specs/source-date-epoch/  */
-+  if (!opt_date && (s = getenv ("SOURCE_DATE_EPOCH")) && *s)
-+    opt_date = s;
-+
-   /* Start processing. */
-   if (argc && strcmp (*argv, "-"))
-     {
-- 
2.19.1

[Message part 2 (application/pgp-signature, inline)]

Message #11 received at 33243 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
Cc: 33243 <at> debbugs.gnu.org
Subject: Re: [bug#33243] [PATCH 0/1] Update libgcrypt
Date: Fri, 2 Nov 2018 16:31:55 -0400

[Message part 1 (text/plain, inline)]

On Fri, Nov 02, 2018 at 06:12:07PM +0100, Björn Höfling wrote:
> This patch updates libgcrypt to 1.8.4.
> 
> The reproducibility problem was fixed upstream and thus the patch was
> removed from package definition.
> 
> I applied this on core-updates-next, was that the right branch?

Yes, that's the right branch, thank you!

[signature.asc (application/pgp-signature, inline)]

Message #14 received at 33243 <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: Leo Famulari <leo <at> famulari.name>
Cc: 33243 <at> debbugs.gnu.org
Subject: Re: [bug#33243] [PATCH 0/1] Update libgcrypt
Date: Tue, 6 Nov 2018 07:45:48 +0100

[Message part 1 (text/plain, inline)]

On Fri, 2 Nov 2018 16:31:55 -0400
Leo Famulari <leo <at> famulari.name> wrote:

> On Fri, Nov 02, 2018 at 06:12:07PM +0100, Björn Höfling wrote:
> > This patch updates libgcrypt to 1.8.4.
> > 
> > The reproducibility problem was fixed upstream and thus the patch
> > was removed from package definition.
> > 
> > I applied this on core-updates-next, was that the right branch?  
> 
> Yes, that's the right branch, thank you!

Just to be sure: I applied locally, someone with commit rights need to
commit it.

I also built gnupg successfully as a test.

Björn

[Message part 2 (application/pgp-signature, inline)]

Message #17 received at 33243 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
Cc: 33243 <at> debbugs.gnu.org, Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#33243] [PATCH 0/1] Update libgcrypt
Date: Wed, 14 Nov 2018 12:13:29 +0100

[Message part 1 (text/plain, inline)]

Hello Björn,

Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> skribis:

> On Fri, 2 Nov 2018 16:31:55 -0400
> Leo Famulari <leo <at> famulari.name> wrote:
>
>> On Fri, Nov 02, 2018 at 06:12:07PM +0100, Björn Höfling wrote:
>> > This patch updates libgcrypt to 1.8.4.
>> > 
>> > The reproducibility problem was fixed upstream and thus the patch
>> > was removed from package definition.
>> > 
>> > I applied this on core-updates-next, was that the right branch?  
>> 
>> Yes, that's the right branch, thank you!
>
> Just to be sure: I applied locally, someone with commit rights need to
> commit it.

I think you could be that person.  :-)

Could you create an account on Savannah, upload the OpenPGP key you’ll
use to sign commits there (via the web UI), and reply to this message
signed with the same key and giving me your account name?

Thanks in advance!

Ludo’.

[signature.asc (application/pgp-signature, inline)]

Message #20 received at 33243 <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>,
 33243 <at> debbugs.gnu.org
Subject: Re: [bug#33243] [PATCH 0/1] Update libgcrypt
Date: Wed, 14 Nov 2018 12:40:29 -0500

[Message part 1 (text/plain, inline)]

On Wed, Nov 14, 2018 at 12:13:29PM +0100, Ludovic Courtès wrote:
> I think you could be that person.  :-)
> 
> Could you create an account on Savannah, upload the OpenPGP key you’ll
> use to sign commits there (via the web UI), and reply to this message
> signed with the same key and giving me your account name?
> 
> Thanks in advance!

Great! Please also make sure to read the HACKING file in our Git repo.

[signature.asc (application/pgp-signature, inline)]

Message #25 received at 33243-done <at> debbugs.gnu.org (full text, mbox):

From: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
To: ludo <at> gnu.org (Ludovic Courtès), 33243-done <at> debbugs.gnu.org
Cc: Ricardo Wurmus <rekado <at> elephly.net>, Leo Famulari <leo <at> famulari.name>
Subject: Re: [bug#33243] [PATCH 0/1] Update libgcrypt
Date: Sun, 18 Nov 2018 13:03:25 +0100

[Message part 1 (text/plain, inline)]

On Fri, 16 Nov 2018 10:29:50 +0100
ludo <at> gnu.org (Ludovic Courtès) wrote:

> Hello!
> 
> Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de> skribis:
> 
> > On Wed, 14 Nov 2018 12:40:29 -0500
> > Leo Famulari <leo <at> famulari.name> wrote:
> >  
> >> On Wed, Nov 14, 2018 at 12:13:29PM +0100, Ludovic Courtès wrote:  
> >> > I think you could be that person.  :-)

Pushed under core-updates-next:

02d83c247931045cf899433223e1b1a51f605a9f

First push to Guix. Is everything fine?

Björn

[Message part 2 (application/pgp-signature, inline)]

Message #28 received at 33243-done <at> debbugs.gnu.org (full text, mbox):

From: Leo Famulari <leo <at> famulari.name>
To: Björn Höfling <bjoern.hoefling <at> bjoernhoefling.de>
Cc: Ricardo Wurmus <rekado <at> elephly.net>,
 Ludovic Courtès <ludo <at> gnu.org>, 33243-done <at> debbugs.gnu.org
Subject: Re: [bug#33243] [PATCH 0/1] Update libgcrypt
Date: Sun, 18 Nov 2018 17:34:22 -0500

[Message part 1 (text/plain, inline)]

On Sun, Nov 18, 2018 at 01:03:25PM +0100, Björn Höfling wrote:
> Pushed under core-updates-next:
> 
> 02d83c247931045cf899433223e1b1a51f605a9f
> 
> First push to Guix. Is everything fine?

It looks good to me, thank you!

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.