[PATCH 4/6] gnu: Add gpgscm.

[PATCH 4/6] gnu: Add gpgscm.

[ng0]

Whoever wants to fix how this looks in code can change it before
commit, like it is now it works and serves its purpose (run the
gnupg tests).
Commented parts included for people who want to make it smaller,
if you make it smaller in size the code size on our side will
grow.

From 6babb18479de83bd19c44412c7957918d2c917b2 Mon Sep 17 00:00:00 2001
From: ng0 <ng0@we.make.ritual.n0.is>
Date: Sun, 17 Jul 2016 22:11:41 +0000
Subject: [PATCH 4/6] gnu: Add gpgscm.

* gnu/packages/gnupg.scm (gpgscm): New variable.
---
 gnu/packages/gnupg.scm | 107 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 444c60a..84bf19c 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -205,6 +205,113 @@ implementation.  This allows the use of libraries which are not
 compatible to GNU Pth.")
     (license (list license:lgpl3+ license:gpl2+)))) ; dual license

+;; This is used by >=gnupg-2.1.14 for the test suite.
+;; This package becomes obsolete once they will move gpgscm
+;; outside of GnuPG source.
+(define-public gpgscm
+  (package
+    (name "gpgscm")
+    (version "2.1.14")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
+                           ".tar.bz2"))
+       (file-name (string-append name "-" version ".tar.bz2"))
+       (sha256
+        (base32
+         "0hmsiscpdpdqd8kcjpzkz2gzcc3cnrvswk9p1jzi4sivd7lxwl4l"))))
+       ;; (modules '((guix build utils)))
+       ;; (snippet
+       ;;  '(begin
+       ;;     ;; Strip gnupg down to gpgscm + shared libs.
+       ;;     (for-each delete-file-recursively
+       ;;               '(;;"agent" "dirmngr" ;;"kbx"
+       ;;                 ;;"scd" "doc" ;;"sm"
+       ;;                 "tests/openpgp"
+       ;;                 "tests/pkits"
+       ;;                 "tests/migrations"
+       ;;                 "tests/samplekeys"))))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("adns" ,adns)
+       ("bzip2" ,bzip2)
+       ("curl" ,curl)
+       ("gnutls" ,gnutls)
+       ("libassuan" ,libassuan)
+       ("libgcrypt" ,libgcrypt)
+       ("libgpg-error" ,libgpg-error)
+       ("libksba" ,libksba)
+       ("npth" ,npth)
+       ("openldap" ,openldap)
+       ("readline" ,readline)
+       ("sqlite" ,sqlite)
+       ("zlib" ,zlib)))
+   (arguments
+    `(#:phases
+      (modify-phases %standard-phases
+        (add-before 'configure 'patch-tests-makefile
+          (lambda _
+            (substitute* "tests/Makefile.am"
+              (("/bin/pwd") (which "pwd")))))
+        ;; (add-before 'configure 'delete-excluded-Makefiles
+        ;;   (lambda _
+        ;;     (substitute* "configure.ac"
+        ;;       ;;(("kbx/Makefile") "")
+        ;;       ;;(("sm/Makefile") "")
+        ;;       ;; (("agent/Makefile") "")
+        ;;       ;; (("scd/Makefile") "")
+        ;;       ;; (("dirmngr/Makefile") "")
+        ;;       ;; (("doc/Makefile") "")
+        ;;       (("tests/opengpg/Makefile") "")
+        ;;       (("tests/pkits") "")
+        ;;       (("tests/migrations") "")
+        ;;       (("tests/samplekeys") ""))))
+        (replace 'install
+          (lambda* (#:key outputs #:allow-other-keys)
+            (let* ((out (assoc-ref outputs "out"))
+                   (bin (string-append out "/bin"))
+                   (inc (string-append out "/include"))
+                   (doc (string-append out "/share/doc/gpgscm")))
+              (install-file "tests/gpgscm/gpgscm" bin)
+              (install-file "common/util.h" inc)
+              (install-file "common/exechelp.h" inc)
+              (install-file "common/sysutils.h" inc)
+              (install-file "tests/gpgscm/private.h" inc)
+              (install-file "tests/gpgscm/ffi.h" inc)
+              (install-file "tests/gpgscm/ffi-private.h" inc)
+              (install-file "tests/gpgscm/scheme.h" inc)
+              (install-file "common/i18n.h" inc)
+              (install-file "common/argparse.h" inc)
+              (install-file "common/init.h" inc)
+              (install-file "common/logging.h" inc)
+              (install-file "common/strlist.h" inc)
+              (install-file "tests/gpgscm/scheme-private.h" inc)
+              (install-file "common/dynload.h" inc)
+              (install-file "NEWS" doc)
+              (install-file "AUTHORS" doc)
+              (install-file "ChangeLog" doc)
+              (install-file "THANKS" doc)
+              (install-file "README" doc)
+              (install-file "tests/gpgscm/Manual.txt" doc))
+            #t)))
+      #:tests? #f ;; no tests for gpgscm
+      ))
+    (home-page "https://gnupg.org/")
+    (synopsis "tinyscheme implementation used by The GNU Privacy Guard")
+    (description
+     "The GNU Privacy Guard is a complete implementation of the OpenPGP
+standard.  It is used to encrypt and sign data and communication.  It
+features powerful key management and the ability to access public key
+servers.  It includes several libraries: libassuan (IPC between GnuPG
+components), libgpg-error (centralized GnuPG error values), and
+libskba (working with X.509 certificates and CMS data).")
+    (license license:gpl3+)
+    (properties '((ftp-server . "ftp.gnupg.org")
+                  (ftp-directory . "/gcrypt/gnupg")))))
+
 (define-public gnupg
   (package
     (name "gnupg")
--
2.9.1


--
♥Ⓐ  ng0
For non-prism friendly talk find me on http://www.psyced.org
SecuShare – http://secushare.org

Re: [PATCH 4/6] gnu: Add gpgscm.

[Ludovic Courtès]

Hello!

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

> From 6babb18479de83bd19c44412c7957918d2c917b2 Mon Sep 17 00:00:00 2001
> From: ng0 <ng0@we.make.ritual.n0.is>
> Date: Sun, 17 Jul 2016 22:11:41 +0000
> Subject: [PATCH 4/6] gnu: Add gpgscm.
>
> * gnu/packages/gnupg.scm (gpgscm): New variable.

[...]

> +    (home-page "https://gnupg.org/")
> +    (synopsis "tinyscheme implementation used by The GNU Privacy Guard")

I’ve seen some of the discussions on IRC about gpgscm.  However, it’s
not clear to me why we should make it a separate package.  AIUI, it’s
meant as a purely GnuPG-internal tool, and as such it may evolve in
lockstep with the rest of the GnuPG code base.

So I’d be tempted to keep it internal to GnuPG, unless upstream decides
to make it a separate package (which seems unlikely; it may be come part
of libgpg-error, though.)

WDYT?

Thanks,
Ludo’.

Re: [PATCH 4/6] gnu: Add gpgscm.

[ng0]

Hi,

Ludovic Courtès writes:

> Hello!
>
> ng0 <ng0@we.make.ritual.n0.is> skribis:
>
>> From 6babb18479de83bd19c44412c7957918d2c917b2 Mon Sep 17 00:00:00 2001
>> From: ng0 <ng0@we.make.ritual.n0.is>
>> Date: Sun, 17 Jul 2016 22:11:41 +0000
>> Subject: [PATCH 4/6] gnu: Add gpgscm.
>>
>> * gnu/packages/gnupg.scm (gpgscm): New variable.
>
> [...]
>
>> +    (home-page "https://gnupg.org/")
>> +    (synopsis "tinyscheme implementation used by The GNU Privacy Guard")
>
> I’ve seen some of the discussions on IRC about gpgscm.  However, it’s
> not clear to me why we should make it a separate package.  AIUI, it’s
> meant as a purely GnuPG-internal tool, and as such it may evolve in
> lockstep with the rest of the GnuPG code base.
>
> So I’d be tempted to keep it internal to GnuPG, unless upstream decides
> to make it a separate package (which seems unlikely; it may be come part
> of libgpg-error, though.)
>
> WDYT?
>
> Thanks,
> Ludo’.

I'm not familiar with all the short words being used all the
time. What is AIUI? "As I understand it"?


I think I forgot to add more descriptions above this patch and
the gnupg one.

It should've read:

This is a not very pleasant, but working hack
to enable building >=gnupg-2.1.14 without wasting much time on
having to built gpgscm in the gnupg package.  Whoever wants to
fix this may step forward and do it, I am done with this as I
need to focus on something else.
This is left intentionally with comments for other people to
improve in case we even use this. Else, someone can improve my
gnupg-2.1.14 patch and make the gpgscm patc obsolete.

-- 
♥Ⓐ  ng0
For non-prism friendly talk find me on http://www.psyced.org
SecuShare – http://secushare.org

Re: [PATCH 4/6] gnu: Add gpgscm.

[Ludovic Courtès]

Hello,

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

> Ludovic Courtès writes:
>
>> Hello!
>>
>> ng0 <ng0@we.make.ritual.n0.is> skribis:
>>
>>> From 6babb18479de83bd19c44412c7957918d2c917b2 Mon Sep 17 00:00:00 2001
>>> From: ng0 <ng0@we.make.ritual.n0.is>
>>> Date: Sun, 17 Jul 2016 22:11:41 +0000
>>> Subject: [PATCH 4/6] gnu: Add gpgscm.
>>>
>>> * gnu/packages/gnupg.scm (gpgscm): New variable.
>>
>> [...]
>>
>>> +    (home-page "https://gnupg.org/")
>>> +    (synopsis "tinyscheme implementation used by The GNU Privacy Guard")
>>
>> I’ve seen some of the discussions on IRC about gpgscm.  However, it’s
>> not clear to me why we should make it a separate package.  AIUI, it’s
>> meant as a purely GnuPG-internal tool, and as such it may evolve in
>> lockstep with the rest of the GnuPG code base.
>>
>> So I’d be tempted to keep it internal to GnuPG, unless upstream decides
>> to make it a separate package (which seems unlikely; it may be come part
>> of libgpg-error, though.)
>>
>> WDYT?
>>
>> Thanks,
>> Ludo’.
>
> I'm not familiar with all the short words being used all the
> time. What is AIUI? "As I understand it"?

Yes; apologies for being cryptic without even noticing!

> I think I forgot to add more descriptions above this patch and
> the gnupg one.
>
> It should've read:
>
> This is a not very pleasant, but working hack
> to enable building >=gnupg-2.1.14 without wasting much time on
> having to built gpgscm in the gnupg package.  Whoever wants to
> fix this may step forward and do it, I am done with this as I
> need to focus on something else.
> This is left intentionally with comments for other people to
> improve in case we even use this. Else, someone can improve my
> gnupg-2.1.14 patch and make the gpgscm patc obsolete.

OK, but what do you think of the comments I made above?

Thanks,
Ludo’.

Re: [PATCH 4/6] gnu: Add gpgscm.

[ng0]

Upstream discussion thread / statement on gpgscm:
https://lists.gnupg.org/pipermail/gnupg-users/2016-July/056303.html
-- 
♥Ⓐ  ng0
For non-prism friendly talk find me on http://www.psyced.org
SecuShare – http://secushare.org

Re: [PATCH 4/6] gnu: Add gpgscm.

[Leo Famulari]

On Sun, Jul 17, 2016 at 11:19:41PM +0000, ng0 wrote:
> Whoever wants to fix how this looks in code can change it before
> commit, like it is now it works and serves its purpose (run the
> gnupg tests).
> Commented parts included for people who want to make it smaller,
> if you make it smaller in size the code size on our side will
> grow.

Thank you for beginning this!

It looks as if the gpgscm executable is built in our build phase, and
then used in our check phase. So, I will try patching the shebangs of
the tests in between the build and check phases.

Re: [PATCH 4/6] gnu: Add gpgscm.

[Leo Famulari]

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

On Mon, Jul 18, 2016 at 01:44:07PM -0400, Leo Famulari wrote:
> On Sun, Jul 17, 2016 at 11:19:41PM +0000, ng0 wrote:
> > Whoever wants to fix how this looks in code can change it before
> > commit, like it is now it works and serves its purpose (run the
> > gnupg tests).
> > Commented parts included for people who want to make it smaller,
> > if you make it smaller in size the code size on our side will
> > grow.
> 
> Thank you for beginning this!
> 
> It looks as if the gpgscm executable is built in our build phase, and
> then used in our check phase. So, I will try patching the shebangs of
> the tests in between the build and check phases.

The attached patch series works for me, when I put it on top of your
GnuPG-related library updates.

[-- Attachment #2: 0001-gnu-gnupg-Use-modify-phases-syntax.patch --]
[-- Type: text/x-diff, Size: 1247 bytes --]

From 474fd1807a0870a7156a22200b763e89997c10a6 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 18 Jul 2016 14:47:50 -0400
Subject: [PATCH 1/4] gnu: gnupg: Use modify-phases syntax.

* gnu/packages/gnupg.scm (gnupg)[arguments]: Use modify-phases syntax.
---
 gnu/packages/gnupg.scm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 444c60a..5b61881 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -233,14 +233,13 @@ compatible to GNU Pth.")
        ("readline" ,readline)
        ("sqlite" ,sqlite)
        ("zlib" ,zlib)))
-   (arguments
-    `(#:phases
-       (alist-cons-before
-        'configure 'patch-config-files
-        (lambda _
-          (substitute* "tests/openpgp/defs.inc"
-            (("/bin/pwd") (which "pwd"))))
-       %standard-phases)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'configure 'patch-config-files
+           (lambda _
+             (substitute* "tests/openpgp/defs.inc"
+               (("/bin/pwd") (which "pwd"))))))))
     (home-page "http://gnupg.org/")
     (synopsis "GNU Privacy Guard")
     (description
-- 
2.9.1


[-- Attachment #3: 0002-gnu-gnupg-2.0-Use-modify-phases-syntax.patch --]
[-- Type: text/x-diff, Size: 1169 bytes --]

From 379b84a09e22312a6d777bc2dc30b97199265229 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 18 Jul 2016 14:48:24 -0400
Subject: [PATCH 2/4] gnu: gnupg-2.0: Use modify-phases syntax.

* gnu/packages/gnupg.scm (gnupg-2.0)[arguments]: Use modify-phases syntax.
---
 gnu/packages/gnupg.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 5b61881..1958462 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -278,12 +278,11 @@ libskba (working with X.509 certificates and CMS data).")
        ("readline" ,readline)))
    (arguments
     `(#:phases
-       (alist-cons-before
-        'configure 'patch-config-files
-        (lambda _
-          (substitute* "tests/openpgp/Makefile.in"
-            (("/bin/sh") (which "bash"))))
-       %standard-phases)))))
+      (modify-phases %standard-phases
+        (add-after 'configure 'patch-config-files
+          (lambda _
+            (substitute* "tests/openpgp/Makefile.in"
+              (("/bin/sh") (which "bash"))))))))))
 
 (define-public gnupg-1
   (package (inherit gnupg)
-- 
2.9.1


[-- Attachment #4: 0003-gnu-gnupg-1-Use-modify-phases-syntax.patch --]
[-- Type: text/x-diff, Size: 1220 bytes --]

From 728e0bf170547b9cfa721d5770e75a7699644f05 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 18 Jul 2016 14:48:55 -0400
Subject: [PATCH 3/4] gnu: gnupg-1: Use modify-phases syntax.

* gnu/packages/gnupg.scm (gnupg-1)[arguments]: Use modify-phases syntax.
---
 gnu/packages/gnupg.scm | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 1958462..8ef98a8 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -302,12 +302,12 @@ libskba (working with X.509 certificates and CMS data).")
        ("readline" ,readline)
        ("libgpg-error" ,libgpg-error)))
     (arguments
-     `(#:phases (alist-cons-after
-                 'unpack 'patch-check-sh
-                 (lambda _
-                   (substitute* "checks/Makefile.in"
-                     (("/bin/sh") (which "bash"))))
-                 %standard-phases)))))
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-check-sh
+           (lambda _
+             (substitute* "checks/Makefile.in"
+               (("/bin/sh") (which "bash"))))))))))
 
 (define-public gpgme
   (package
-- 
2.9.1


[-- Attachment #5: 0004-gnu-gnupg-Patch-test-shebangs.patch --]
[-- Type: text/x-diff, Size: 1757 bytes --]

From 0d9b1e5d922ad9c4efb3ae751b36b764a09e1edb Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Mon, 18 Jul 2016 18:13:48 -0400
Subject: [PATCH 4/4] gnu: gnupg: Patch test shebangs.

* gnu/packages/gnupg.scm (gnupg)[arguments]: Add 'patch-scheme-tests' phase.
---
 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 8ef98a8..d3ad8e7 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -208,14 +208,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)))
