notmuch-mutt BSD compatibility

diff --git a/3a/becacfc127e27e16524c1c1eb6c6aabdb8199c b/3a/becacfc127e27e16524c1c1eb6c6aabdb8199c
new file mode 100644 (file)
index 0000000..bb25270
--- /dev/null
+++ b/3a/becacfc127e27e16524c1c1eb6c6aabdb8199c
@@ -0,0 +1,126 @@
+Return-Path: <jpeirce@sourcecode.com>\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 B88736DE0274\r
+ for <notmuch@notmuchmail.org>; Thu, 30 Apr 2015 22:33:12 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.32\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.32 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=-0.01,\r
+ RCVD_IN_MSPIKE_WL=-0.01] 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 IIsO4zYV7ze1 for <notmuch@notmuchmail.org>;\r
+ Thu, 30 Apr 2015 22:33:10 -0700 (PDT)\r
+X-Greylist: delayed 507 seconds by postgrey-1.35 at arlo;\r
+ Thu, 30 Apr 2015 22:33:10 PDT\r
+Received: from p01c12o148.mxlogic.net (p01c12o148.mxlogic.net [208.65.145.71])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 58D326DE0140\r
+ for <notmuch@notmuchmail.org>; Thu, 30 Apr 2015 22:33:10 -0700 (PDT)\r
+Received: from unknown [68.171.131.38] (EHLO mail.integratedit.com)\r
+ by p01c12o148.mxlogic.net(mxl_mta-8.3.0-3) with ESMTP id\r
+ 61013455.2ae630833940.602477.00-520.1689378.p01c12o148.mxlogic.net\r
+ (envelope-from <jpeirce@sourcecode.com>); \r
+ Thu, 30 Apr 2015 23:33:10 -0600 (MDT)\r
+X-MXL-Hash: 554310162e9ed5af-94f2f47120a45c34bbbc3e286ba30a32983a8965\r
+Received: from unknown [68.171.131.38] (EHLO mail.integratedit.com)\r
+ by p01c12o148.mxlogic.net(mxl_mta-8.3.0-3) over TLS secured channel\r
+ with ESMTP id 81e03455.0.600332.00-316.1684080.p01c12o148.mxlogic.net\r
+ (envelope-from <jpeirce@sourcecode.com>); \r
+ Thu, 30 Apr 2015 23:24:43 -0600 (MDT)\r
+X-MXL-Hash: 55430e1b71e0620c-1fab910d50ddb2f1a36d3dd8d5d809cd16f08cb0\r
+Received: from EX2013-MBX1.sccit.local (10.12.0.86) by EX2013-MBX1.sccit.local\r
+ (10.12.0.86) with Microsoft SMTP Server (TLS) id 15.0.1044.25;\r
+ Fri, 1 May 2015 01:24:39 -0400\r
+Received: from EX2013-MBX1.sccit.local ([fe80::19ca:a7a:1d08:52fc]) by\r
+ EX2013-MBX1.sccit.local ([fe80::19ca:a7a:1d08:52fc%12]) with mapi id\r
+ 15.00.1044.021; Fri, 1 May 2015 01:24:39 -0400\r
+From: Jack Peirce <JPeirce@sourcecode.com>\r
+To: "notmuch@notmuchmail.org" <notmuch@notmuchmail.org>, "zack@upsilon.cc"\r
+ <zack@upsilon.cc>\r
+Subject: notmuch-mutt BSD compatibility\r
+Thread-Topic: notmuch-mutt BSD compatibility\r
+Thread-Index: AQHQg88e2KfCLnectkmkzsWdHa7PDA==\r
+Date: Fri, 1 May 2015 05:24:39 +0000\r
+Message-ID: <20150501052438.GA19579@ganesh.Home>\r
+Accept-Language: en-US\r
+Content-Language: en-US\r
+X-MS-Has-Attach: yes\r
+X-MS-TNEF-Correlator: \r
+user-agent: Mutt/1.5.23 (2014-03-12)\r
+x-ms-exchange-transport-fromentityheader: Hosted\r
+x-originating-ip: [75.173.206.93]\r
+Content-Type: multipart/mixed;\r
+ boundary="_002_20150501052438GA19579ganeshHome_"\r
+MIME-Version: 1.0\r
+X-AnalysisOut: [v=2.1 cv=GIAcE49K c=1 sm=1 tr=0 a=k3ozxfCZ6Te1Qy+CTAksdQ==]\r
+X-AnalysisOut: [:117 a=k3ozxfCZ6Te1Qy+CTAksdQ==:17 a=J0QyKEt1u0cA:10 a=8Ym]\r
+X-AnalysisOut: [bmHezmF4A:10 a=BLceEmwcHowA:10 a=xqWC_Br6kY4A:10 a=bF8Fxcv]\r
+X-AnalysisOut: [1AAAA:8 a=Qb9iURxgAAAA:8 a=YlVTAMxIAAAA:8 a=e9J7MTPGsLIA:1]\r
+X-AnalysisOut: [0 a=w20EZVz_QilbtmMhRTwA:9 a=CjuIK1q_8ugA:10 a=CpT0RT4WRCN]\r
+X-AnalysisOut: [CME0QNTsA:9]\r
+X-Spam: [F=0.5000000000; CM=0.500; MH=0.500(2015043020); S=0.200(2014051901)]\r
+X-MAIL-FROM: <jpeirce@sourcecode.com>\r
+X-SOURCE-IP: [68.171.131.38]\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 05:33:12 -0000\r
+\r
+--_002_20150501052438GA19579ganeshHome_\r
+Content-Type: text/plain; charset="us-ascii"\r
+Content-ID: <F179D956C282A74CB391BF3FF5C7232D@integratedit.com>\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+Some of the flags used in the notmuch-mutt script included in the=20\r
+contrib directory are not supported by the OpenBSD implementation of=20\r
+ln and xargs.=20\r
+\r
+Please consider this patch which rearranges the arguments to use flags=20\r
+compatible with both Linux and BSD implementations of ln/xargs.\r
+\r
+Do note that I do not have the ability to test this under Linux right=20\r
+now, but I am relatively confident everything should still work fine=20\r
+as long as the man pages are correct.\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
+Thanks,\r
+Jack\r
+\r
+\r
+\r
+--_002_20150501052438GA19579ganeshHome_\r
+Content-Type: text/plain; name="notmuch-mutt-bsd-compat.patch"\r
+Content-Description: notmuch-mutt-bsd-compat.patch\r
+Content-Disposition: attachment; filename="notmuch-mutt-bsd-compat.patch";\r
+       size=532; creation-date="Fri, 01 May 2015 05:24:38 GMT";\r
+       modification-date="Fri, 01 May 2015 05:24:38 GMT"\r
+Content-ID: <F5FB966A335B6944AFC36E04367A3EAF@integratedit.com>\r
+Content-Transfer-Encoding: base64\r
+\r
+ZGlmZiAtdU5yIG9sZC9jb250cmliL25vdG11Y2gtbXV0dC9ub3RtdWNoLW11dHQgbmV3L2NvbnRy\r
+aWIvbm90bXVjaC1tdXR0L25vdG11Y2gtbXV0dA0KLS0tIG9sZC9jb250cmliL25vdG11Y2gtbXV0\r
+dC9ub3RtdWNoLW11dHQJVGh1IEFwciAzMCAyMzowODo1MCAyMDE1DQorKysgbmV3L2NvbnRyaWIv\r
+bm90bXVjaC1tdXR0L25vdG11Y2gtbXV0dAlUaHUgQXByIDMwIDIzOjEwOjIxIDIwMTUNCkBAIC01\r
+MCw3ICs1MCw3IEBADQogICAgIGVtcHR5X21haWxkaXIoJG1haWxkaXIpOw0KICAgICBzeXN0ZW0o\r
+Im5vdG11Y2ggc2VhcmNoIC0tb3V0cHV0PWZpbGVzICRkdXBfb3B0aW9uICRxdWVyeSINCiAJICAg\r
+LiAiIHwgc2VkIC1lICdzOiA6XFxcXCA6ZyciDQotCSAgIC4gIiB8IHhhcmdzIC0tbm8tcnVuLWlm\r
+LWVtcHR5IGxuIC1zIC10ICRtYWlsZGlyL2N1ci8iKTsNCisJICAgLiAiIHwgeGFyZ3MgLXIgLUkg\r
+c2VhcmNob3V0cHV0IGxuIC1zIHNlYXJjaG91dHB1dCAkbWFpbGRpci9jdXIvIik7DQogfQ0KIA0K\r
+IHN1YiBwcm9tcHQoJCQpIHsNCg==\r
+\r
+--_002_20150501052438GA19579ganeshHome_--\r