mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 13:58:15 -05:00
gnu: password-store: Fix compatibility with GnuPG 2.2.5.
* 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.
This commit is contained in:
parent
952a20d2a2
commit
60628f5452
3 changed files with 33 additions and 3 deletions
|
@ -13,7 +13,7 @@
|
||||||
# Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
# Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
|
||||||
# Copyright © 2016, 2017 Jan Nieuwenhuizen <janneke@gnu.org>
|
# Copyright © 2016, 2017 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||||
# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
# Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
# Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
# Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
|
||||||
# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
# Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
# Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
|
# Copyright © 2017 Gábor Boskovits <boskovits@gmail.com>
|
||||||
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
# Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
||||||
|
@ -957,6 +957,7 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/p7zip-CVE-2016-9296.patch \
|
%D%/packages/patches/p7zip-CVE-2016-9296.patch \
|
||||||
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
|
%D%/packages/patches/p7zip-CVE-2017-17969.patch \
|
||||||
%D%/packages/patches/p7zip-remove-unused-code.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-page-size.patch \
|
||||||
%D%/packages/patches/patchelf-rework-for-arm.patch \
|
%D%/packages/patches/patchelf-rework-for-arm.patch \
|
||||||
%D%/packages/patches/patchutils-xfail-gendiff-tests.patch \
|
%D%/packages/patches/patchutils-xfail-gendiff-tests.patch \
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
|
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
|
||||||
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
|
||||||
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
|
||||||
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
|
;;; Copyright © 2017, 2018 Clément Lassieur <clement@lassieur.org>
|
||||||
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
|
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
|
||||||
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
|
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
|
||||||
|
@ -342,7 +342,8 @@ (define-public password-store
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"))))
|
"0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"))
|
||||||
|
(patches (search-patches "password-store-gnupg-compat.patch"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases
|
'(#:phases
|
||||||
|
|
28
gnu/packages/patches/password-store-gnupg-compat.patch
Normal file
28
gnu/packages/patches/password-store-gnupg-compat.patch
Normal file
|
@ -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@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
|
||||||
|
|
Loading…
Reference in a new issue