From 6009a90878a4981f9a7fbe727284fbb0b2960b36 Mon Sep 17 00:00:00 2001
From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Fri, 11 Dec 2015 23:56:45 +0200
Subject: [PATCH] Re: [PATCH 6/9] search for a reasonable gpg implementation

---
 ef/c60d3e344533399d34b372b1d2c58a9ea1a607 | 82 +++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 ef/c60d3e344533399d34b372b1d2c58a9ea1a607

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