Gnupg update

Gnupg update

[Andreas Enge]

[-- Attachment #1: Type: text/plain, Size: 218 bytes --]

Hello,

the attached patch updates gnupg to the most recent version 2.1.2. As Mark
Weaver pointed out to me, it might be judicious to keep the previous version
as gnupg-2.0 because the interface has changed.

Andreas


[-- Attachment #2: 0001-gnu-gnupg-Add-version-2.1.2.patch --]
[-- Type: text/plain, Size: 3104 bytes --]

From 32f7763e007cf0a690b21072ff4acaeadb213e54 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Thu, 19 Feb 2015 22:01:03 +0100
Subject: [PATCH] gnu: gnupg: Add version 2.1.2.

* gnu/packages/gnupg.scm (gnupg): Update to 2.1.2.
* gnu/packages/gnupg.scm (gnupg-2.0): Copy of previous package for
    version 2.0.26.
---
 gnu/packages/gnupg.scm | 40 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index a7b303b..584b1c6 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -190,14 +190,14 @@ compatible to GNU Pth.")
 (define-public gnupg
   (package
     (name "gnupg")
-    (version "2.0.26")
+    (version "2.1.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
                                   ".tar.bz2"))
               (sha256
                (base32
-                "1q5qcl5panrvcvpwvz6nl9gayl5a6vwvfhgdcxqpmbl2qc6y6n3p"))))
+                "14k7c5spai3yppz6izf1ggbnffskl54ln87v1wgy9pwism1mlks0"))))
     (build-system gnu-build-system)
     (inputs
      `(("bzip2" ,guix:bzip2)
@@ -206,7 +206,7 @@ compatible to GNU Pth.")
        ("libgcrypt" ,libgcrypt)
        ("libgpg-error" ,libgpg-error)
        ("libksba" ,libksba)
-       ("pth" ,pth)
+       ("npth" ,npth)
        ("openldap" ,openldap)
        ("zlib" ,guix:zlib)
        ("readline" ,readline)))
@@ -215,8 +215,8 @@ compatible to GNU Pth.")
        (alist-cons-before
         'configure 'patch-config-files
         (lambda _
-          (substitute* "tests/openpgp/Makefile.in"
-            (("/bin/sh") (which "bash"))))
+          (substitute* "tests/openpgp/defs.inc"
+            (("/bin/pwd") (which "pwd"))))
        %standard-phases)))
     (home-page "http://gnupg.org/")
     (synopsis "GNU Privacy Guard")
@@ -229,6 +229,36 @@ components), libgpg-error (centralized GnuPG error values), and
 libskba (working with X.509 certificates and CMS data).")
     (license gpl3+)))
 
+(define-public gnupg-2.0
+  (package (inherit gnupg)
+    (version "2.0.26")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
+                                  ".tar.bz2"))
+              (sha256
+               (base32
+                "1q5qcl5panrvcvpwvz6nl9gayl5a6vwvfhgdcxqpmbl2qc6y6n3p"))))
+    (inputs
+     `(("bzip2" ,guix:bzip2)
+       ("curl" ,curl)
+       ("libassuan" ,libassuan)
+       ("libgcrypt" ,libgcrypt)
+       ("libgpg-error" ,libgpg-error)
+       ("libksba" ,libksba)
+       ("pth" ,pth)
+       ("openldap" ,openldap)
+       ("zlib" ,guix:zlib)
+       ("readline" ,readline)))
+   (arguments
+    `(#:phases
+       (alist-cons-before
+        'configure 'patch-config-files
+        (lambda _
+          (substitute* "tests/openpgp/Makefile.in"
+            (("/bin/sh") (which "bash"))))
+       %standard-phases)))))
+
 (define-public gnupg-1
   (package (inherit gnupg)
     (version "1.4.18")
-- 
2.2.1

Re: Gnupg update

[Mark H Weaver]

Andreas Enge <andreas@enge.fr> writes:

> Hello,
>
> the attached patch updates gnupg to the most recent version 2.1.2. As Mark
> Weaver pointed out to me, it might be judicious to keep the previous version
> as gnupg-2.0 because the interface has changed.
>
> Andreas
>
>
> From 32f7763e007cf0a690b21072ff4acaeadb213e54 Mon Sep 17 00:00:00 2001
> From: Andreas Enge <andreas@enge.fr>
> Date: Thu, 19 Feb 2015 22:01:03 +0100
> Subject: [PATCH] gnu: gnupg: Add version 2.1.2.
>
> * gnu/packages/gnupg.scm (gnupg): Update to 2.1.2.
> * gnu/packages/gnupg.scm (gnupg-2.0): Copy of previous package for
>     version 2.0.26.

Minor nit: According to our conventions, instead of listing the same
file twice, write this:

* gnu/packages/gnupg.scm (gnupg): Update to 2.1.2.
  (gnupg-2.0): Copy of previous package for version 2.0.26.

Otherwise looks good to me.  Please push!

    Thanks :)
      Mark

Re: Gnupg update

[Mark H Weaver]

One more note of caution: I notice that you added 'npth' to core-updates
instead of master, so I guess this needs to go to core-updates also.  In
retrospect, they both could have gone to master.

    Thanks,
      Mark

Re: Gnupg update

[Andreas Enge]

On Thu, Feb 19, 2015 at 06:44:16PM -0500, Mark H Weaver wrote:
> Minor nit: According to our conventions, instead of listing the same
> file twice, write this:
> * gnu/packages/gnupg.scm (gnupg): Update to 2.1.2.
>   (gnupg-2.0): Copy of previous package for version 2.0.26.

Good point, I amended this.

> One more note of caution: I notice that you added 'npth' to core-updates
> instead of master, so I guess this needs to go to core-updates also.  In
> retrospect, they both could have gone to master.

Indeed. I started work on updating the packages in gnupg.scm on core-updates,
since I overestimated the impact it would have on package rebuilds ("guix
refresh -l gnupg" shows that in fact only a few packages depend on gnupg).
So to facilitate merging, I continued in core-updates.

Andreas