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

[Leo Famulari <leo@famulari.name>]

[-- 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