diff mbox

[core-updates] gnu: gnupg, libgpg-error updates rebased

Message ID 87vayyccrn.fsf@we.make.ritual.n0.is
State New
Headers show

Commit Message

non such Aug. 18, 2016, 3:33 p.m. UTC
These patches are applied directly on core-updates.

Comments

non such Aug. 18, 2016, 6:34 p.m. UTC | #1
GnuPG 2.1.15 has just been released, but please apply this patch, I'll
have 2.1.15 ready later and send a separate patch of it based on this one.

ng0 <ng0@we.make.ritual.n0.is> writes:

> These patches are applied directly on core-updates.
>
> From b63701cacb87653f6b128aac0046fa3000f8baed Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Thu, 18 Aug 2016 13:38:20 +0000
> Subject: [PATCH 1/2] gnu: libgpg-error: Update to 1.24.
>
> * gnu/packages/gnupg.scm (libgpg-error): Update to 1.24.
> ---
>  gnu/packages/gnupg.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 69adf97..989496f 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -6,7 +6,7 @@
>  ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
>  ;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il>
>  ;;; Copyright © 2016 Christopher Allan Webber <cwebber@dustycloud.org>
> -;;; Copyright © 2016 Nils Gillmann <ng0@libertad.pw>
> +;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -50,7 +50,7 @@
>  (define-public libgpg-error
>    (package
>      (name "libgpg-error")
> -    (version "1.22")
> +    (version "1.24")
>      (source
>       (origin
>        (method url-fetch)
> @@ -58,7 +58,7 @@
>                            version ".tar.bz2"))
>        (sha256
>         (base32
> -        "0ywxwswizmkyciy480kzczxn6nhbgzf3z8my4nk43nvv67k4x87j"))))
> +        "0h75sf1ngr750c3fjfn4583q7wz40qm63jhg8vjfdrbx936f2s4j"))))
>      (build-system gnu-build-system)
>      (home-page "https://gnupg.org")
>      (synopsis "Library of error values for GnuPG components")
> -- 
> 2.9.3
>
> From a929ccb1ad245c791d0ddd18b77650d0967d615b Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Thu, 18 Aug 2016 15:25:07 +0000
> Subject: [PATCH 2/2] gnu: gnupg: Update to 2.1.14.
>
> * gnu/packages/gnupg.scm (gnupg): Update to 2.1.14.
>
> Co-authored by: Leo Famulari <leo@famulari.name>
> ---
>  gnu/packages/gnupg.scm | 11 ++++++++---
>  1 file changed, 8 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 989496f..4edc282 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -209,14 +209,14 @@ compatible to GNU Pth.")
>  (define-public gnupg
>    (package
>      (name "gnupg")
> -    (version "2.1.13")
> +    (version "2.1.14")
>      (source (origin
>                (method url-fetch)
>                (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
>                                    ".tar.bz2"))
>                (sha256
>                 (base32
> -                "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag"))))
> +                "0hmsiscpdpdqd8kcjpzkz2gzcc3cnrvswk9p1jzi4sivd7lxwl4l"))))
>      (build-system gnu-build-system)
>      (native-inputs
>       `(("pkg-config" ,pkg-config)))
> @@ -242,7 +242,12 @@ compatible to GNU Pth.")
>            (lambda _
>              (substitute* "tests/openpgp/defs.inc"
>                (("/bin/pwd") (which "pwd")))
> -            #t)))))
> +            #t))
> +        (add-after 'build 'patch-scheme-tests
> +          (lambda _
> +            (substitute* (find-files "tests" ".\\.scm$")
> +              (("/usr/bin/env gpgscm")
> +               (string-append (getcwd) "/tests/gpgscm/gpgscm"))))))))
>      (home-page "https://gnupg.org/")
>      (synopsis "GNU Privacy Guard")
>      (description
> -- 
> 2.9.3
>
>
>
> -- 
> ng0
> For non-prism friendly talk find me on http://www.psyced.org
Leo Famulari Aug. 18, 2016, 6:54 p.m. UTC | #2
On Thu, Aug 18, 2016 at 06:34:24PM +0000, ng0 wrote:
> GnuPG 2.1.15 has just been released, but please apply this patch, I'll
> have 2.1.15 ready later and send a separate patch of it based on this one.

I applied your update patch for libgpg-error, but I rewrote the gnupg
update patch from scratch.

So, no need for a "gnupg: Update to 2.1.15" patch. It's already done.
non such Aug. 18, 2016, 7:27 p.m. UTC | #3
Leo Famulari <leo@famulari.name> writes:

> On Thu, Aug 18, 2016 at 06:34:24PM +0000, ng0 wrote:
>> GnuPG 2.1.15 has just been released, but please apply this patch, I'll
>> have 2.1.15 ready later and send a separate patch of it based on this one.
>
> I applied your update patch for libgpg-error, but I rewrote the gnupg
> update patch from scratch.
>
> So, no need for a "gnupg: Update to 2.1.15" patch. It's already done.

I'm not so sure. My build of it failed when the tests happened, which is
why my patch included a fix for that:
https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html

It sets $HOME, so that the tests of gnupg-2.1.15 can succeed.
Leo Famulari Aug. 19, 2016, 4:55 a.m. UTC | #4
On Thu, Aug 18, 2016 at 07:27:14PM +0000, ng0 wrote:
> Leo Famulari <leo@famulari.name> writes:
> 
> > On Thu, Aug 18, 2016 at 06:34:24PM +0000, ng0 wrote:
> >> GnuPG 2.1.15 has just been released, but please apply this patch, I'll
> >> have 2.1.15 ready later and send a separate patch of it based on this one.
> >
> > I applied your update patch for libgpg-error, but I rewrote the gnupg
> > update patch from scratch.
> >
> > So, no need for a "gnupg: Update to 2.1.15" patch. It's already done.
> 
> I'm not so sure. My build of it failed when the tests happened, which is
> why my patch included a fix for that:
> https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html

Ah, you're right. Can you send a patch for core-updates?
non such Aug. 19, 2016, 7 a.m. UTC | #5
Leo Famulari <leo@famulari.name> writes:

> On Thu, Aug 18, 2016 at 07:27:14PM +0000, ng0 wrote:
>> Leo Famulari <leo@famulari.name> writes:
>> 
>> > On Thu, Aug 18, 2016 at 06:34:24PM +0000, ng0 wrote:
>> >> GnuPG 2.1.15 has just been released, but please apply this patch, I'll
>> >> have 2.1.15 ready later and send a separate patch of it based on this one.
>> >
>> > I applied your update patch for libgpg-error, but I rewrote the gnupg
>> > update patch from scratch.
>> >
>> > So, no need for a "gnupg: Update to 2.1.15" patch. It's already done.
>> 
>> I'm not so sure. My build of it failed when the tests happened, which is
>> why my patch included a fix for that:
>> https://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html
>
> Ah, you're right. Can you send a patch for core-updates?

http://lists.gnu.org/archive/html/guix-devel/2016-08/msg01276.html
includes this already.
diff mbox

Patch

From a929ccb1ad245c791d0ddd18b77650d0967d615b Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Thu, 18 Aug 2016 15:25:07 +0000
Subject: [PATCH 2/2] gnu: gnupg: Update to 2.1.14.

* gnu/packages/gnupg.scm (gnupg): Update to 2.1.14.

Co-authored by: Leo Famulari <leo@famulari.name>
---
 gnu/packages/gnupg.scm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 989496f..4edc282 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -209,14 +209,14 @@  compatible to GNU Pth.")
 (define-public gnupg
   (package
     (name "gnupg")
-    (version "2.1.13")
+    (version "2.1.14")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
                                   ".tar.bz2"))
               (sha256
                (base32
-                "0xcn46vcb5x5qx0bc803vpzhzhnn6wfhp7x71w9n1ahx4ak877ag"))))
+                "0hmsiscpdpdqd8kcjpzkz2gzcc3cnrvswk9p1jzi4sivd7lxwl4l"))))
     (build-system gnu-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
@@ -242,7 +242,12 @@  compatible to GNU Pth.")
           (lambda _
             (substitute* "tests/openpgp/defs.inc"
               (("/bin/pwd") (which "pwd")))
-            #t)))))
+            #t))
+        (add-after 'build 'patch-scheme-tests
+          (lambda _
+            (substitute* (find-files "tests" ".\\.scm$")
+              (("/usr/bin/env gpgscm")
+               (string-append (getcwd) "/tests/gpgscm/gpgscm"))))))))
     (home-page "https://gnupg.org/")
     (synopsis "GNU Privacy Guard")
     (description
-- 
2.9.3