mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-23 19:19:20 -05:00
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.
This commit is contained in:
parent
0c5bfcadfd
commit
38747a27f3
2 changed files with 10 additions and 27 deletions
|
@ -21274,7 +21274,7 @@ (define-public emacs-pinentry
|
||||||
"1lf30q6r8nz5cjzclbb9bbymsk2y75nskvb55hnjdv93gr3j0sik"))))
|
"1lf30q6r8nz5cjzclbb9bbymsk2y75nskvb55hnjdv93gr3j0sik"))))
|
||||||
(build-system emacs-build-system)
|
(build-system emacs-build-system)
|
||||||
(propagated-inputs
|
(propagated-inputs
|
||||||
(list gnupg-2.2.32))
|
(list gnupg))
|
||||||
(home-page "https://elpa.gnu.org/packages/pinentry.html")
|
(home-page "https://elpa.gnu.org/packages/pinentry.html")
|
||||||
(synopsis "GnuPG Pinentry server implementation")
|
(synopsis "GnuPG Pinentry server implementation")
|
||||||
(description
|
(description
|
||||||
|
|
|
@ -279,15 +279,19 @@ (define-public npth
|
||||||
(define-public gnupg
|
(define-public gnupg
|
||||||
(package
|
(package
|
||||||
(name "gnupg")
|
(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
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri (string-append "mirror://gnupg/gnupg/gnupg-" version
|
(uri (string-append "ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-" version
|
||||||
".tar.bz2"))
|
".tar.bz2"))
|
||||||
(patches (search-patches "gnupg-default-pinentry.patch"))
|
(patches (search-patches "gnupg-default-pinentry.patch"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"1111ry31gaxv76miqsy6l0kwxwlx8sz0jk41jhyrjwx649p6sqyc"))))
|
"0506gv54z10c96z5821z9p0ksibk1pfilsmag39ffqrcz0sinmxj"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config))
|
(list pkg-config))
|
||||||
|
@ -347,21 +351,6 @@ (define-public gnupg
|
||||||
(properties '((ftp-server . "ftp.gnupg.org")
|
(properties '((ftp-server . "ftp.gnupg.org")
|
||||||
(ftp-directory . "/gcrypt/gnupg")))))
|
(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
|
(define-public gnupg-1
|
||||||
(package (inherit gnupg)
|
(package (inherit gnupg)
|
||||||
(version "1.4.23")
|
(version "1.4.23")
|
||||||
|
@ -382,8 +371,7 @@ (define-public gnupg-1
|
||||||
(add-after 'unpack 'patch-check-sh
|
(add-after 'unpack 'patch-check-sh
|
||||||
(lambda _
|
(lambda _
|
||||||
(substitute* "checks/Makefile.in"
|
(substitute* "checks/Makefile.in"
|
||||||
(("/bin/sh") (which "sh")))
|
(("/bin/sh") (which "sh"))))))))))
|
||||||
#t)))))))
|
|
||||||
|
|
||||||
(define-public gpgme
|
(define-public gpgme
|
||||||
(package
|
(package
|
||||||
|
@ -433,14 +421,9 @@ (define-public qgpgme
|
||||||
"lang/cpp/src/libgpgmepp.la")
|
"lang/cpp/src/libgpgmepp.la")
|
||||||
(symlink (string-append gpgme "/lib/libgpgme.la")
|
(symlink (string-append gpgme "/lib/libgpgme.la")
|
||||||
"src/libgpgme.la"))
|
"src/libgpgme.la"))
|
||||||
(chdir "lang/qt")
|
(chdir "lang/qt"))))))
|
||||||
#t)))))
|
|
||||||
(native-inputs
|
(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)
|
(modify-inputs (package-native-inputs gpgme)
|
||||||
(replace "gnupg" gnupg-2.2.32)
|
|
||||||
(prepend pkg-config)))
|
(prepend pkg-config)))
|
||||||
(inputs
|
(inputs
|
||||||
(modify-inputs (package-inputs gpgme)
|
(modify-inputs (package-inputs gpgme)
|
||||||
|
|
Loading…
Reference in a new issue