[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: gnu: qgpgme: Depend on a newer GnuPG.
From: |
guix-commits |
Subject: |
01/02: gnu: qgpgme: Depend on a newer GnuPG. |
Date: |
Thu, 18 Nov 2021 06:48:57 -0500 (EST) |
civodul pushed a commit to branch core-updates-frozen
in repository guix.
commit ffcf4ea9abbbc35fefbe4a491e1e5eac1c7c0002
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Nov 18 12:38:58 2021 +0100
gnu: qgpgme: Depend on a newer GnuPG.
This addresses a test failure in 'testSymmetricEncryptDecrypt':
FAIL! : EncryptionTest::testSymmetricEncryptDecrypt()
'QString::fromUtf8(plainText) == QStringLiteral("Hello symmetric World")'
returned FALSE. ()
Loc: [t-encrypt.cpp(188)]
The failure was apparently due to gpg asking for a passphrase for
symmetric decryption.
* gnu/packages/gnupg.scm (gnupg-2.2.32): New variable.
(qgpgme)[native-inputs]: Use it.
---
gnu/packages/gnupg.scm | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm
index 5bd1c04..6232897 100644
--- a/gnu/packages/gnupg.scm
+++ b/gnu/packages/gnupg.scm
@@ -348,6 +348,18 @@ libskba (working with X.509 certificates and CMS data).")
(properties '((ftp-server . "ftp.gnupg.org")
(ftp-directory . "/gcrypt/gnupg")))))
+(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"))
+ (sha256
+ (base32
+ "0506gv54z10c96z5821z9p0ksibk1pfilsmag39ffqrcz0sinmxj"))))))
+
(define-public gnupg-1
(package (inherit gnupg)
(version "1.4.23")
@@ -426,8 +438,12 @@ and every application benefits from this.")
(chdir "lang/qt")
#t)))))
(native-inputs
- `(("pkg-config" ,pkg-config)
- ,@(package-native-inputs gpgme)))
+ ;; 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
`(("gpgme" ,gpgme)
("qtbase" ,qtbase-5)