diff options
| author | Leo Famulari <leo@famulari.name> | 2017-03-04 18:07:26 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2017-03-04 21:04:46 -0500 |
| commit | 07302d1ab4fae67117476a51a1031de02b05b519 (patch) | |
| tree | 16ffbaa62b418e69eb4837d7b9ca63bb848dac69 /gnu/packages/gnupg.scm | |
| parent | c35745edc4e78defba4a82e32974d729cf159c34 (diff) | |
| download | gnu-guix-07302d1ab4fae67117476a51a1031de02b05b519.tar gnu-guix-07302d1ab4fae67117476a51a1031de02b05b519.tar.gz | |
gnu: gnupg: Update to 2.1.19.
* gnu/packages/gnupg.scm (gnupg): Update to 2.1.19.
[arguments]: Add 'patch-test-paths' phase and remove 'set-gnupg-home' phase.
Add '--enable-gnupg-builddir-envvar' to #:configure-flags.
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index befd29961c..d76fcc2d3c 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -217,14 +217,14 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.1.18") + (version "2.1.19") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version ".tar.bz2")) (sha256 (base32 - "157rrv3ly9j2k0acz43nhiba5hfl6h7048jvj55wwqjmgsmnyk6h")))) + "1w4vccmb5l50lm4yrz9vkdj7whbfvzx543r55362kkj1aqgyvk26")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -243,7 +243,11 @@ compatible to GNU Pth.") ("sqlite" ,sqlite) ("zlib" ,zlib))) (arguments - `(#:configure-flags '("--enable-gpg2-is-gpg") + `(#:configure-flags '("--enable-gpg2-is-gpg" + ;; Otherwise, the test suite looks for the `gpg` + ;; executable in its installation directory in + ;; /gnu/store before it has been installed. + "--enable-gnupg-builddir-envvar") #:phases (modify-phases %standard-phases (add-before 'configure 'patch-paths @@ -259,11 +263,27 @@ compatible to GNU Pth.") (("/usr/bin/env gpgscm") (string-append (getcwd) "/tests/gpgscm/gpgscm"))) #t)) - ;; If this variable is undefined, /bin/pwd is invoked. - (add-before 'check 'set-gnupg-home - (lambda _ - (setenv "GNUPGHOME" (getcwd)) - #t))))) + (add-before 'build 'patch-test-paths + (lambda* (#:key inputs #:allow-other-keys) + (let* ((coreutils (assoc-ref inputs "coreutils")) + (cat (string-append coreutils "/bin/cat")) + (pwd (string-append coreutils "/bin/pwd")) + (true (string-append coreutils "/bin/true")) + (false (string-append coreutils "/bin/false"))) + (substitute* '("tests/inittests" + "tests/pkits/inittests" + "tests/Makefile" + "tests/pkits/common.sh" + "tests/pkits/Makefile" + ) + (("/bin/pwd") pwd)) + (substitute* "common/t-exectool.c" + (("/bin/cat") cat)) + (substitute* "common/t-exectool.c" + (("/bin/true") true)) + (substitute* "common/t-exectool.c" + (("/bin/false") false)) + #t)))))) (home-page "https://gnupg.org/") (synopsis "GNU Privacy Guard") (description |