GNU bug report logs - #30593
[PATCH] gnu: password-store: Fix compatibility with GnuPG 2.2.5.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30593 in the body.
You can then email your comments to 30593 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Clément Lassieur <clement <at> lassieur.org>
To: guix-patches <at> gnu.org
Subject: [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.2.5.
Date: Sat, 24 Feb 2018 12:51:39 +0100

* gnu/packages/patches/password-store-gnupg-compat.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/password-utils.scm (password-store)[source]: Use it.
---
 gnu/local.mk                                       |  3 ++-
 gnu/packages/password-utils.scm                    |  5 ++--
 .../patches/password-store-gnupg-compat.patch      | 28 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 gnu/packages/patches/password-store-gnupg-compat.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 287625526..ddc38e7a7 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -13,7 +13,7 @@
 # Copyright © 2016, 2017 Efraim Flashner <efraim <at> flashner.co.il>
 # Copyright © 2016, 2017 Jan Nieuwenhuizen <janneke <at> gnu.org>
 # Copyright © 2017 Tobias Geerinckx-Rice <me <at> tobias.gr>
-# Copyright © 2017 Clément Lassieur <clement <at> lassieur.org>
+# Copyright © 2017, 2018 Clément Lassieur <clement <at> lassieur.org>
 # Copyright © 2017 Mathieu Othacehe <m.othacehe <at> gmail.com>
 # Copyright © 2017 Gábor Boskovits <boskovits <at> gmail.com>
 # Copyright © 2018 Amirouche Boubekki <amirouche <at> hypermove.net>
@@ -958,6 +958,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/p7zip-CVE-2016-9296.patch		\
   %D%/packages/patches/p7zip-CVE-2017-17969.patch		\
   %D%/packages/patches/p7zip-remove-unused-code.patch		\
+  %D%/packages/patches/password-store-gnupg-compat.patch	\
   %D%/packages/patches/patchelf-page-size.patch			\
   %D%/packages/patches/patchelf-rework-for-arm.patch		\
   %D%/packages/patches/patchutils-xfail-gendiff-tests.patch	\
diff --git a/gnu/packages/password-utils.scm b/gnu/packages/password-utils.scm
index 67e9379f8..f83c05a25 100644
--- a/gnu/packages/password-utils.scm
+++ b/gnu/packages/password-utils.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2016 Lukas Gradl <lgradl <at> openmailbox.org>
 ;;; Copyright © 2016 Alex Griffin <a <at> ajgrf.com>
 ;;; Copyright © 2017 Leo Famulari <leo <at> famulari.name>
-;;; Copyright © 2017 Clément Lassieur <clement <at> lassieur.org>
+;;; Copyright © 2017, 2018 Clément Lassieur <clement <at> lassieur.org>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2017 Jelle Licht <jlicht <at> fsfe.org>
 ;;; Copyright © 2017 Eric Bavier <bavier <at> member.fsf.org>
@@ -342,7 +342,8 @@ any X11 window.")
                               name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"))))
+                "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"))
+              (patches (search-patches "password-store-gnupg-compat.patch"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases
diff --git a/gnu/packages/patches/password-store-gnupg-compat.patch b/gnu/packages/patches/password-store-gnupg-compat.patch
new file mode 100644
index 000000000..75c636202
--- /dev/null
+++ b/gnu/packages/patches/password-store-gnupg-compat.patch
@@ -0,0 +1,28 @@
+Copied from upstream mailing list:
+https://lists.zx2c4.com/pipermail/password-store/2018-February/003216.html.
+
+From 9b0c86159d754cc88dd3642564eed527153dfb7f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= <clement <at> lassieur.org>
+Date: Sat, 24 Feb 2018 12:05:46 +0100
+Subject: [PATCH] tests: fix compatibility with GnuPG 2.2.5
+
+---
+ tests/t0300-reencryption.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/t0300-reencryption.sh b/tests/t0300-reencryption.sh
+index 6d5811d..6d15364 100755
+--- a/tests/t0300-reencryption.sh
++++ b/tests/t0300-reencryption.sh
+@@ -10,7 +10,7 @@ canonicalize_gpg_keys() {
+ 	$GPG --list-keys --with-colons "$@" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u
+ }
+ gpg_keys_from_encrypted_file() {
+-	$GPG -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u
++	$GPG -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$1" 2>&1 | grep "public key is" | cut -d ' ' -f 5 | LC_ALL=C sort -u
+ }
+ gpg_keys_from_group() {
+ 	local output="$($GPG --list-config --with-colons | sed -n "s/^cfg:group:$1:\\(.*\\)/\\1/p" | head -n 1)"
+-- 
+2.16.2
+
-- 
2.16.2

Message #8 received at 30593 <at> debbugs.gnu.org (full text, mbox):

From: Marius Bakke <mbakke <at> fastmail.com>
To: Clément Lassieur <clement <at> lassieur.org>,
 30593 <at> debbugs.gnu.org
Subject: Re: [bug#30593] [PATCH] gnu: password-store: Fix compatibility with
 GnuPG 2.2.5.
Date: Sat, 24 Feb 2018 16:20:44 +0100

[Message part 1 (text/plain, inline)]

Clément Lassieur <clement <at> lassieur.org> writes:

> * gnu/packages/patches/password-store-gnupg-compat.patch: New file.
> * gnu/local.mk (dist_patch_DATA): Add it.
> * gnu/packages/password-utils.scm (password-store)[source]: Use it.

LGTM, thanks!

[signature.asc (application/pgp-signature, inline)]

Message #13 received at 30593-done <at> debbugs.gnu.org (full text, mbox):

From: Clément Lassieur <clement <at> lassieur.org>
To: Marius Bakke <mbakke <at> fastmail.com>
Cc: 30593-done <at> debbugs.gnu.org
Subject: Re: [bug#30593] [PATCH] gnu: password-store: Fix compatibility with
 GnuPG 2.2.5.
Date: Sat, 24 Feb 2018 16:28:57 +0100

Marius Bakke <mbakke <at> fastmail.com> writes:

> Clément Lassieur <clement <at> lassieur.org> writes:
>
>> * gnu/packages/patches/password-store-gnupg-compat.patch: New file.
>> * gnu/local.mk (dist_patch_DATA): Add it.
>> * gnu/packages/password-utils.scm (password-store)[source]: Use it.
>
> LGTM, thanks!

Pushed, thank you for reviewing!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.