Re: notmuch-mutt BSD compatibility

diff --git a/27/a99431cf723008faa4bd6f910d5c850ddc1d42 b/27/a99431cf723008faa4bd6f910d5c850ddc1d42
new file mode 100644 (file)
index 0000000..f315df8
--- /dev/null
+++ b/27/a99431cf723008faa4bd6f910d5c850ddc1d42
@@ -0,0 +1,153 @@
+Return-Path: <zack@upsilon.cc>\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 E13C46DE0274\r
+ for <notmuch@notmuchmail.org>; Fri,  1 May 2015 01:44:45 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.953\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.953 tagged_above=-999 required=5 tests=[AWL=1.605, \r
+ DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ RP_MATCHES_RCVD=-0.55, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001]\r
+ 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 IbhFdylCGlmg for <notmuch@notmuchmail.org>;\r
+ Fri,  1 May 2015 01:44:43 -0700 (PDT)\r
+X-Greylist: delayed 495 seconds by postgrey-1.35 at arlo;\r
+ Fri, 01 May 2015 01:44:42 PDT\r
+Received: from upsilon.cc (upsilon.cc [178.32.142.91])\r
+ by arlo.cworth.org (Postfix) with ESMTP id A07056DE0140\r
+ for <notmuch@notmuchmail.org>; Fri,  1 May 2015 01:44:42 -0700 (PDT)\r
+Received: from timira.takhisis.invalid (unknown [78.194.69.54])\r
+ by upsilon.cc (Postfix) with ESMTPSA id 588921018C;\r
+ Fri,  1 May 2015 10:36:24 +0200 (CEST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=upsilon.cc; s=mail;\r
+ t=1430469384; bh=agfY/KhuKg2+3WU3t5rQ2gzM2dc93QAMep/X3Ke4mtE=;\r
+ h=Date:From:To:Cc:Subject:References:In-Reply-To:From;\r
+ b=XHHIS1Pm3Nv2Rzj0y3dA+21dyIQEn4JQqWwSp4V1XVH1jKjYUU6L3VLrBMVIZGUXn\r
+ AdXkBxqfDY5dm8Sn7Un6CcQdBVQfcKOQT8l8A5uhP31P002NTqnsNuWgTfA560vkp0\r
+ Rg329gZlRKBHJpNJeyFZ5AWIpTjl0nX7MYytgjok=\r
+Received: by timira.takhisis.invalid (Postfix, from userid 1000)\r
+ id 08E8D60131; Fri,  1 May 2015 10:36:24 +0200 (CEST)\r
+Date: Fri, 1 May 2015 10:36:24 +0200\r
+From: Stefano Zacchiroli <zack@upsilon.cc>\r
+To: Jack Peirce <JPeirce@sourcecode.com>\r
+Subject: Re: notmuch-mutt BSD compatibility\r
+Message-ID: <20150501083623.GA6796@upsilon.cc>\r
+References: <20150501052438.GA19579@ganesh.Home>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; micalg=pgp-sha256;\r
+ protocol="application/pgp-signature"; boundary="MW5yreqqjyrRcusr"\r
+Content-Disposition: inline\r
+In-Reply-To: <20150501052438.GA19579@ganesh.Home>\r
+User-Agent: Mutt/1.5.23 (2014-03-12)\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: Fri, 01 May 2015 08:44:46 -0000\r
+\r
+\r
+--MW5yreqqjyrRcusr\r
+Content-Type: multipart/mixed; boundary="3V7upXqbjpZ4EhLz"\r
+Content-Disposition: inline\r
+\r
+\r
+--3V7upXqbjpZ4EhLz\r
+Content-Type: text/plain; charset=iso-8859-1\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: quoted-printable\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
+Cheers.\r
+--=20\r
+Stefano Zacchiroli  . . . . . . .  zack@upsilon.cc . . . . o . . . o . o\r
+Ma=EEtre de conf=E9rences . . . . . http://upsilon.cc/zack . . . o . . . o o\r
+Former Debian Project Leader  . . @zack on identi.ca . . o o o . . . o .\r
+=AB the first rule of tautology club is the first rule of tautology club =BB\r
+\r
+--3V7upXqbjpZ4EhLz\r
+Content-Type: text/x-diff; charset=us-ascii\r
+Content-Disposition: attachment; filename="0001-notmuch-mutt-fix-xargs-ln-usage-for-OpenBSD-compatib.patch"\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+=46rom 8641b7bc815d3a50a25069018faeb773b30499f2 Mon Sep 17 00:00:00 2001\r
+=46rom: 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 compatibility\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/notmu=\r
+ch-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\r
+ sub prompt($$) {\r
+--=20\r
+2.1.4\r
+\r
+\r
+--3V7upXqbjpZ4EhLz--\r
+\r
+--MW5yreqqjyrRcusr\r
+Content-Type: application/pgp-signature; name="signature.asc"\r
+Content-Description: Digital signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1\r
+\r
+iQIVAwUBVUM7B5wxUDxthmOWAQhK8g//cjDelVZDI/N+eXBcVsTm6lAzfZkqOCeV\r
+20s8rPvdShvNZmT3P1w9JZu5waOZAzW2w3pP85PSiiO6KVmtaJespfrMBjgfrW3F\r
+AsrEMtpYvmsAvITrho5oHngoVDKOMezS6p3JkeqvGR3+sabABm5/sqVkdMKVRaJD\r
+ahcTOqwi5UYecPGizkk0tvR1jRwsuLt8EuRootc6CH2S88Y+4yoEwSZE1BbylUUM\r
+d3Y1x1hlB6hiezOTaf48YPP6qS1b5Zc9FS0J6zZaQmekurvm+S47OahB4Dyj9Pa2\r
+19wu1UHEAqit+ImEkkbSS/xt99HGHnjNZJJAFvJwhAyh1kZ/sHvXHLsAxnsl6Et1\r
+/yZzSNDDo3YqvMlILS6CyqIzdkPmQYoLxW9+aIDTfhQntCDwvd1qOsHuaqs5MBNG\r
+G1wF1sA6/POGV8iTS9Mr3p99ChArYTlRDLz9AIZ8Elb60/QmmhUnwFg3940q8030\r
+DqLqMNUweK948muVW/Nh+irRY6XEZl48JSTqNdWR0dRytpoaBKPR/l4I9E/AhVK8\r
+g/d0JPJ+KNeW4Qk+n08TnFDd94PU3asreGcUtN0YUJLcBWjTl/F5Nt6SGnTK8ZRP\r
+ZhLZ2C1OcZnJCybfitehwA4aCxRe5eEYY42y9YKuUhDntYAxK29ARDdXTtGh2TL5\r
+aLXtW1WMXfg=\r
+=AYZr\r
+-----END PGP SIGNATURE-----\r
+\r
+--MW5yreqqjyrRcusr--\r