[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/1] gnu: gnupg: Update to 2.1.16.
From: |
Leo Famulari |
Subject: |
[PATCH 1/1] gnu: gnupg: Update to 2.1.16. |
Date: |
Sat, 19 Nov 2016 13:32:54 -0500 |
* gnu/packages/gnupg.scm (gnupg): Update to 2.1.16.
[native-inputs]: Add autoconf, automake, and gettext-minimal.
[arguments]: Patch more files in 'patch-paths' phase, and run it after
'patch-source-shebangs'. Add 'bootstrap' phase. Remove 'set-home' phase.
---
gnu/packages/gnupg.scm | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index fccaa97..ea9a646 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -30,6 +30,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages)
#:use-module (gnu packages adns)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages curl)
#:use-module (gnu packages openldap)
#:use-module (gnu packages perl)
@@ -39,6 +40,7 @@
#:use-module (gnu packages readline)
#:use-module (gnu packages compression)
#:use-module (gnu packages databases)
+ #:use-module (gnu packages gettext)
#:use-module (gnu packages gtk)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
@@ -213,17 +215,21 @@ compatible to GNU Pth.")
(define-public gnupg
(package
(name "gnupg")
- (version "2.1.15")
+ (version "2.1.16")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
".tar.bz2"))
(sha256
(base32
- "1pgz02gd84ab94w4xdg67p9z8kvkyr9d523bvcxxd2hviwh1m362"))))
+ "0i483m9q032a0s50f1izb213g4h5i7pcgn395m6hvl3sg2kadfa9"))))
(build-system gnu-build-system)
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+ ;; For bootstrapping
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("gettext" ,gettext-minimal)))
(inputs
`(("adns" ,adns)
("bzip2" ,bzip2)
@@ -243,27 +249,26 @@ compatible to GNU Pth.")
`(#:configure-flags '("--enable-gpg2-is-gpg")
#:phases
(modify-phases %standard-phases
- (add-before 'configure 'patch-paths
+ (add-after 'patch-source-shebangs 'patch-paths
(lambda* (#:key inputs #:allow-other-keys)
- (substitute* "tests/openpgp/defs.inc"
+ (substitute* '("tests/inittests"
+ "tests/pkits/inittests"
+ "tests/pkits/Makefile.am"
+ "tests/pkits/common.sh"
+ "tests/Makefile.am")
(("/bin/pwd") (which "pwd")))
(substitute* "scd/scdaemon.c"
(("\"(libpcsclite\\.so[^\"]*)\"" _ name)
(string-append "\"" (assoc-ref inputs "pcsc-lite")
"/lib/" name "\"")))
#t))
+ (add-before 'configure 'bootstrap
+ (lambda _ (zero? (system* "autoreconf" "-vfi"))))
(add-after 'build 'patch-scheme-tests
(lambda _
(substitute* (find-files "tests" ".\\.scm$")
(("/usr/bin/env gpgscm")
- (string-append (getcwd) "/tests/gpgscm/gpgscm")))))
- (add-before 'check 'set-home
- ;; Some tests require write access to $HOME, otherwise leading to
- ;; 'failed to create directory /homeless-shelter/.asy' error.
- ;; TODO Try removing this phase for GnuPG 2.1.16.
- (lambda _
- (setenv "HOME" "/tmp")
- #t)))))
+ (string-append (getcwd) "/tests/gpgscm/gpgscm"))))))))
(home-page "https://gnupg.org/")
(synopsis "GNU Privacy Guard")
(description
--
2.10.2
- [PATCH 1/1] gnu: gnupg: Update to 2.1.16.,
Leo Famulari <=