aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/gnupg.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-12-17 23:53:59 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2022-01-10 11:44:33 -0500
commit38747a27f36dbaadadb1399ec085d88e48c97555 (patch)
tree815263d35140ab0d606d4e67f79d0de4f3e5dc88 /gnu/packages/gnupg.scm
parent0c5bfcadfdd5046594d0b1f698bf897a94e0761a (diff)
downloadguix-38747a27f36dbaadadb1399ec085d88e48c97555.tar
guix-38747a27f36dbaadadb1399ec085d88e48c97555.tar.gz
gnu: gnupg: Update to 2.2.32.
* gnu/packages/gnupg.scm (gnupg): Update to 2.2.32. (gnupg-2.2.32): Delete variable. (qgpgme)[native-inputs]: Use the regular gnupg package. * gnu/packages/emacs-xyz.scm (emacs-pinentry): Likewise.
Diffstat (limited to 'gnu/packages/gnupg.scm')
-rw-r--r--gnu/packages/gnupg.scm35
1 files changed, 9 insertions, 26 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index a0e3cd8e9c..6265ec9431 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -279,15 +279,19 @@ compatible to GNU Pth.")
(define-public gnupg
(package
(name "gnupg")
- (version "2.2.30")
+ ;; Note: The 2.2.X releases are Long Term Support (LTS), so stick to it
+ ;; for our stable 'gnupg'.
+ ;; Note2: 2.2.33 currently suffers from regressions, so do not update to it
+ ;; (see: https://dev.gnupg.org/T5742).
+ (version "2.2.32")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
+ (uri (string-append "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-" version
".tar.bz2"))
(patches (search-patches "gnupg-default-pinentry.patch"))
(sha256
(base32
- "1111ry31gaxv76miqsy6l0kwxwlx8sz0jk41jhyrjwx649p6sqyc"))))
+ "0506gv54z10c96z5821z9p0ksibk1pfilsmag39ffqrcz0sinmxj"))))
(build-system gnu-build-system)
(native-inputs
(list pkg-config))
@@ -347,21 +351,6 @@ libskba (working with X.509 certificates and CMS data).")
(properties '((ftp-server . "ftp.gnupg.org")
(ftp-directory . "/gcrypt/gnupg")))))
-;; This package fixes <https://issues.guix.gnu.org/52483>, "GnuPG 2.2.30 cannot
-;; do symmetric encryption"
-(define-public gnupg-2.2.32
- (package
- (inherit gnupg)
- (version "2.2.32")
- (source (origin
- (inherit (package-source gnupg))
- (uri (string-append "mirror://gnupg/gnupg/gnupg-" version
- ".tar.bz2"))
- (patches (search-patches "gnupg-default-pinentry.patch"))
- (sha256
- (base32
- "0506gv54z10c96z5821z9p0ksibk1pfilsmag39ffqrcz0sinmxj"))))))
-
(define-public gnupg-1
(package (inherit gnupg)
(version "1.4.23")
@@ -382,8 +371,7 @@ libskba (working with X.509 certificates and CMS data).")
(add-after 'unpack 'patch-check-sh
(lambda _
(substitute* "checks/Makefile.in"
- (("/bin/sh") (which "sh")))
- #t)))))))
+ (("/bin/sh") (which "sh"))))))))))
(define-public gpgme
(package
@@ -433,14 +421,9 @@ and every application benefits from this.")
"lang/cpp/src/libgpgmepp.la")
(symlink (string-append gpgme "/lib/libgpgme.la")
"src/libgpgme.la"))
- (chdir "lang/qt")
- #t)))))
+ (chdir "lang/qt"))))))
(native-inputs
- ;; Use GnuPG 2.2.32. With 2.2.30, 'testSymmetricEncryptDecrypt' in
- ;; t-encrypt.cpp fails because 'gpg' wrongfully ask for a passphrase do
- ;; decrypt the cypher text.
(modify-inputs (package-native-inputs gpgme)
- (replace "gnupg" gnupg-2.2.32)
(prepend pkg-config)))
(inputs
(modify-inputs (package-inputs gpgme)