29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
|
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@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
|
||
|
|
|