From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60459) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyij0-0005zT-Kl for guix-patches@gnu.org; Thu, 13 Apr 2017 13:40:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cyiiw-00006t-LO for guix-patches@gnu.org; Thu, 13 Apr 2017 13:40:06 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:47734) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cyiiw-00006P-AF for guix-patches@gnu.org; Thu, 13 Apr 2017 13:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cyiiv-0007i0-UY for guix-patches@gnu.org; Thu, 13 Apr 2017 13:40:01 -0400 Subject: bug#26475: [PATCH] gnu: password-store: Update to 1.7.1. References: <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@mailjet.com> In-Reply-To: <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@mailjet.com> Resent-Message-ID: Message-Id: <822cc020.AEAAJBUxzSUAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY77fe@mailjet.com> From: Arun Isaac Date: Thu, 13 Apr 2017 23:09:18 +0530 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26475@debbugs.gnu.org * 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 reference to "password-store-gnupg-compat.patch". --- gnu/local.mk | 1 - gnu/packages/password-utils.scm | 5 +- .../patches/password-store-gnupg-compat.patch | 53 ------------------= ---- 3 files changed, 2 insertions(+), 57 deletions(-) delete mode 100644 gnu/packages/patches/password-store-gnupg-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 0f3b4bd7a..26f56d2ff 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -823,7 +823,6 @@ dist_patch_DATA =3D \ %D%/packages/patches/ots-no-include-missing-file.patch \ %D%/packages/patches/p7zip-CVE-2016-9296.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 66d5f8cf8..9daacd871 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -284,7 +284,7 @@ any X11 window.") (define-public password-store (package (name "password-store") - (version "1.7") + (version "1.7.1") (source (origin (method url-fetch) (uri @@ -292,8 +292,7 @@ any X11 window.") name "-" version ".tar.xz")) (sha256 (base32 - "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn")) - (patches (search-patches "password-store-gnupg-compat.patch"= )))) + "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/password-store-gnupg-compat.patch b/gnu/p= ackages/patches/password-store-gnupg-compat.patch deleted file mode 100644 index c314ba664..000000000 --- a/gnu/packages/patches/password-store-gnupg-compat.patch +++ /dev/null @@ -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 -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=3Dgnupg.git;a=3Dcommit;h=3D810ad= fd47801fc01e45fb71af9f05c91f7890cdb -https://bugzilla.suse.com/show_bug.cgi?id=3D1028867 ---- - 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=3D"$($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=3DC sort = -u)" - fi -- current_keys=3D"$($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=3DC sort -u)" -+ current_keys=3D"$($GPG $PASSWORD_STORE_GPG_OPTS -v --no-secmem-warning = --no-permission-warning --decrypt --list-only --keyid-format long "$passfil= e" 2>&1 | cut -d ' ' -f 5 | LC_ALL=3DC sort -u)" -=20 - if [[ $gpg_keys !=3D "$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=3DC 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=3DC sort -u -+ $GPG -v --no-secmem-warning --no-permission-warning --decrypt --list-onl= y --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | LC_ALL=3DC sort -u - } - gpg_keys_from_group() { - local output=3D"$($GPG --list-config --with-colons | sed -n "s/^cfg:grou= p:$1:\\(.*\\)/\\1/p" | head -n 1)" ---=20 -2.12.0 - --=20 2.12.2 =