gnu: password-store: Update to 1.7.2.
* gnu/packages/password-utils.scm (password-store): Update to 1.7.2. [source]: Remove 'password-store-gnupg-compat.patch'. * gnu/packages/patches/password-store-gnupg-compat.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
parent
f715f102e0
commit
ab6f400531
|
@ -983,7 +983,6 @@ 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 \
|
||||||
|
|
|
@ -358,7 +358,7 @@ any X11 window.")
|
||||||
(define-public password-store
|
(define-public password-store
|
||||||
(package
|
(package
|
||||||
(name "password-store")
|
(name "password-store")
|
||||||
(version "1.7.1")
|
(version "1.7.2")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri
|
||||||
|
@ -366,8 +366,7 @@ any X11 window.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"))
|
"1sl0d7nc85c6c2bmmmyb8rpmn47vhkj831l153mjlkawjvhwas27"))))
|
||||||
(patches (search-patches "password-store-gnupg-compat.patch"))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases
|
'(#:phases
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
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 New Issue