Re: notmuch-mutt BSD compatibility

diff --git a/39/e2f4658d1c7c72f71563daa4f21b5bda87f349 b/39/e2f4658d1c7c72f71563daa4f21b5bda87f349
new file mode 100644 (file)
index 0000000..94a3b2d
--- /dev/null
+++ b/39/e2f4658d1c7c72f71563daa4f21b5bda87f349
@@ -0,0 +1,116 @@
+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 069556DE0B22\r
+ for <notmuch@notmuchmail.org>; Sat,  2 May 2015 01:37:33 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 1.107\r
+X-Spam-Level: *\r
+X-Spam-Status: No, score=1.107 tagged_above=-999 required=5 tests=[AWL=0.455, \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 AoJF-Cq4mmrb for <notmuch@notmuchmail.org>;\r
+ Sat,  2 May 2015 01:37:30 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 5F2A16DE09ED\r
+ for <notmuch@notmuchmail.org>; Sat,  2 May 2015 01:37:29 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id ACDFC10005A;\r
+ Sat,  2 May 2015 11:37:03 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Stefano Zacchiroli <zack@upsilon.cc>, Jack Peirce <JPeirce@sourcecode.com>\r
+Subject: Re: notmuch-mutt BSD compatibility\r
+In-Reply-To: <20150501083623.GA6796@upsilon.cc>\r
+References: <20150501052438.GA19579@ganesh.Home>\r
+ <20150501083623.GA6796@upsilon.cc>\r
+User-Agent: Notmuch/0.19+109~ge80275e (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: Sat, 02 May 2015 11:37:02 +0300\r
+Message-ID: <m2pp6j74up.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Transfer-Encoding: quoted-printable\r
+Cc: "notmuch@notmuchmail.org" <notmuch@notmuchmail.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 02 May 2015 08:37:33 -0000\r
+\r
+On Fri, May 01 2015, Stefano Zacchiroli <zack@upsilon.cc> wrote:\r
+\r
+> On Fri, May 01, 2015 at 05:24:39AM +0000, Jack Peirce wrote:\r
+>> Some of the flags used in the notmuch-mutt script included in the\r
+>> contrib directory are not supported by the OpenBSD implementation of\r
+>> ln and xargs.\r
+>\r
+> I wasn't aware of that, so thanks for spotting it and for your patch.\r
+>\r
+> The patch looks good to me. I've also tested on my GNU/Linux machine and\r
+> it works fine.\r
+>\r
+> David, please consider the attached (format-)patch for inclusion into\r
+> the upcoming release of Notmuch.\r
+\r
+This change LGTM.\r
+\r
+Tomi\r
+\r
+>\r
+> Cheers.\r
+> --=20\r
+> Stefano Zacchiroli  . . . . . . .  zack@upsilon.cc . . . . o . . . o . o\r
+> Ma=C3=AEtre de conf=C3=A9rences . . . . . http://upsilon.cc/zack . . . o =\r
+. . . o o\r
+> Former Debian Project Leader  . . @zack on identi.ca . . o o o . . . o .\r
+> =C2=AB the first rule of tautology club is the first rule of tautology cl=\r
+ub =C2=BB\r
+> From 8641b7bc815d3a50a25069018faeb773b30499f2 Mon Sep 17 00:00:00 2001\r
+> From: Jack Peirce <JPeirce@sourcecode.com>\r
+> Date: Fri, 1 May 2015 10:32:05 +0200\r
+> Subject: [PATCH] notmuch-mutt: fix xargs/ln usage for OpenBSD compatibili=\r
+ty\r
+>\r
+> - xargs: use -r flag instead of --no-run-if-empty\r
+> - ln: use -I flag/3rd form of ln command instead of -t flag/4th form\r
+>\r
+> Signed-off-by: Stefano Zacchiroli <zack@upsilon.cc>\r
+> ---\r
+>  contrib/notmuch-mutt/notmuch-mutt | 2 +-\r
+>  1 file changed, 1 insertion(+), 1 deletion(-)\r
+>\r
+> diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/not=\r
+much-mutt\r
+> index 126cbf4..b47b365 100755\r
+> --- a/contrib/notmuch-mutt/notmuch-mutt\r
+> +++ b/contrib/notmuch-mutt/notmuch-mutt\r
+> @@ -50,7 +50,7 @@ sub search($$$) {\r
+>      empty_maildir($maildir);\r
+>      system("notmuch search --output=3Dfiles $dup_option $query"\r
+>         . " | sed -e 's: :\\\\ :g'"\r
+> -       . " | xargs --no-run-if-empty ln -s -t $maildir/cur/");\r
+> +       . " | xargs -r -I searchoutput ln -s searchoutput $maildir/cur/");\r
+>  }\r
+>=20=20\r
+>  sub prompt($$) {\r
+> --=20\r
+> 2.1.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r