X-Loop: help-debbugs@HIDDEN Subject: [bug#73532] [PATCH] gnupg: Also look in .guix-home for pinentry Resent-From: Brennan Vincent <brennan@HIDDEN> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> Resent-CC: guix-patches@HIDDEN Resent-Date: Sat, 28 Sep 2024 20:02:01 +0000 Resent-Message-ID: <handler.73532.B.17275536625283 <at> debbugs.gnu.org> Resent-Sender: help-debbugs@HIDDEN X-GNU-PR-Message: report 73532 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73532 <at> debbugs.gnu.org X-Debbugs-Original-To: guix-patches@HIDDEN Received: via spool by submit <at> 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 <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1sudcj-0001Mu-Kp for submit <at> 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 <brennan@HIDDEN>) id 1sudci-0001MY-Au for submit <at> 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 <brennan@HIDDEN>) id 1sudIN-0002MS-AW for guix-patches@HIDDEN; 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 <brennan@HIDDEN>) id 1sudIL-0005Pv-PX for guix-patches@HIDDEN; 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@HIDDEN X-Fes-Received-From: <brennan@HIDDEN> From: Brennan Vincent <brennan@HIDDEN> X-Envelope-From: c5d794b8a06edf357a524b31aad8534e9aede858 Mon Sep 17 00:00:00 2001 Date: Sat, 28 Sep 2024 15:39:52 -0400 Message-ID: <87plonftyv.fsf@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain X-Fes-Encrypted: true X-Fes-Ehlo-Domain: localhost Received-SPF: pass client-ip=54.203.248.109; envelope-from=brennan@HIDDEN; 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-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.4 (--) 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(-) 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.) */ 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 -- 2.46.0
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: Brennan Vincent <brennan@HIDDEN> Subject: bug#73532: Acknowledgement ([PATCH] gnupg: Also look in .guix-home for pinentry) Message-ID: <handler.73532.B.17275536625283.ack <at> debbugs.gnu.org> References: <87plonftyv.fsf@HIDDEN> X-Gnu-PR-Message: ack 73532 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 73532 <at> debbugs.gnu.org Date: Sat, 28 Sep 2024 20:02:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): guix-patches@HIDDEN If you wish to submit further information on this problem, please send it to 73532 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 73532: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D73532 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.