From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 06:53:10 2018 Received: (at submit) by debbugs.gnu.org; 24 Feb 2018 11:53:10 +0000 Received: from localhost ([127.0.0.1]:58233 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epYNy-0004V3-MY for submit@debbugs.gnu.org; Sat, 24 Feb 2018 06:53:10 -0500 Received: from eggs.gnu.org ([208.118.235.92]:50833) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epYNq-0004UQ-T9 for submit@debbugs.gnu.org; Sat, 24 Feb 2018 06:53:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epYNk-0007ra-AI for submit@debbugs.gnu.org; Sat, 24 Feb 2018 06:52:49 -0500 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]:37134) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epYNk-0007r2-5Z for submit@debbugs.gnu.org; Sat, 24 Feb 2018 06:52:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41800) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1epYNi-0001It-Dh for guix-patches@gnu.org; Sat, 24 Feb 2018 06:52:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1epYNe-0007eQ-Kb for guix-patches@gnu.org; Sat, 24 Feb 2018 06:52:46 -0500 Received: from mail.lassieur.org ([83.152.10.219]:54332) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1epYNe-0007Yd-Bw for guix-patches@gnu.org; Sat, 24 Feb 2018 06:52:42 -0500 Received: from localhost.localdomain (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id 2e95974e (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for ; Sat, 24 Feb 2018 11:52:39 +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.2.5. Date: Sat, 24 Feb 2018 12:51:39 +0100 Message-Id: <20180224115139.15198-1-clement@lassieur.org> X-Mailer: git-send-email 2.16.2 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. --- gnu/local.mk | 3 ++- gnu/packages/password-utils.scm | 5 ++-- .../patches/password-store-gnupg-compat.patch | 28 ++++++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/password-store-gnupg-compat.patch diff --git a/gnu/local.mk b/gnu/local.mk index 287625526..ddc38e7a7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -13,7 +13,7 @@ # Copyright © 2016, 2017 Efraim Flashner # Copyright © 2016, 2017 Jan Nieuwenhuizen # Copyright © 2017 Tobias Geerinckx-Rice -# Copyright © 2017 Clément Lassieur +# Copyright © 2017, 2018 Clément Lassieur # Copyright © 2017 Mathieu Othacehe # Copyright © 2017 Gábor Boskovits # Copyright © 2018 Amirouche Boubekki @@ -958,6 +958,7 @@ dist_patch_DATA = \ %D%/packages/patches/p7zip-CVE-2016-9296.patch \ %D%/packages/patches/p7zip-CVE-2017-17969.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 67e9379f8..f83c05a25 100644 --- a/gnu/packages/password-utils.scm +++ b/gnu/packages/password-utils.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2016 Lukas Gradl ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2017 Leo Famulari -;;; Copyright © 2017 Clément Lassieur +;;; Copyright © 2017, 2018 Clément Lassieur ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2017 Jelle Licht ;;; Copyright © 2017 Eric Bavier @@ -342,7 +342,8 @@ any X11 window.") name "-" version ".tar.xz")) (sha256 (base32 - "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn")))) + "0scqkpll2q8jhzcgcsh9kqz0gwdpvynivqjmmbzax2irjfaiklpn")) + (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..75c636202 --- /dev/null +++ b/gnu/packages/patches/password-store-gnupg-compat.patch @@ -0,0 +1,28 @@ +Copied from upstream mailing list: +https://lists.zx2c4.com/pipermail/password-store/2018-February/003216.html. + +From 9b0c86159d754cc88dd3642564eed527153dfb7f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= +Date: Sat, 24 Feb 2018 12:05:46 +0100 +Subject: [PATCH] tests: fix compatibility with GnuPG 2.2.5 + +--- + tests/t0300-reencryption.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/t0300-reencryption.sh b/tests/t0300-reencryption.sh +index 6d5811d..6d15364 100755 +--- a/tests/t0300-reencryption.sh ++++ b/tests/t0300-reencryption.sh +@@ -10,7 +10,7 @@ canonicalize_gpg_keys() { + $GPG --list-keys --with-colons "$@" | sed -n 's/sub:[^:]*:[^:]*:[^:]*:\([^:]*\):[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[a-zA-Z]*e[a-zA-Z]*:.*/\1/p' | LC_ALL=C sort -u + } + gpg_keys_from_encrypted_file() { +- $GPG -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$1" 2>&1 | cut -d ' ' -f 5 | LC_ALL=C sort -u ++ $GPG -v --no-secmem-warning --no-permission-warning --decrypt --list-only --keyid-format long "$1" 2>&1 | grep "public key is" | cut -d ' ' -f 5 | LC_ALL=C sort -u + } + gpg_keys_from_group() { + local output="$($GPG --list-config --with-colons | sed -n "s/^cfg:group:$1:\\(.*\\)/\\1/p" | head -n 1)" +-- +2.16.2 + -- 2.16.2 From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 10:20:49 2018 Received: (at 30593) by debbugs.gnu.org; 24 Feb 2018 15:20:49 +0000 Received: from localhost ([127.0.0.1]:58856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epbd3-0004qE-55 for submit@debbugs.gnu.org; Sat, 24 Feb 2018 10:20:49 -0500 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:35523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epbd0-0004q3-5p for 30593@debbugs.gnu.org; Sat, 24 Feb 2018 10:20:48 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 0D65721304; Sat, 24 Feb 2018 10:20:46 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Sat, 24 Feb 2018 10:20:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.com; h= content-type:date:from:in-reply-to:message-id:mime-version :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=+U5N3ErMR0PpHaQ9IbxjODf/+njVMEuubs2q2YHMrUw=; b=n7O7Ligu WkfKyP4cjO669hsjRfD4wFcpRFKhQ+Alk9AJSW8BmI0SP3iA2owT5PlduJvIBf1k AlZOzZa0weh6EM+E6r1m5aTMBhTGfupEZZk1MFZ9KZq/rsoIVPeUsv7G6BzzCnJh wY7lWYUpDKDqeVaqFSyAb66ivCIxl0H9aVYSfZu3OH74PEL2qXwjJSt0PHHSyNIT LMoLP/KrMuac8ehV3pGH2DUMVkRRQDmuWkh4yWUZNHLgftQF3eZydzkdT8hZ/coC WjbJeMlQGWHS02kvSRL8TVRbMoqEvYX9xdLT5Uakrydho7fnePF0KNivIV7EOZff qL4r2ro6lqZAXA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=+U5N3ErMR0PpHaQ9IbxjODf/+njVM Euubs2q2YHMrUw=; b=aCFVhwB4jy5tuDPNNz5rsRNSs4UKWTuncmWz6aeeNxXRg 62a8wjW3i1x5XW7MmXYmCi/UAhHF5tBXMw/BU70Xcop80CwcoimbtSGs+L0VRXsh W/TaH3nKBSTU3Q7GvX7xtfdHmNIQBlk6Bzllutd7jXRTCN/3BaqDeTY38c1TymOA YlwKmu9f5nybq7B91GOfz4V7ESPyw6VKwu63kDUrjb3E+GGUrjIoDIowNQzdOp+6 GiNFLTS7F7+S6ewVsvl2nbuBUuFZkpTfvwj40nxbNXwXq/cgoJGbfQi9cuUSZ8VE KHwmIt8g45S6aLx1HA2Kt49Z/KyRBC4KQi16xktIg== X-ME-Sender: Received: from localhost (cm-84.214.173.174.getinternet.no [84.214.173.174]) by mail.messagingengine.com (Postfix) with ESMTPA id 94DBE24313; Sat, 24 Feb 2018 10:20:45 -0500 (EST) From: Marius Bakke To: =?utf-8?Q?Cl=C3=A9ment?= Lassieur , 30593@debbugs.gnu.org Subject: Re: [bug#30593] [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.2.5. In-Reply-To: <20180224115139.15198-1-clement@lassieur.org> References: <20180224115139.15198-1-clement@lassieur.org> User-Agent: Notmuch/0.26 (https://notmuchmail.org) Emacs/25.3.1 (x86_64-pc-linux-gnu) Date: Sat, 24 Feb 2018 16:20:44 +0100 Message-ID: <87woz28ldf.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 30593 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 (/) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cl=C3=A9ment Lassieur writes: > * 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! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAlqRgswACgkQoqBt8qM6 VPqZ/gf7Bmn2jo3LnxO7vRy5yC/AzrrU68FKEWtswX/0Iuda75RkJZsLWukJ47BP vWnxTqJauSF1gOTTFDN8J/0357wv/CQLswBEE+WFdyg4IyQKiJIxMrWBLoi9uO+t n3oYbKk5dIqoIOFdLznoafS+oSxf1gZITRbIhBdubZwpB3sNjtKxRNFtySK5fvZB xo62Ai609q1h6YuFi3e+IJ0SAY4JNPJ9Ajt+xaijPc8dTmbBYSFND885TxlterPe 14wruoQysg7E7xW5xl2bo4lV5i1iStD5kwYag8FuAJWNhdH6rKCZ+waHSkUSc1cX S6IA1nV8YEAaUgs0ofSsiZAxL9XsHg== =ZZhg -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Feb 24 10:29:07 2018 Received: (at 30593-done) by debbugs.gnu.org; 24 Feb 2018 15:29:07 +0000 Received: from localhost ([127.0.0.1]:58860 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epbl5-00052L-0v for submit@debbugs.gnu.org; Sat, 24 Feb 2018 10:29:07 -0500 Received: from mail.lassieur.org ([83.152.10.219]:53884) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1epbl0-000523-VR for 30593-done@debbugs.gnu.org; Sat, 24 Feb 2018 10:29:05 -0500 Received: from rodion (88.191.118.83 [88.191.118.83]) by mail.lassieur.org (OpenSMTPD) with ESMTPSA id b048f730 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO); Sat, 24 Feb 2018 15:28:58 +0000 (UTC) References: <20180224115139.15198-1-clement@lassieur.org> <87woz28ldf.fsf@fastmail.com> User-agent: mu4e 1.0; emacs 25.3.1 From: =?utf-8?Q?Cl=C3=A9ment?= Lassieur To: Marius Bakke Subject: Re: [bug#30593] [PATCH] gnu: password-store: Fix compatibility with GnuPG 2.2.5. In-reply-to: <87woz28ldf.fsf@fastmail.com> Date: Sat, 24 Feb 2018 16:28:57 +0100 Message-ID: <87o9ke4dae.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: 30593-done Cc: 30593-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 (/) Marius Bakke writes: > Clément Lassieur writes: > >> * 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! Pushed, thank you for reviewing! From unknown Fri Sep 05 11:02:29 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 25 Mar 2018 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator