From unknown Sun Jun 22 07:53:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26118: [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.1.19. Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Mar 2017 00:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 26118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26118@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.148962522721154 (code B ref -1); Thu, 16 Mar 2017 00:48:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Mar 2017 00:47:07 +0000 Received: from localhost ([127.0.0.1]:57713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coJZD-0005UJ-4W for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:47:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coJZ7-0005Tr-MX for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:46:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coJZ1-0004kN-7T for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:46:48 -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 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:49451) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coJZ1-0004kG-4c for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:46:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coJYz-0003S2-9p for guix-patches@gnu.org; Wed, 15 Mar 2017 20:46:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coJYv-0004i3-SM for guix-patches@gnu.org; Wed, 15 Mar 2017 20:46:45 -0400 Received: from mail.lassieur.org ([83.152.10.219]:35788 helo=ron) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coJYv-0004dJ-Fl for guix-patches@gnu.org; Wed, 15 Mar 2017 20:46:41 -0400 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by ron (OpenSMTPD) with ESMTPSA id 2b9042ac (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO) for ; Thu, 16 Mar 2017 00:46:38 +0000 (UTC) From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Date: Thu, 16 Mar 2017 01:46:30 +0100 Message-Id: <20170316004631.25613-1-clement@lassieur.org> X-Mailer: git-send-email 2.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 0.9 (/) 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.9 (/) * 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 fixes the tests too. There is a discussion about this patch: https://bugzilla.suse.com/show_bug.cgi?id=1028867. I took the one from Andreas. --- gnu/local.mk | 2 + gnu/packages/password-utils.scm | 4 +- .../patches/password-store-gnupg-compat.patch | 50 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/password-store-gnupg-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index c1b076a5f..b3aa79ad9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -9,6 +9,7 @@ # Copyright © 2016 Adonay "adfeno" Felipe Nogueira # Copyright © 2016, 2017 Ricardo Wurmus # Copyright © 2016 Ben Woodcroft +# Copyright © 2017 Clément Lassieur # # This file is part of GNU Guix. # @@ -806,6 +807,7 @@ dist_patch_DATA = \ %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 811173cae..3f125a011 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2017 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -291,7 +292,8 @@ any X11 window.") name "-" version ".tar.xz")) (sha256 (base32 - "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn")))) + "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn")) + (patches (search-patches "password-store-gnupg-compat.patch")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/password-store-gnupg-compat.patch b/gnu/packages/patches/password-store-gnupg-compat.patch new file mode 100644 index 000000000..972b89033 --- /dev/null +++ b/gnu/packages/patches/password-store-gnupg-compat.patch @@ -0,0 +1,50 @@ +Copied from upstream mailing list: +https://lists.zx2c4.com/pipermail/password-store/2017-March/002844.html. + +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=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 + -- 2.12.0 From unknown Sun Jun 22 07:53:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26118: [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.1.19. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Mar 2017 04:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Cc: 26118@debbugs.gnu.org Received: via spool by 26118-submit@debbugs.gnu.org id=B26118.148963965326843 (code B ref 26118); Thu, 16 Mar 2017 04:48:01 +0000 Received: (at 26118) by debbugs.gnu.org; 16 Mar 2017 04:47:33 +0000 Received: from localhost ([127.0.0.1]:57831 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coNK1-0006yt-7v for submit@debbugs.gnu.org; Thu, 16 Mar 2017 00:47:33 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:46878) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coNJv-0006yZ-UN for 26118@debbugs.gnu.org; Thu, 16 Mar 2017 00:47:31 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 5ADC1209A9; Thu, 16 Mar 2017 00:47:24 -0400 (EDT) Received: from frontend1 ([10.202.2.160]) by compute4.internal (MEProxy); Thu, 16 Mar 2017 00:47:24 -0400 DKIM-Signature: v=1; a=rsa-sha1; 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=rYJHJXtNfmSbVZGeS21OsIoYbuQ=; b=18hU52 Ncvms+FTpOn6V1XZ6Jqm0DE4h80ahVMzHjAGlSIYNVBogqcG4eRtOZQtTccZQGz6 si0Z2MoxL2z5jI5VPk079E0Gzd1T5relT3Lq/LUERDH8JCuoiWca87H2P3L0k0pP f7GLeFFYvVwq3qSLyqSJKad8GBEgqG+cXMSC4= DKIM-Signature: v=1; a=rsa-sha1; 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=rYJHJXtNfmSbVZGeS2 1OsIoYbuQ=; b=clffJRS+NfhqgEmL2Fg9UI2Z+yyeKGhdtE4H+8I/PCsUdy2HTq dj9czRF5F3ozHYG+0tvnJBbPTc9VVUm0/HE8HckjTgKMLzHjCeVBad0oMcWMeyhQ K02GhIgYwpyxUJqog2zfws3xK4EgGGz2gzD9j1Ebpzc/ei1a46Ap2MpQWu/+CLR0 jj99Xs9jqg95+D8iNJJzbPjcPDToTRug51raE0PQD3mi2+Dkf32qEU/5aa+1tccE 53NcwVPbCxMjEVCtXXlg0EeM3Y1getUZlOMzncbtbZVZkgybPleGjoCLMeaZ5kWg wEcVlbWDXRU/gGUnTNpNadPa/0YpgcDkjqEw== X-ME-Sender: X-Sasl-enc: LllxDlYqnXIJ7R9ZDWKx/UT0NKECa+8ofpesHLMd0PT+ 1489639644 Received: from localhost (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id 1CA097E0CF; Thu, 16 Mar 2017 00:47:24 -0400 (EDT) Date: Thu, 16 Mar 2017 00:47:22 -0400 From: Leo Famulari Message-ID: <20170316044722.GA4066@jasmine> References: <20170316004631.25613-1-clement@lassieur.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="tThc/1wpZn/ma/RB" Content-Disposition: inline In-Reply-To: <20170316004631.25613-1-clement@lassieur.org> 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 (/) --tThc/1wpZn/ma/RB Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Mar 16, 2017 at 01:46:30AM +0100, Cl=E9ment Lassieur wrote: > * 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. Thanks! > This fixes the tests too. >=20 > There is a discussion about this patch: > https://bugzilla.suse.com/show_bug.cgi?id=3D1028867. I took the one from > Andreas. This doesn't need to go in the commit message. > diff --git a/gnu/packages/patches/password-store-gnupg-compat.patch b/gnu= /packages/patches/password-store-gnupg-compat.patch > new file mode 100644 > index 000000000..972b89033 > --- /dev/null > +++ b/gnu/packages/patches/password-store-gnupg-compat.patch > @@ -0,0 +1,50 @@ > +Copied from upstream mailing list: > +https://lists.zx2c4.com/pipermail/password-store/2017-March/002844.html. > + > +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. The version is 2.1.19. We should say that the patch actually restores compatibility with GnuPG 2.1.19 and that the '2.2.19' in the commit message is a typo. --tThc/1wpZn/ma/RB Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAljKGNYACgkQJkb6MLrK fwhJUw/9HYDh5lyTd00ekmW0+GaiJTtkUabEHBf/ZzEiMDatIeFL6TdlQ6X52kyK 7T8qRPNU0v2wxrt2SWYeJQq9+teVWLPnaHkLypRH6eM4NkNYgZ+XDLdGTFDN2lu9 k3Rmsv57fUEsD4PymZvYX8uNATfg0BFuO8uWrWkGh4t5rUP3a76aXJ+LPCwSqn+H Qu7l99gTWrHfY+OrtwcWSHPC5gs0A2fU8PG/hWK4SfscXUj7EwdMVmtCST6bRktU dAPJ3+x+XsPaijspKp01uMhpIUE7AENR25jaIkCT64Yn29MDhokSOq/898oplWSW HM2FYvWok9itZzwl0IKY+B0oKMEy+qF6PhGVunZzDMu2vavzTWjB13Ic8Fp2FZdC EOXQSF/AsMPAc2MAz/sPEG9w/uNurQ7Pyx7ZrfnX+HWdipuZrXrI57vjlRducluO Rxi4r7AxkvYjktEuvgvrwRJTdKwzXeFHov5RTIQCLmaHOa9gi0HHL0FVZVUqKpkd Iwwz2aGUECeG7QzxmWh3ZVpXfs1uay84xeoAG7ZQSYaI4GuVJ5gqY64dTov/db8k ZRLT/V47NBbPL5Wq28/17j9AVGtfTktfhOzsAXOPhKEEDdhy4fee+t+AMForOpUT 3cf9vgIeHZkZlOSKJP60VTi6Rm8szg0GGt+1hLAo93zUv8tQEQk= =E7zw -----END PGP SIGNATURE----- --tThc/1wpZn/ma/RB-- From unknown Sun Jun 22 07:53:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26118: [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.1.19. Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Mar 2017 09:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Leo Famulari Cc: 26118@debbugs.gnu.org Received: via spool by 26118-submit@debbugs.gnu.org id=B26118.148965679422957 (code B ref 26118); Thu, 16 Mar 2017 09:34:02 +0000 Received: (at 26118) by debbugs.gnu.org; 16 Mar 2017 09:33:14 +0000 Received: from localhost ([127.0.0.1]:57990 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coRmU-0005yD-K6 for submit@debbugs.gnu.org; Thu, 16 Mar 2017 05:33:14 -0400 Received: from mail.lassieur.org ([83.152.10.219]:49516 helo=ron) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coRmS-0005y3-OV for 26118@debbugs.gnu.org; Thu, 16 Mar 2017 05:33:13 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by ron (OpenSMTPD) with ESMTPSA id 55965f0f (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Thu, 16 Mar 2017 09:33:10 +0000 (UTC) References: <20170316004631.25613-1-clement@lassieur.org> <20170316044722.GA4066@jasmine> User-agent: mu4e 0.9.18; emacs 25.2.1 From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur In-reply-to: <20170316044722.GA4066@jasmine> Date: Thu, 16 Mar 2017 10:33:10 +0100 Message-ID: <8760j9sh0p.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 (/) Leo Famulari writes: >> This fixes the tests too. >> >> There is a discussion about this patch: >> https://bugzilla.suse.com/show_bug.cgi?id=1028867. I took the one from >> Andreas. > > This doesn't need to go in the commit message. Oh I got mixed up about git send-email, sorry. >> diff --git a/gnu/packages/patches/password-store-gnupg-compat.patch b/gnu/packages/patches/password-store-gnupg-compat.patch >> new file mode 100644 >> index 000000000..972b89033 >> --- /dev/null >> +++ b/gnu/packages/patches/password-store-gnupg-compat.patch >> @@ -0,0 +1,50 @@ >> +Copied from upstream mailing list: >> +https://lists.zx2c4.com/pipermail/password-store/2017-March/002844.html. >> + >> +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. > > The version is 2.1.19. We should say that the patch actually restores > compatibility with GnuPG 2.1.19 and that the '2.2.19' in the commit > message is a typo. Ok. From unknown Sun Jun 22 07:53:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26118: [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.1.19. Resent-From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Mar 2017 09:39:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 26118@debbugs.gnu.org Received: via spool by 26118-submit@debbugs.gnu.org id=B26118.148965708723590 (code B ref 26118); Thu, 16 Mar 2017 09:39:01 +0000 Received: (at 26118) by debbugs.gnu.org; 16 Mar 2017 09:38:07 +0000 Received: from localhost ([127.0.0.1]:58077 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coRr4-000680-63 for submit@debbugs.gnu.org; Thu, 16 Mar 2017 05:38:07 -0400 Received: from mail.lassieur.org ([83.152.10.219]:49520 helo=ron) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coRqz-00067p-Hh for 26118@debbugs.gnu.org; Thu, 16 Mar 2017 05:37:57 -0400 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by ron (OpenSMTPD) with ESMTPSA id f1970268 (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO) for <26118@debbugs.gnu.org>; Thu, 16 Mar 2017 09:37:52 +0000 (UTC) From: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Date: Thu, 16 Mar 2017 10:37:43 +0100 Message-Id: <20170316093743.10793-1-clement@lassieur.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170316044722.GA4066@jasmine> References: <20170316044722.GA4066@jasmine> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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/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. --- gnu/local.mk | 2 + gnu/packages/password-utils.scm | 4 +- .../patches/password-store-gnupg-compat.patch | 53 ++++++++++++++++++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/password-store-gnupg-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index c1b076a5f..b3aa79ad9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -9,6 +9,7 @@ # Copyright © 2016 Adonay "adfeno" Felipe Nogueira # Copyright © 2016, 2017 Ricardo Wurmus # Copyright © 2016 Ben Woodcroft +# Copyright © 2017 Clément Lassieur # # This file is part of GNU Guix. # @@ -806,6 +807,7 @@ dist_patch_DATA = \ %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 811173cae..3f125a011 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2017 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -291,7 +292,8 @@ any X11 window.") name "-" version ".tar.xz")) (sha256 (base32 - "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn")))) + "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn")) + (patches (search-patches "password-store-gnupg-compat.patch")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/password-store-gnupg-compat.patch b/gnu/packages/patches/password-store-gnupg-compat.patch new file mode 100644 index 000000000..c314ba664 --- /dev/null +++ b/gnu/packages/patches/password-store-gnupg-compat.patch @@ -0,0 +1,53 @@ +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=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 + -- 2.12.0 From unknown Sun Jun 22 07:53:48 2025 X-Loop: help-debbugs@gnu.org Subject: bug#26118: [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.1.19. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Mar 2017 17:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 26118 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Cc: 26118@debbugs.gnu.org Received: via spool by 26118-submit@debbugs.gnu.org id=B26118.148968517019486 (code B ref 26118); Thu, 16 Mar 2017 17:27:02 +0000 Received: (at 26118) by debbugs.gnu.org; 16 Mar 2017 17:26:10 +0000 Received: from localhost ([127.0.0.1]:59168 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coZA9-00054E-T1 for submit@debbugs.gnu.org; Thu, 16 Mar 2017 13:26:10 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:45933) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coZA5-000543-G5 for 26118@debbugs.gnu.org; Thu, 16 Mar 2017 13:26:09 -0400 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 295DA20A68; Thu, 16 Mar 2017 13:26:05 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Thu, 16 Mar 2017 13:26:05 -0400 DKIM-Signature: v=1; a=rsa-sha1; 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=GsGaaCp1HBcsMLMukCaX+KoHbJY=; b=zIxwpo 9RQzp38Xr6u7ez1JtbWvF9ry71KO/px/IRgeAWGUcC81J5yZp3o1XjMxd6D7Yje3 xE5JFZU/lZl6VfxrefNfjO2amwLJQK0G2YO0h8zYjIq5ZAvuVzOknfGO+Epd/QdN mmNZyinjK+xTkGz7sngwAWtpKcf5baglgtUeU= DKIM-Signature: v=1; a=rsa-sha1; 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=GsGaaCp1HBcsMLMukC aX+KoHbJY=; b=qE0Stv9KZG2q0+lBmoftVA4vd9YFAH45a98ChFSdDHaPQzhSAl 5s7Aib3aDdAVHTCv0vi7ZqbKHRzyx4XuOFh4bFgCaBb5dkONBIZmXwmx8qf6ifWX 1WuXxrxIaGrdbxqCxH/lb/nvJ+603MI74S0ygvLMC34rfzj3yNxG5nYzFsb/d5zs Haq/0QhNkqZKAqfXnsuEFzW5UV6iaaXq5QfeIqXWlgPsfBNBtTrS3z2j4qf1fD6K 9QzMYpL4d28rLuu6qOJxuCHaJV6DNGOskBQhr211YEB+Z96MFLhp5XDeC2Z7ABVV e7R1DEQ+I/h9EsBTXRPsPY/EJhaCTZcE8yxA== X-ME-Sender: X-Sasl-enc: 5ZzEAY4ahzvlydPH3slFeFcXotR+FpJwXyefoR//nZkr 1489685164 Received: from localhost (c-73-188-17-148.hsd1.pa.comcast.net [73.188.17.148]) by mail.messagingengine.com (Postfix) with ESMTPA id DA67624526; Thu, 16 Mar 2017 13:26:04 -0400 (EDT) Date: Thu, 16 Mar 2017 13:26:02 -0400 From: Leo Famulari Message-ID: <20170316172602.GA14711@jasmine> References: <20170316044722.GA4066@jasmine> <20170316093743.10793-1-clement@lassieur.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="/9DWx/yDrRhgMJTb" Content-Disposition: inline In-Reply-To: <20170316093743.10793-1-clement@lassieur.org> 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 (/) --/9DWx/yDrRhgMJTb Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Mar 16, 2017 at 10:37:43AM +0100, Cl=E9ment Lassieur wrote: > * 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. LGTM, thanks! --/9DWx/yDrRhgMJTb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAljKyqQACgkQJkb6MLrK fwjtQxAAwJMNtlezyJvhIguyU0WPOHQJcI9V07D8M8LvG1ZScuj9V3Qi7OvCXw/6 BXWiOxSgGPyjGS6rFuHKUDZBsmehqYZPICZ42QbuxGdBbQk5bfr+9Dhw9HotfVXR HvXJM7y3R/e0bPY4v/66xOjO+FBW7JN2GQnAlPg6LsbzXKtc0kIUmZFQvGYZyglJ q7WJmtYzF+GHz+224ommFMxIVY0+ZnGuLDq19kw2+jpp5j2fPjbYp85W28Exrm48 IZcMpoTnuX/8nd5PWAZvNz//6WOZoDZk6i5NO94ZPq5KeyRUzy2fmObJRAobD9PL 2vm06MIjFfs8TrYXfwR/glSfOoJzp4M9f38PzorhxXYK+sjlJow2FceVEgtlSvmT x7rxB0+NnGHYAsxPPXysWTFh9XE6CTd2uIzbcUytXqbZSvJyVOyULyc7rAB/RPkC a5i8HqVrhpjNLq5xlIGs9CUZ1n5gTmhgq3mK1XIRt+uC9wWU8tpibLSOCpICNW4K psNs9PzfZSOlt8qCusaWTgsNgXwOkF6VRtmWT5oBFUjl2+jO5VpAVc68r6RA3Lay vcz23G0yyw6UXWZ89y45uR0teP9icNJzwkEeEoe7R9We3VtIWiJHxD0iS+hzxh0e xUSntHhF8l34FfVvzKBihVNkOaq6TadI4VNYzxJQbCYy1VdFzFI= =3Cbf -----END PGP SIGNATURE----- --/9DWx/yDrRhgMJTb-- From unknown Sun Jun 22 07:53:48 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: =?UTF-8?Q?Cl=C3=A9ment?= Lassieur Subject: bug#26118: closed (Re: bug#26118: [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.1.19.) Message-ID: References: <871stxjb8k.fsf@lassieur.org> <20170316004631.25613-1-clement@lassieur.org> X-Gnu-PR-Message: they-closed 26118 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 26118@debbugs.gnu.org Date: Thu, 16 Mar 2017 19:04:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1489691042-3352-1" This is a multi-part message in MIME format... ------------=_1489691042-3352-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #26118: [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.1.19. 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 26118@debbugs.gnu.org. --=20 26118: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D26118 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1489691042-3352-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 26118-done) by debbugs.gnu.org; 16 Mar 2017 19:03:01 +0000 Received: from localhost ([127.0.0.1]:59262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coaft-0000qc-Bt for submit@debbugs.gnu.org; Thu, 16 Mar 2017 15:03:01 -0400 Received: from mail.lassieur.org ([83.152.10.219]:49708) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coafp-0000qN-QB for 26118-done@debbugs.gnu.org; Thu, 16 Mar 2017 15:03:00 -0400 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 4ae0b1d9 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Thu, 16 Mar 2017 19:02:52 +0000 (UTC) References: <20170316044722.GA4066@jasmine> <20170316093743.10793-1-clement@lassieur.org> <20170316172602.GA14711@jasmine> User-agent: mu4e 0.9.18; emacs 25.2.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Leo Famulari Subject: Re: bug#26118: [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.1.19. In-reply-to: <20170316172602.GA14711@jasmine> Date: Thu, 16 Mar 2017 20:02:51 +0100 Message-ID: <871stxjb8k.fsf@lassieur.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 26118-done Cc: 26118-done@debbugs.gnu.org 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 (/) Leo Famulari writes: > On Thu, Mar 16, 2017 at 10:37:43AM +0100, Clément Lassieur wrote: >> * 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. > > LGTM, thanks! Thanks for the review! Pushed as 2c715a922324e0cd1ab50c5ea0b70f12a33565d5. ------------=_1489691042-3352-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 16 Mar 2017 00:47:07 +0000 Received: from localhost ([127.0.0.1]:57713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coJZD-0005UJ-4W for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:47:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55789) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1coJZ7-0005Tr-MX for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:46:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coJZ1-0004kN-7T for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:46:48 -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 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:49451) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coJZ1-0004kG-4c for submit@debbugs.gnu.org; Wed, 15 Mar 2017 20:46:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1coJYz-0003S2-9p for guix-patches@gnu.org; Wed, 15 Mar 2017 20:46:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1coJYv-0004i3-SM for guix-patches@gnu.org; Wed, 15 Mar 2017 20:46:45 -0400 Received: from mail.lassieur.org ([83.152.10.219]:35788 helo=ron) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1coJYv-0004dJ-Fl for guix-patches@gnu.org; Wed, 15 Mar 2017 20:46:41 -0400 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by ron (OpenSMTPD) with ESMTPSA id 2b9042ac (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128:NO) for ; Thu, 16 Mar 2017 00:46:38 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= To: guix-patches@gnu.org Subject: [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.1.19. Date: Thu, 16 Mar 2017 01:46:30 +0100 Message-Id: <20170316004631.25613-1-clement@lassieur.org> X-Mailer: git-send-email 2.12.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: 0.9 (/) X-Debbugs-Envelope-To: submit 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.9 (/) * 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 fixes the tests too. There is a discussion about this patch: https://bugzilla.suse.com/show_bug.cgi?id=1028867. I took the one from Andreas. --- gnu/local.mk | 2 + gnu/packages/password-utils.scm | 4 +- .../patches/password-store-gnupg-compat.patch | 50 ++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/password-store-gnupg-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index c1b076a5f..b3aa79ad9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -9,6 +9,7 @@ # Copyright © 2016 Adonay "adfeno" Felipe Nogueira # Copyright © 2016, 2017 Ricardo Wurmus # Copyright © 2016 Ben Woodcroft +# Copyright © 2017 Clément Lassieur # # This file is part of GNU Guix. # @@ -806,6 +807,7 @@ dist_patch_DATA = \ %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 811173cae..3f125a011 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Leo Famulari +;;; Copyright © 2017 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -291,7 +292,8 @@ any X11 window.") name "-" version ".tar.xz")) (sha256 (base32 - "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn")))) + "002mw7j0m33bw483rllzhcf41wp3ixka8yma6kqrfaj57jyw66hn")) + (patches (search-patches "password-store-gnupg-compat.patch")))) (build-system gnu-build-system) (arguments '(#:phases diff --git a/gnu/packages/patches/password-store-gnupg-compat.patch b/gnu/packages/patches/password-store-gnupg-compat.patch new file mode 100644 index 000000000..972b89033 --- /dev/null +++ b/gnu/packages/patches/password-store-gnupg-compat.patch @@ -0,0 +1,50 @@ +Copied from upstream mailing list: +https://lists.zx2c4.com/pipermail/password-store/2017-March/002844.html. + +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=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 + -- 2.12.0 ------------=_1489691042-3352-1--