@@ -239,7 +239,12 @@ compatible to GNU Pth.")
          (add-after 'configure 'patch-config-files
            (lambda _
              (substitute* "tests/openpgp/defs.inc"
-               (("/bin/pwd") (which "pwd"))))))))
+               (("/bin/pwd") (which "pwd")))))
+         (add-after 'build 'patch-scheme-tests
+           (lambda _
+             (substitute* (find-files "tests" ".\\.scm$")
+               (("/usr/bin/env gpgscm")
+                (string-append (getcwd) "/tests/gpgscm/gpgscm"))))))))
     (home-page "http://gnupg.org/")
     (synopsis "GNU Privacy Guard")
     (description
-- 
2.9.1

Re: [PATCH 4/6] gnu: Add gpgscm.

[ng0]

Hi,

thanks for picking up the work.

Leo Famulari writes:

> On Mon, Jul 18, 2016 at 01:44:07PM -0400, Leo Famulari wrote:
>> On Sun, Jul 17, 2016 at 11:19:41PM +0000, ng0 wrote:
>> > Whoever wants to fix how this looks in code can change it before
>> > commit, like it is now it works and serves its purpose (run the
>> > gnupg tests).
>> > Commented parts included for people who want to make it smaller,
>> > if you make it smaller in size the code size on our side will
>> > grow.
>> 
>> Thank you for beginning this!
>> 
>> It looks as if the gpgscm executable is built in our build phase, and
>> then used in our check phase. So, I will try patching the shebangs of
>> the tests in between the build and check phases.
>
> The attached patch series works for me, when I put it on top of your
> GnuPG-related library updates.

On top of all 5 of the updates I did in gnupg.scm and sent in or
what are the GnuPG-related library updates you mean?

I will test this series tomorrow. If it works and I can remove
the gpgscm package, is master okay or should it go into
core-updates and if so why should it go into core-updates when it
works on master?

> From 474fd1807a0870a7156a22200b763e89997c10a6 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Mon, 18 Jul 2016 14:47:50 -0400
> Subject: [PATCH 1/4] gnu: gnupg: Use modify-phases syntax.
>
> * gnu/packages/gnupg.scm (gnupg)[arguments]: Use modify-phases syntax.
> ---
>  gnu/packages/gnupg.scm | 15 +++++++--------
>  1 file changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 444c60a..5b61881 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -233,14 +233,13 @@ compatible to GNU Pth.")
>         ("readline" ,readline)
>         ("sqlite" ,sqlite)
>         ("zlib" ,zlib)))
> -   (arguments
> -    `(#:phases
> -       (alist-cons-before
> -        'configure 'patch-config-files
> -        (lambda _
> -          (substitute* "tests/openpgp/defs.inc"
> -            (("/bin/pwd") (which "pwd"))))
> -       %standard-phases)))
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'configure 'patch-config-files
> +           (lambda _
> +             (substitute* "tests/openpgp/defs.inc"
> +               (("/bin/pwd") (which "pwd"))))))))
>      (home-page "http://gnupg.org/")
>      (synopsis "GNU Privacy Guard")
>      (description
> -- 
> 2.9.1
>
>
> From 379b84a09e22312a6d777bc2dc30b97199265229 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Mon, 18 Jul 2016 14:48:24 -0400
> Subject: [PATCH 2/4] gnu: gnupg-2.0: Use modify-phases syntax.
>
> * gnu/packages/gnupg.scm (gnupg-2.0)[arguments]: Use modify-phases syntax.
> ---
>  gnu/packages/gnupg.scm | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 5b61881..1958462 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -278,12 +278,11 @@ libskba (working with X.509 certificates and CMS data).")
>         ("readline" ,readline)))
>     (arguments
>      `(#:phases
> -       (alist-cons-before
> -        'configure 'patch-config-files
> -        (lambda _
> -          (substitute* "tests/openpgp/Makefile.in"
> -            (("/bin/sh") (which "bash"))))
> -       %standard-phases)))))
> +      (modify-phases %standard-phases
> +        (add-after 'configure 'patch-config-files
> +          (lambda _
> +            (substitute* "tests/openpgp/Makefile.in"
> +              (("/bin/sh") (which "bash"))))))))))
>  
>  (define-public gnupg-1
>    (package (inherit gnupg)
> -- 
> 2.9.1
>
>
> From 728e0bf170547b9cfa721d5770e75a7699644f05 Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Mon, 18 Jul 2016 14:48:55 -0400
> Subject: [PATCH 3/4] gnu: gnupg-1: Use modify-phases syntax.
>
> * gnu/packages/gnupg.scm (gnupg-1)[arguments]: Use modify-phases syntax.
> ---
>  gnu/packages/gnupg.scm | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
> index 1958462..8ef98a8 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -302,12 +302,12 @@ libskba (working with X.509 certificates and CMS data).")
>         ("readline" ,readline)
>         ("libgpg-error" ,libgpg-error)))
>      (arguments
> -     `(#:phases (alist-cons-after
> -                 'unpack 'patch-check-sh
> -                 (lambda _
> -                   (substitute* "checks/Makefile.in"
> -                     (("/bin/sh") (which "bash"))))
> -                 %standard-phases)))))
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-after 'unpack 'patch-check-sh
> +           (lambda _
> +             (substitute* "checks/Makefile.in"
> +               (("/bin/sh") (which "bash"))))))))))
>  
>  (define-public gpgme
>    (package
> -- 
> 2.9.1
>
>
> From 0d9b1e5d922ad9c4efb3ae751b36b764a09e1edb Mon Sep 17 00:00:00 2001
> From: Leo Famulari <leo@famulari.name>
> Date: Mon, 18 Jul 2016 18:13:48 -0400
> Subject: [PATCH 4/4] gnu: gnupg: Patch test shebangs.
>
> * gnu/packages/gnupg.scm (gnupg)[arguments]: Add 'patch-scheme-tests' phase.
> ---
>  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 8ef98a8..d3ad8e7 100644
> --- a/gnu/packages/gnupg.scm
> +++ b/gnu/packages/gnupg.scm
> @@ -208,14 +208,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)))
> @@ -239,7 +239,12 @@ compatible to GNU Pth.")
>           (add-after 'configure 'patch-config-files
>             (lambda _
>               (substitute* "tests/openpgp/defs.inc"
> -               (("/bin/pwd") (which "pwd"))))))))
> +               (("/bin/pwd") (which "pwd")))))
> +         (add-after 'build 'patch-scheme-tests
> +           (lambda _
> +             (substitute* (find-files "tests" ".\\.scm$")
> +               (("/usr/bin/env gpgscm")
> +                (string-append (getcwd) "/tests/gpgscm/gpgscm"))))))))
>      (home-page "http://gnupg.org/")
>      (synopsis "GNU Privacy Guard")
>      (description

-- 
♥Ⓐ  ng0
For non-prism friendly talk find me on http://www.psyced.org
SecuShare – http://secushare.org

Re: [PATCH 4/6] gnu: Add gpgscm.

[Leo Famulari]

On Mon, Jul 18, 2016 at 11:10:00PM +0000, ng0 wrote:
> On top of all 5 of the updates I did in gnupg.scm and sent in or
> what are the GnuPG-related library updates you mean?

Yes, I'm referring to the updates you sent.

> I will test this series tomorrow. If it works and I can remove
> the gpgscm package, is master okay or should it go into
> core-updates and if so why should it go into core-updates when it
> works on master?

gnupg-2.1.14 requires libgcrypt >= 1.7.0 [0] and libgpg-error >= 1.24.
Those are both core packages. `guix refresh -l` reports that 2206 and
2214 packages will need to be rebuilt, respectively, if those packages
are changed.

I added a few more packages to the HTTPS home-page patch. I pushed it
along with the libassuan update.

Re: [PATCH 4/6] gnu: Add gpgscm.

[Andreas Enge]

On Mon, Jul 18, 2016 at 11:58:03PM -0400, Leo Famulari wrote:
> gnupg-2.1.14 requires libgcrypt >= 1.7.0 [0] and libgpg-error >= 1.24.
> Those are both core packages. `guix refresh -l` reports that 2206 and
> 2214 packages will need to be rebuilt, respectively, if those packages
> are changed.

So maybe core-updates-next? I still have the hope that we can merge
core-updates as soon as we will have recovered from the hydra outage.

Andreas