diff options
Diffstat (limited to 'gnu/packages/gnupg.scm')
| -rw-r--r-- | gnu/packages/gnupg.scm | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index daf4bc3b6e..c0f827b7e3 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015, 2018 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2014, 2018 Eric Bavier <bavier@member.fsf.org> -;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015, 2016, 2020 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org> ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015, 2016, 2017, 2019 Ricardo Wurmus <rekado@elephly.net> @@ -254,7 +254,7 @@ compatible to GNU Pth.") (define-public gnupg (package (name "gnupg") - (version "2.2.20") + (version "2.2.23") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gnupg/gnupg-" version @@ -262,7 +262,7 @@ compatible to GNU Pth.") (patches (search-patches "gnupg-default-pinentry.patch")) (sha256 (base32 - "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4")))) + "0p6ss4f3vlkf91pmp27bmvfr5bdxxi0pb3dmxpqljglbsx4mxd8h")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -400,23 +400,14 @@ libskba (working with X.509 certificates and CMS data).") (define-public gpgme (package (name "gpgme") - (version "1.13.1") + (version "1.14.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnupg/gpgme/gpgme-" version ".tar.bz2")) (sha256 - (base32 "0imyjfryvvjdbai454p70zcr95m94j9xnzywrlilqdw2fqi0pqy4")))) + (base32 "01s3rlspykbm9vmi5rfbdm3d20ip6yni69r48idqzlmhlq8ggwff")))) (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'disable-failing-test - ;; XXX gnupg@2.2.20 breaks the expected JSON response for this test. - (lambda _ - (substitute* "tests/json/t-json.c" - (("\"t-keylist-secret\", ") "")) - #t))))) (native-inputs `(("gnupg" ,gnupg))) (propagated-inputs @@ -877,6 +868,8 @@ enter a passphrase when required by @code{gpg} or other software."))) (package (inherit pinentry-tty) (name "pinentry-gtk2") + (arguments + `(#:configure-flags '("--enable-fallback-curses"))) (inputs `(("gtk+" ,gtk+-2) ("glib" ,glib) @@ -895,7 +888,8 @@ passphrase when @code{gpg} is run and needs it."))) ("glib" ,glib) ,@(package-inputs pinentry-tty))) (arguments - `(#:configure-flags '("--enable-pinentry-gnome3"))) + `(#:configure-flags '("--enable-pinentry-gnome3" + "--enable-fallback-curses"))) (description "Pinentry provides a console and a GUI designed for use with GNOME@tie{}3 that allows users to enter a passphrase when required by @code{gpg} or other @@ -905,6 +899,8 @@ software."))) (package (inherit pinentry-tty) (name "pinentry-qt") + (arguments + `(#:configure-flags '("--enable-fallback-curses"))) (inputs `(("qtbase" ,qtbase) ,@(package-inputs pinentry-tty))) @@ -921,7 +917,8 @@ passphrase when @code{gpg} is run and needs it."))) (inherit (package-source pinentry-tty)) (patches (search-patches "pinentry-efl.patch")))) (arguments - '(#:configure-flags '("--enable-pinentry-efl") + '(#:configure-flags '("--enable-pinentry-efl" + "--enable-fallback-curses") #:phases (modify-phases %standard-phases (replace 'bootstrap |