Re: [PATCH 6/9] search for a reasonable gpg implementation

diff --git a/ef/c60d3e344533399d34b372b1d2c58a9ea1a607 b/ef/c60d3e344533399d34b372b1d2c58a9ea1a607
new file mode 100644 (file)
index 0000000..4bc17d7
--- /dev/null
+++ b/ef/c60d3e344533399d34b372b1d2c58a9ea1a607
@@ -0,0 +1,82 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id E0FFB6DE13EF\r
+ for <notmuch@notmuchmail.org>; Fri, 11 Dec 2015 13:56:36 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.701\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.701 tagged_above=-999 required=5 tests=[AWL=0.049, \r
+ SPF_NEUTRAL=0.652] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id XTPuJ8wl0_OB for <notmuch@notmuchmail.org>;\r
+ Fri, 11 Dec 2015 13:56:35 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 320666DE005F\r
+ for <notmuch@notmuchmail.org>; Fri, 11 Dec 2015 13:56:35 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id CBB5D1000FB;\r
+ Fri, 11 Dec 2015 23:56:45 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,\r
+ Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: Re: [PATCH 6/9] search for a reasonable gpg implementation\r
+In-Reply-To: <1449718786-28000-7-git-send-email-dkg@fifthhorseman.net>\r
+References: <1449718786-28000-1-git-send-email-dkg@fifthhorseman.net>\r
+ <1449718786-28000-7-git-send-email-dkg@fifthhorseman.net>\r
+User-Agent: Notmuch/0.21+32~g73439f8 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Fri, 11 Dec 2015 23:56:45 +0200\r
+Message-ID: <m24mfo7ioy.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 11 Dec 2015 21:56:37 -0000\r
+\r
+On Thu, Dec 10 2015, Daniel Kahn Gillmor <dkg@fifthhorseman.net> wrote:\r
+\r
+> When the notmuch database needs to find gpg, have it search reasonable\r
+> paths first.\r
+> ---\r
+>  lib/database.cc | 13 ++++++++++++-\r
+>  1 file changed, 12 insertions(+), 1 deletion(-)\r
+>\r
+> diff --git a/lib/database.cc b/lib/database.cc\r
+> index 62bc6d9..d0e8800 100644\r
+> --- a/lib/database.cc\r
+> +++ b/lib/database.cc\r
+> @@ -2393,6 +2393,17 @@ _notmuch_database_link_message (notmuch_database_t *notmuch,\r
+>      return status;\r
+>  }\r
+>  \r
+> +static const char*\r
+> +_notmuch_database_get_gpg_path (notmuch_database_t *notmuch)\r
+> +{\r
+> +#define try_gpg_path(z) if (!access(z, X_OK)) return z\r
+> +    try_gpg_path("/usr/bin/gpg2");\r
+> +    try_gpg_path("/bin/gpg2");\r
+> +    try_gpg_path("/usr/bin/gpg");\r
+> +    try_gpg_path("/bin/gpg");\r
+> +    return NULL;\r
+> +}\r
+\r
+If this were to survive longer, BSD folks would like to have /usr/local/bin checked...\r
+(i don't know (yet) about os x\r
+\r