From unknown Sat Sep 13 17:34:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26475: [PATCH] gnu: password-store: Update to 1.7.1. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2017 11:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26475 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26475@debbugs.gnu.org Cc: Arun Isaac X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.149208269019051 (code B ref -1); Thu, 13 Apr 2017 11:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 13 Apr 2017 11:24:50 +0000 Received: from localhost ([127.0.0.1]:45132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cycrj-0004x7-Lj for submit@debbugs.gnu.org; Thu, 13 Apr 2017 07:24:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43995) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycri-0004wu-3S for submit@debbugs.gnu.org; Thu, 13 Apr 2017 07:24:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycrb-0007mf-6w for submit@debbugs.gnu.org; Thu, 13 Apr 2017 07:24:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60325) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycrb-0007mb-3D for submit@debbugs.gnu.org; Thu, 13 Apr 2017 07:24:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycrZ-00089E-Gm for guix-patches@gnu.org; Thu, 13 Apr 2017 07:24:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycrW-0007lj-BW for guix-patches@gnu.org; Thu, 13 Apr 2017 07:24:33 -0400 Received: from o149.p9.mailjet.com ([87.253.234.149]:52844) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycrV-0007jy-Un for guix-patches@gnu.org; Thu, 13 Apr 2017 07:24:30 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:from:to:subject:date:list-unsubscribe:cc:x-csa-complaints: x-mj-mid:mime-version:content-transfer-encoding; bh=c6l8xShufBvs0MyeX6OYKIIzJTM=; b=OE7pFWnJQTRthqCFTokGaT+ZKRTr0uqd5dK29/CaRXgd3Cf7x+s+kSxn6 gBJGWbVGxYn1eEDY1OnvAzjbUQCtWTz9xihIAbiTOg47KeoExQrD8VQUAGJM NdxwEAv49uIpvt8JGMK/t9CSfHC6yRj6LCmY2YpGqGY5t3L3br3Cjc= Message-Id: <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@mailjet.com> From: Arun Isaac Date: Thu, 13 Apr 2017 16:54:03 +0530 X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_qP7H3jpnCSbe6jRn2PfEOngAFgUc MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * 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/packages/password-utils.scm | 5 +- .../patches/password-store-gnupg-compat.patch | 53 ------------------= ---- 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/password-store-gnupg-compat.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 = From unknown Sat Sep 13 17:34:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26475: [PATCH] gnu: password-store: Update to 1.7.1. Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2017 17:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26475 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac Cc: 26475@debbugs.gnu.org Received: via spool by 26475-submit@debbugs.gnu.org id=B26475.149210370827306 (code B ref 26475); Thu, 13 Apr 2017 17:16:01 +0000 Received: (at 26475) by debbugs.gnu.org; 13 Apr 2017 17:15:08 +0000 Received: from localhost ([127.0.0.1]:45912 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyiKq-00076M-Hx for submit@debbugs.gnu.org; Thu, 13 Apr 2017 13:15:08 -0400 Received: from mail.lassieur.org ([83.152.10.219]:40272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyiKm-000769-1f for 26475@debbugs.gnu.org; Thu, 13 Apr 2017 13:15:07 -0400 Received: from newt (46.218.109.88 [46.218.109.88]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id b089c8d3 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Thu, 13 Apr 2017 17:15:01 +0000 (UTC) References: <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@mailjet.com> User-agent: mu4e 0.9.18; emacs 25.2.1 From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur In-reply-to: <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@mailjet.com> Date: Thu, 13 Apr 2017 19:15:00 +0200 Message-ID: <8760i844bv.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Arun Isaac writes: > * 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/packages/password-utils.scm | 5 +- > .../patches/password-store-gnupg-compat.patch | 53 ---------------------- > 2 files changed, 2 insertions(+), 56 deletions(-) > delete mode 100644 gnu/packages/patches/password-store-gnupg-compat.patch I think you should remove the patch from gnu/local.mk as well. From unknown Sat Sep 13 17:34:40 2025 X-Loop: help-debbugs@gnu.org 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-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2017 17:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26475 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26475@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 26475-submit@debbugs.gnu.org id=B26475.149210519529613 (code B ref 26475); Thu, 13 Apr 2017 17:40:01 +0000 Received: (at 26475) by debbugs.gnu.org; 13 Apr 2017 17:39:55 +0000 Received: from localhost ([127.0.0.1]:45933 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyiij-0007hS-Gn for submit@debbugs.gnu.org; Thu, 13 Apr 2017 13:39:54 -0400 Received: from o108.p9.mailjet.com ([87.253.234.108]:37328) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <822cc020.AEAAJBUxzSUAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY77fe@bnc3.mailjet.com>) id 1cyiie-0007hB-K8 for 26475@debbugs.gnu.org; Thu, 13 Apr 2017 13:39:48 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:from:to:subject:date:list-unsubscribe:cc:x-csa-complaints: x-mj-mid:mime-version:content-transfer-encoding; bh=0NcvJqkN7NyfY8SxrbPdqx8reGo=; b=d/f8zQ7HnlR4KiRP552MYf9ko8zIB0n9su5jy0j341M49kRCr0E2UAnc4 Z2fsNLpr4rjS3/CmF9+yFFyvg4U/kORGkk3SmZBAcBxtIqvCePc+6AAl60uW zF6W1U0xlw288e6+nNGswB2qVK5jadutcOU62U4zwiaGqB2DTlidNw= Message-Id: <822cc020.AEAAJBUxzSUAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY77fe@mailjet.com> From: Arun Isaac Date: Thu, 13 Apr 2017 23:09:18 +0530 X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEAAJBUxzSUAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY77feRTNtsrEXQ22z79mhOZqhuwAFgUc MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.0 (/) * 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 = From unknown Sat Sep 13 17:34:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26475: [PATCH] gnu: password-store: Update to 1.7.1. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2017 17:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26475 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26475@debbugs.gnu.org Received: via spool by 26475-submit@debbugs.gnu.org id=B26475.149210530929816 (code B ref 26475); Thu, 13 Apr 2017 17:42:02 +0000 Received: (at 26475) by debbugs.gnu.org; 13 Apr 2017 17:41:49 +0000 Received: from localhost ([127.0.0.1]:45937 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyikf-0007kq-30 for submit@debbugs.gnu.org; Thu, 13 Apr 2017 13:41:49 -0400 Received: from o116.p9.mailjet.com ([87.253.234.116]:48602) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyikb-0007kf-0e for 26475@debbugs.gnu.org; Thu, 13 Apr 2017 13:41:47 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=YDwK+aZNT9sHEtY+85WngK1HmfU=; b=TTF0FgFAqR95y0e2tsbgexpySMS/jdnrMrEttu8KIHwiU6NT2S2ee8c0G Geo/hbwFGsPF4ooiabQ8ZmRqq72ULok0LmYE3EfEQ0Bo37gm5FBchZBn+1g/ knJ4iuhIygRo9sb4/tNQYLgILhLbzFiXP8g7y1xUD7cwD95dLqn/8E= Message-Id: MIME-Version: 1.0 From: Arun Isaac Date: Thu, 13 Apr 2017 23:11:31 +0530 In-reply-to: <8760i844bv.fsf@lassieur.org> References: <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@mailjet.com> <8760i844bv.fsf@lassieur.org> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEMAJJmo-tkAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY77hXJCSryKjvSS2ZlLn_ZjAcAQAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.8 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.8 (--) > I think you should remove the patch from gnu/local.mk as well. Done! Please find the new patch in the previous mail. = From unknown Sat Sep 13 17:34:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26475: [PATCH] gnu: password-store: Update to 1.7.1. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2017 18:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26475 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac Cc: 26475@debbugs.gnu.org Received: via spool by 26475-submit@debbugs.gnu.org id=B26475.14921084642210 (code B ref 26475); Thu, 13 Apr 2017 18:35:02 +0000 Received: (at 26475) by debbugs.gnu.org; 13 Apr 2017 18:34:24 +0000 Received: from localhost ([127.0.0.1]:45971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyjZY-0000Za-Dh for submit@debbugs.gnu.org; Thu, 13 Apr 2017 14:34:24 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:37920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyjZS-0000ZM-UJ for 26475@debbugs.gnu.org; Thu, 13 Apr 2017 14:34:22 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D22F720A3B; Thu, 13 Apr 2017 14:34:18 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Thu, 13 Apr 2017 14:34:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=C1HCR1lz3mbDg9wwW9tyQxK2BFGwavM8C0zisT 6LK7E=; b=M0f59fp0dRcuJju+vgSGtTBT4F5biVebCoP8KozNJVLMAYwx2hWJxu 0qlr6YVmwWTF2CMPRCUdiZ4k8gNfv0K7rdC+kSd0PZkv69YWOmO+ifXZ/jUUDiZ9 2nIpHZe/5bSSdlFlYuxUqqvFh3hBJcELiSzXEKvdax4CdUznhZ6oU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=C1HCR1lz3mbDg9wwW9 tyQxK2BFGwavM8C0zisT6LK7E=; b=fSxssexq5tuTgNvqk7kJYfBRWVhx/Yud5J fO6YxmPgKSF1xCeHM8IbDmqUJTJ6/enzPZ4Vy3zs7L3/GeS5u2fLDea4SHs/sd3d VQMacS7GE0kTeLjzT9zJZK+QHh53QJN9vO7KB5KACfIxYrDi2xmXhbLz8fDh2W7c Wr37MDtpkgEAv5mYa6iMp9p8ue+RsVL6alCnIfxX+42cP8F+RmuXtO3Tf00a645O eq0zatpwdCGbOLhXC84L3gjhYnrjyyMUPZNEnqpFy/0UMI5RJzeoexgiVwFJsvm9 s5cLA7fPnMAsnb0itxlh59Tf8gOgVWUMTZuY7MOPWfb48xSzjRhw== X-ME-Sender: X-Sasl-enc: 38jbFTggZPBTEb+5ZdEiEhvpIIZzNniL1kJdsL+ijpkI 1492108458 Received: from localhost (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 9073E248B2; Thu, 13 Apr 2017 14:34:18 -0400 (EDT) Date: Thu, 13 Apr 2017 14:34:17 -0400 From: Leo Famulari Message-ID: <20170413183417.GC14931@jasmine> References: <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@mailjet.com> <822cc020.AEAAJBUxzSUAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY77fe@mailjet.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="H1spWtNR+x+ondvy" Content-Disposition: inline In-Reply-To: <822cc020.AEAAJBUxzSUAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY77fe@mailjet.com> User-Agent: Mutt/1.8.0 (2017-02-23) X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) --H1spWtNR+x+ondvy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Thu, Apr 13, 2017 at 11:09:18PM +0530, Arun Isaac wrote: > * 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". It's only a matter of stylistic consistency, but you can simplify the last point to "Remove it". If not, the sentence should start at the first column when it wraps to the next line; that is, we don't indent multi-line changelog entries. Thanks for caring for this package! --H1spWtNR+x+ondvy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAljvxKkACgkQJkb6MLrK fwhjxhAAk8T0fof5kk6Fcn18hg/xdMkZK3EBP6ndO9MtMX7VA8ezKSHtCxsRFXPv zxV6rm91fWsmhQ3Vo9COxrS1WvJwxllJiAZdOmk/4e64bdKBok0THRaLfNOowxtw O7GfDbCtojzS1W0qyFI5uMunY//iBKJ+NLGyf1gbd1ICBnPJ9y7uV6TRHHLZD/aZ e+lf92z7AMSHJiOHRVxUVoCAcb8fLAboSszlNVeTUndPCwXSsLdhFDam8I6jYpOl 1iM8MQrHG4w41cCKW+rAlIilKlqkzA/UGYp1ashOTy5sk3JSwIAENlD5GZANLe1d F1WS8hYAC7yk//IKOiMTxs15bPls6VJV8sAUDCSlOcrzl4+faKeIqxx0ACETDWNe uKTLavd81uY+JhnLTds9x1j1H2ZSdc1WT2ElXhNTwHi6vNl467LS5CVHmHuAYXvG M3GvfKFg4CIU6lQLEm/rkHlgdwUHjOlRznU2zOa96hsQsiNjvnRSXgH2llaoicU5 mSJwWvPp930Zi7SX8F1lqW/MyD8UTvTQKrkMgbw9akio1TyQep5kOTyoxhmca0eW g5obcZnXiaKztS1JJvNfAozzafHNwsuUtpA8X5YrYg1PNI3YBc+2ZobEuzbrwWk3 O2Yw8uI1gmoXcsWkr2Uj3es5jwd1ao/rOgmonHu5ApKL7xrrhlU= =Q4k4 -----END PGP SIGNATURE----- --H1spWtNR+x+ondvy-- From unknown Sat Sep 13 17:34:40 2025 X-Loop: help-debbugs@gnu.org 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-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2017 18:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26475 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26475@debbugs.gnu.org Cc: Arun Isaac Received: via spool by 26475-submit@debbugs.gnu.org id=B26475.14921090013078 (code B ref 26475); Thu, 13 Apr 2017 18:44:02 +0000 Received: (at 26475) by debbugs.gnu.org; 13 Apr 2017 18:43:21 +0000 Received: from localhost ([127.0.0.1]:45986 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyji8-0000nT-Gk for submit@debbugs.gnu.org; Thu, 13 Apr 2017 14:43:21 -0400 Received: from o163.p8.mailjet.com ([87.253.233.163]:41422) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <405637a8.AEUAI89OAuQAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY78a_@bnc3.mailjet.com>) id 1cyji4-0000nI-Ha for 26475@debbugs.gnu.org; Thu, 13 Apr 2017 14:43:15 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:from:to:subject:date:list-unsubscribe:cc:x-csa-complaints: x-mj-mid:mime-version:content-transfer-encoding; bh=t+KiLRgaD6Yx/TEP+JU2vNJfN0M=; b=KHHLnbgU7l2F0EMbq4SUlZ8AkhONC5dXqPqUzgZJaoOYH4ah17x7uDbEM PScEaVcWmWvuJyr2kb0xJpMIlyqjLE2eD0QBlNQAIFGPP/R1+f8xbBzKgOKI BuYji9RDzRdZ2C2IIhKazsjigpj63+V67O/Fs3Ep8aR19FOSbYhhaI= Message-Id: <405637a8.AEUAI89OAuQAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY78a_@mailjet.com> From: Arun Isaac Date: Fri, 14 Apr 2017 00:12:44 +0530 X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEUAI89OAuQAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY78a_Cog9c5joThSgZ1Q7k7g1_QAFgUc MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.5 (/) * 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. --- 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 = From unknown Sat Sep 13 17:34:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26475: [PATCH] gnu: password-store: Update to 1.7.1. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2017 18:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26475 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26475@debbugs.gnu.org Received: via spool by 26475-submit@debbugs.gnu.org id=B26475.14921091413323 (code B ref 26475); Thu, 13 Apr 2017 18:46:01 +0000 Received: (at 26475) by debbugs.gnu.org; 13 Apr 2017 18:45:41 +0000 Received: from localhost ([127.0.0.1]:45990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyjkT-0000rX-1J for submit@debbugs.gnu.org; Thu, 13 Apr 2017 14:45:41 -0400 Received: from o106.p8.mailjet.com ([87.253.233.106]:55978) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <572155db.AEEAJczaSy0AAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY78dT@bnc3.mailjet.com>) id 1cyjkR-0000rP-Rm for 26475@debbugs.gnu.org; Thu, 13 Apr 2017 14:45:40 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=fqIt4UhK9iEv5z5EooguSFSziFY=; b=LrLmNN0LezvTIKOM7zqgVAB3CJGgz9QxPxjs7EgzTN8/g4Fox0av9VEsL MhqgoJJiHjunLpGKMxqusrDC/F++0C2SJfKe1A/0J7zajzbrTfcscggrmoQy LfEL6ExQYQQFhTakru2PIyXmZpNhoy/K2ICek7oLVPPv9Zbnv6v4nY= Message-Id: <572155db.AEEAJczaSy0AAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY78dT@mailjet.com> MIME-Version: 1.0 From: Arun Isaac Date: Fri, 14 Apr 2017 00:15:20 +0530 In-reply-to: <20170413183417.GC14931@jasmine> References: <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@mailjet.com> <822cc020.AEAAJBUxzSUAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY77fe@mailjet.com> <20170413183417.GC14931@jasmine> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEEAJczaSy0AAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY78dTT7Cpq7hNSmGtR4W6LkiKagAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) > It's only a matter of stylistic consistency, but you can simplify the > last point to "Remove it". > > If not, the sentence should start at the first column when it wraps to > the next line; that is, we don't indent multi-line changelog entries. New patch sent. Do check now, and let me know if I can push. Thanks! = From unknown Sat Sep 13 17:34:40 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26475: [PATCH] gnu: password-store: Update to 1.7.1. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 13 Apr 2017 19:03:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26475 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Arun Isaac Cc: 26475@debbugs.gnu.org Received: via spool by 26475-submit@debbugs.gnu.org id=B26475.14921101304939 (code B ref 26475); Thu, 13 Apr 2017 19:03:02 +0000 Received: (at 26475) by debbugs.gnu.org; 13 Apr 2017 19:02:10 +0000 Received: from localhost ([127.0.0.1]:46006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyk0O-0001Ha-Vy for submit@debbugs.gnu.org; Thu, 13 Apr 2017 15:02:09 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:42820) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cyk0J-0001HP-Dr for 26475@debbugs.gnu.org; Thu, 13 Apr 2017 15:02:07 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id DFE11208EA; Thu, 13 Apr 2017 15:02:02 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Thu, 13 Apr 2017 15:02:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=jYepdzLSwwdAOr3ds/SVGttmULgPCc1U5x4tu1 kCv+Y=; b=cxUL1mmyVXjiE9l/d/qTRhMCcrufjRloMc5NmqyMo0SrLystNwZfCf +VRvYK/QY8O6nFFWaOtcj6QPyaRFpLZTsyqCkWt5uYhEFI2A5CVKTKOJzJD4njEF 6jB7F+uy6550r0RKNB0qnCWk1itl8q5wtIvdY/ffYFsYNCKKx+niE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc:x-sasl-enc; s=fm1; bh=jYepdzLSwwdAOr3ds/ SVGttmULgPCc1U5x4tu1kCv+Y=; b=HzSJ9ASyMOvaj7VK/7w9sjoaZ9xUrtEHgW N6pTyKmG8c87KwNF44cvb1HCb1qIUNV6146J+SIO8ld3H6KnjrZiPqd+rc4FpiDI INm6LGPZvK3Et0rbv3muHGl7jUE9F22V78gM2MFh4oqqYU2PjiYC1HpYpila9nG0 //eJlhLe4zGIhK30/TjmykeJXXWyavQf6uAF0S47pI5d/4DoChC9lE4PbLYDlx2v M6hJ6UdBBP3sTXFt6HBELqXa1sX5pOqAqy0eO+LvU4zC8KB2XRU0EK4acJKKemQ3 1wdBtdMAm3sixcbLXXnJBF+w61X+sKRLCTGiB5Pba4K8ATge71eA== X-ME-Sender: X-Sasl-enc: hRYbbGTs4ip7JbI6vYV+wdv8mm9PLO5I2MKaiYxGXwZY 1492110122 Received: from localhost (c-73-165-108-70.hsd1.pa.comcast.net [73.165.108.70]) by mail.messagingengine.com (Postfix) with ESMTPA id 2A49C7E04B; Thu, 13 Apr 2017 15:02:02 -0400 (EDT) Date: Thu, 13 Apr 2017 15:02:00 -0400 From: Leo Famulari Message-ID: <20170413190200.GE14931@jasmine> References: <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@mailjet.com> <405637a8.AEUAI89OAuQAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY78a_@mailjet.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <405637a8.AEUAI89OAuQAAAAAAAAAAAO0xdkAAAACwQwAAAAAAAW9WABY78a_@mailjet.com> User-Agent: Mutt/1.8.0 (2017-02-23) X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On Fri, Apr 14, 2017 at 12:12:44AM +0530, Arun Isaac wrote: > * 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. LGTM, thanks! From unknown Sat Sep 13 17:34:40 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Arun Isaac Subject: bug#26475: closed (Re: [PATCH] gnu: password-store: Update to 1.7.1.) Message-ID: References: <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@mailjet.com> X-Gnu-PR-Message: they-closed 26475 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26475@debbugs.gnu.org Date: Thu, 13 Apr 2017 19:17:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1492111022-12714-1" This is a multi-part message in MIME format... ------------=_1492111022-12714-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26475: [PATCH] gnu: password-store: Update to 1.7.1. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 26475@debbugs.gnu.org. --=20 26475: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26475 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1492111022-12714-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26475-done) by debbugs.gnu.org; 13 Apr 2017 19:16:52 +0000 Received: from localhost ([127.0.0.1]:46028 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cykEe-0003Bi-Ky for submit@debbugs.gnu.org; Thu, 13 Apr 2017 15:16:52 -0400 Received: from o108.p9.mailjet.com ([87.253.234.108]:35932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cykEd-0003AG-5T for 26475-done@debbugs.gnu.org; Thu, 13 Apr 2017 15:16:51 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:mime-version:from:to:subject:date:list-unsubscribe:in-reply-to: references:x-csa-complaints:x-mj-mid:content-type:content-transfer-encoding; bh=SeCEuW4umqaR6PlCo/hcsNEEd8A=; b=YfQ0y0LRCafsLQrCtfsUe5MTs8Ncja9Mgmp2P6/Bje4ZgzSL1+7T1tCia LCPupJJCiCHKD6QU76ibMwXiskV9rR4q02wZWC0rhW4U4gI+arEh5DZYhtsB BCaklB5C8HRD6tBDjlPK3jZVfMrIuN86Rr+EWLKJAd/KGqKoSU2EK8= Message-Id: MIME-Version: 1.0 From: Arun Isaac To: 26475-done@debbugs.gnu.org Subject: Re: [PATCH] gnu: password-store: Update to 1.7.1. Date: Fri, 14 Apr 2017 00:46:38 +0530 In-reply-to: <20170413184244.30383-1-arunisaac@systemreboot.net> References: <20170413184244.30383-1-arunisaac@systemreboot.net> X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEQAJPFvE0wAAAAAAAAAAAO0yh8AAAACwQwAAAAAAAW9WABY786iVsO1rI4XQ52IER-_4EEBpgAFgUc Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 26475-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Pushed! = ------------=_1492111022-12714-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 13 Apr 2017 11:24:50 +0000 Received: from localhost ([127.0.0.1]:45132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cycrj-0004x7-Lj for submit@debbugs.gnu.org; Thu, 13 Apr 2017 07:24:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43995) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycri-0004wu-3S for submit@debbugs.gnu.org; Thu, 13 Apr 2017 07:24:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycrb-0007mf-6w for submit@debbugs.gnu.org; Thu, 13 Apr 2017 07:24:36 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:60325) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycrb-0007mb-3D for submit@debbugs.gnu.org; Thu, 13 Apr 2017 07:24:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycrZ-00089E-Gm for guix-patches@gnu.org; Thu, 13 Apr 2017 07:24:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycrW-0007lj-BW for guix-patches@gnu.org; Thu, 13 Apr 2017 07:24:33 -0400 Received: from o149.p9.mailjet.com ([87.253.234.149]:52844) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@bnc3.mailjet.com>) id 1cycrV-0007jy-Un for guix-patches@gnu.org; Thu, 13 Apr 2017 07:24:30 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/simple; q=dns/txt; d=bnc3.mailjet.com; i=arunisaac=3Dsystemreboot.net@bnc3.mailjet.com; s=mailjet; h=message-id:from:to:subject:date:list-unsubscribe:cc:x-csa-complaints: x-mj-mid:mime-version:content-transfer-encoding; bh=c6l8xShufBvs0MyeX6OYKIIzJTM=; b=OE7pFWnJQTRthqCFTokGaT+ZKRTr0uqd5dK29/CaRXgd3Cf7x+s+kSxn6 gBJGWbVGxYn1eEDY1OnvAzjbUQCtWTz9xihIAbiTOg47KeoExQrD8VQUAGJM NdxwEAv49uIpvt8JGMK/t9CSfHC6yRj6LCmY2YpGqGY5t3L3br3Cjc= Message-Id: <128ff10d.AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_q@mailjet.com> From: Arun Isaac To: guix-patches@gnu.org Subject: [PATCH] gnu: password-store: Update to 1.7.1. Date: Thu, 13 Apr 2017 16:54:03 +0530 X-CSA-Complaints: whitelist-complaints@eco.de X-MJ-Mid: AEEAJbcYXeMAAAAAAAAAAAOtUOAAAAACwQwAAAAAAAW9WABY71_qP7H3jpnCSbe6jRn2PfEOngAFgUc MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.0 (----) X-Debbugs-Envelope-To: submit Cc: Arun Isaac X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.0 (----) * 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/packages/password-utils.scm | 5 +- .../patches/password-store-gnupg-compat.patch | 53 ------------------= ---- 2 files changed, 2 insertions(+), 56 deletions(-) delete mode 100644 gnu/packages/patches/password-store-gnupg-compat.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 = ------------=_1492111022-12714-1--