From patchwork Sat Sep 28 19:39:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brennan Vincent X-Patchwork-Id: 31537 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2F08A27BBE9; Sat, 28 Sep 2024 21:01:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DA3CC27BBE2 for ; Sat, 28 Sep 2024 21:01:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suddG-0004eC-Uf; Sat, 28 Sep 2024 16:01:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suddE-0004dl-FW for guix-patches@gnu.org; Sat, 28 Sep 2024 16:01:32 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suddE-0007kB-6X for guix-patches@gnu.org; Sat, 28 Sep 2024 16:01:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=xsuddjuHB62bWWlFNNgWSfBTGSXVUVr+iqTK1dk0iQc=; b=P84GR+hZyI4CZRIYxWyHYE/d2+7HcgvEI7haPRm0bAJxPdWyk+KRhvsNRgJK/XEzMQcGfAPHzpktekb4zepbvOAPZzcWZXnrPzDsgAFT7OuMOR8t4M11BVDOJFysptbGxIKY5afTeKxODceuf5JqtIkb8GdXWyhdkQo+3o3uSrDJkCpaECK85EzzbEbLn2t+oxTWiRYAddmxQhpT7PUhvRpPv7dbod7gZ9KLhn3Pkel8aZ3GIXjaKs3GNOLsOjRmrEQOk4T359dxERUAN790EYieD0pQE9m/TvAvmIyDoyM8jsWXgAbtdbp7S1pKHWbGvpQX13l8cc7Eia2/h53ilA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suddi-0001S5-0N for guix-patches@gnu.org; Sat, 28 Sep 2024 16:02:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73532] [PATCH] gnupg: Also look in .guix-home for pinentry Resent-From: Brennan Vincent Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 28 Sep 2024 20:02:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 73532 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73532@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17275536625283 (code B ref -1); Sat, 28 Sep 2024 20:02:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Sep 2024 20:01:02 +0000 Received: from localhost ([127.0.0.1]:43264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sudcj-0001Mu-Kp for submit@debbugs.gnu.org; Sat, 28 Sep 2024 16:01:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:50560) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sudci-0001MY-Au for submit@debbugs.gnu.org; Sat, 28 Sep 2024 16:01:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sudIN-0002MS-AW for guix-patches@gnu.org; Sat, 28 Sep 2024 15:39:59 -0400 Received: from smtp.umanwizard.com ([54.203.248.109]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sudIL-0005Pv-PX for guix-patches@gnu.org; Sat, 28 Sep 2024 15:39:59 -0400 Received: from localhost ([108.6.22.48]) by smtp.umanwizard.com ; 28 Sep 2024 19:39:54 +0000 X-Fes-Received-For: guix-patches@gnu.org X-Fes-Received-From: From: Brennan Vincent X-Envelope-From: c5d794b8a06edf357a524b31aad8534e9aede858 Mon Sep 17 00:00:00 2001 Date: Sat, 28 Sep 2024 15:39:52 -0400 Message-ID: <87plonftyv.fsf@denver.mail-host-address-is-not-set> MIME-Version: 1.0 X-Fes-Encrypted: true X-Fes-Ehlo-Domain: localhost Received-SPF: pass client-ip=54.203.248.109; envelope-from=brennan@umanwizard.com; helo=smtp.umanwizard.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches In gnupg-default-pinentry.patch, we patch gpg to search for its pinentry program in ~/.guix-profile/bin by default. guix home users might instead have pinentry in ~/.guix-home/profile/bin , so let's check there too. Change-Id: I85dae19809f6aff504ade9545ebc6f0b83f2f44c --- gnu/packages/patches/gnupg-default-pinentry.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) base-commit: 3ac69c1a757430d6dfdd37eb948ba1d6967967cc prerequisite-patch-id: 190cf537d5350c96a329fe3baf0742cf187308bf prerequisite-patch-id: 5450d7b82e5c1160c9663f21bad4644b51f3ca69 prerequisite-patch-id: c8abc68123e4f2c8fcfa1f2552de097f310b149c prerequisite-patch-id: 47c71d891341ebe65d323b0ecee5e83e99aeb160 prerequisite-patch-id: e7892ac4a66728ede854ff4cd181795012780236 prerequisite-patch-id: 876cfbf9ae3cfda17809f8deb5f86aba523b0015 prerequisite-patch-id: ade24719ac6b2d1f6aab3b6559cdcc76986455cc prerequisite-patch-id: cc25e930146f5169b2a455cafe00a2098b881cca prerequisite-patch-id: de4804fdcb797484990fcb9028884b74d9e81906 prerequisite-patch-id: e3a8892e61c618e1d3920cf988d88554092dd8a8 prerequisite-patch-id: 0cbf33cadd71520efa7cf74cdf2a652a1d480276 prerequisite-patch-id: 82c2dd4e1bd68c72a187b05b7c6364abfd626cdf prerequisite-patch-id: 149f45f15824dfa9984c8294b8baebef349fa58d prerequisite-patch-id: 48ce03bfba28768acd87c048d966cd9d1050260f prerequisite-patch-id: f3fe01a9a135cfa2751df764a052e408e3f45cc5 diff --git a/gnu/packages/patches/gnupg-default-pinentry.patch b/gnu/packages/patches/gnupg-default-pinentry.patch index a8ed613565..f9002d4d6c 100644 --- a/gnu/packages/patches/gnupg-default-pinentry.patch +++ b/gnu/packages/patches/gnupg-default-pinentry.patch @@ -55,11 +55,12 @@ index 4b6e46e88..f7ae68ba5 100644 /* Return whether the home dir is the default one. */ int -@@ -971,6 +995,7 @@ get_default_pinentry_name (int reset) +@@ -971,6 +995,8 @@ get_default_pinentry_name (int reset) } names[] = { /* The first entry is what we return in case we found no other pinentry. */ + { user_homedir, "/.guix-profile/bin/pinentry" }, ++ { user_homedir, "/.guix-home/profile/bin/pinentry" }, { gnupg_bindir, DIRSEP_S "pinentry" EXEEXT_S }, #ifdef HAVE_W32_SYSTEM /* Try Gpg4win directory (with bin and without.) */