gnu: password-store: Update to 1.7.1.
* gnu/packages/password-utils.scm (password-store): Update to 1.7.1. [source]: Remove "password-store-gnupg-compat.patch". * gnu/packages/patches/password-store-gnupg-compat.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
This commit is contained in:
parent
83f9aa5e91
commit
4264db2209
|
@ -827,7 +827,6 @@ dist_patch_DATA = \
|
||||||
%D%/packages/patches/ots-no-include-missing-file.patch \
|
%D%/packages/patches/ots-no-include-missing-file.patch \
|
||||||
%D%/packages/patches/p7zip-CVE-2016-9296.patch \
|
%D%/packages/patches/p7zip-CVE-2016-9296.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 \
|
||||||
|
|
|
@ -284,7 +284,7 @@ any X11 window.")
|
||||||
(define-public password-store
|
(define-public password-store
|
||||||
(package
|
(package
|
||||||
(name "password-store")
|
(name "password-store")
|
||||||
(version "1.7")
|
(version "1.7.1")
|
||||||
(source (origin
|
(source (origin
|
||||||
(method url-fetch)
|
(method url-fetch)
|
||||||
(uri
|
(uri
|
||||||
|
@ -292,8 +292,7 @@ any X11 window.")
|
||||||
name "-" version ".tar.xz"))
|
name "-" version ".tar.xz"))
|
||||||
(sha256
|
(sha256
|
||||||
(base32
|
(base32
|
||||||
"002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn"))
|
"0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn"))))
|
||||||
(patches (search-patches "password-store-gnupg-compat.patch"))))
|
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases
|
'(#:phases
|
||||||
|
|
|
@ -1,53 +0,0 @@
|
||||||
Copied from upstream mailing list:
|
|
||||||
https://lists.zx2c4.com/pipermail/password-store/2017-March/002844.html.
|
|
||||||
|
|
||||||
The patch actually restores compatibility with GnuPG 2.1.19, the '2.2.19' in
|
|
||||||
the commit message is a typo.
|
|
||||||
|
|
||||||
From 8723d8e8192683891904aff321446b0fac37d1ad Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andreas Stieger <astieger@suse.com>
|
|
||||||
Date: Fri, 10 Mar 2017 15:43:26 +0100
|
|
||||||
Subject: [PATCH] Fix compatibility with GnuPG 2.2.19
|
|
||||||
|
|
||||||
GnuPG 2.2.19 added a warning when no command was given.
|
|
||||||
|
|
||||||
* src/password-store.sh (reencrypt_path): Add --decrypt to --list-only
|
|
||||||
* tests/t0300-reencryption.sh (gpg_keys_from_encrypted_file): same
|
|
||||||
|
|
||||||
https://bugs.gnupg.org/gnupg/msg9873
|
|
||||||
http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commit;h=810adfd47801fc01e45fb71af9f05c91f7890cdb
|
|
||||||
https://bugzilla.suse.com/show_bug.cgi?id=1028867
|
|
||||||
---
|
|
||||||
src/password-store.sh | 2 +-
|
|
||||||
tests/t0300-reencryption.sh | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/password-store.sh b/src/password-store.sh
|
|
||||||
index 1ab6fb5..bad8d4f 100755
|
|
||||||
--- a/src/password-store.sh
|
|
||||||
+++ b/src/password-store.sh
|
|
||||||
@@ -125,7 +125,7 @@ reencrypt_path() {
|
|
||||||
done
|
|
||||||
gpg_keys="$($GPG $PASSWORD_STORE_GPG_OPTS --list-keys --with-colons "${GPG_RECIPIENTS[@]}" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u)"
|
|
||||||
fi
|
|
||||||
- current_keys="$($GPG $PASSWORD_STORE_GPG_OPTS -v --no-secmem-warning --no-permission-warning --list-only --keyid-format long "$passfile" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u)"
|
|
||||||
+ current_keys="$($GPG $PASSWORD_STORE_GPG_OPTS -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$passfile" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u)"
|
|
||||||
|
|
||||||
if [[ $gpg_keys != "$current_keys" ]]; then
|
|
||||||
echo "$passfile_display: reencrypting to ${gpg_keys//$'\n'/ }"
|
|
||||||
diff --git a/tests/t0300-reencryption.sh b/tests/t0300-reencryption.sh
|
|
||||||
index 9d46580..6d5811d 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 --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 | 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.12.0
|
|
||||||
|
|
Loading…
Reference in New Issue