From 651ef7cc829aed8e7bc3846b4c3afb1a0afa9f54 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Fri, 1 May 2015 10:36:24 +0200 Subject: [PATCH] Re: notmuch-mutt BSD compatibility --- 27/a99431cf723008faa4bd6f910d5c850ddc1d42 | 153 ++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 27/a99431cf723008faa4bd6f910d5c850ddc1d42 diff --git a/27/a99431cf723008faa4bd6f910d5c850ddc1d42 b/27/a99431cf723008faa4bd6f910d5c850ddc1d42 new file mode 100644 index 000000000..f315df82d --- /dev/null +++ b/27/a99431cf723008faa4bd6f910d5c850ddc1d42 @@ -0,0 +1,153 @@ +Return-Path: +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 E13C46DE0274 + for ; Fri, 1 May 2015 01:44:45 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.953 +X-Spam-Level: +X-Spam-Status: No, score=0.953 tagged_above=-999 required=5 tests=[AWL=1.605, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + RP_MATCHES_RCVD=-0.55, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001] + 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 IbhFdylCGlmg for ; + Fri, 1 May 2015 01:44:43 -0700 (PDT) +X-Greylist: delayed 495 seconds by postgrey-1.35 at arlo; + Fri, 01 May 2015 01:44:42 PDT +Received: from upsilon.cc (upsilon.cc [178.32.142.91]) + by arlo.cworth.org (Postfix) with ESMTP id A07056DE0140 + for ; Fri, 1 May 2015 01:44:42 -0700 (PDT) +Received: from timira.takhisis.invalid (unknown [78.194.69.54]) + by upsilon.cc (Postfix) with ESMTPSA id 588921018C; + Fri, 1 May 2015 10:36:24 +0200 (CEST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=upsilon.cc; s=mail; + t=1430469384; bh=agfY/KhuKg2+3WU3t5rQ2gzM2dc93QAMep/X3Ke4mtE=; + h=Date:From:To:Cc:Subject:References:In-Reply-To:From; + b=XHHIS1Pm3Nv2Rzj0y3dA+21dyIQEn4JQqWwSp4V1XVH1jKjYUU6L3VLrBMVIZGUXn + AdXkBxqfDY5dm8Sn7Un6CcQdBVQfcKOQT8l8A5uhP31P002NTqnsNuWgTfA560vkp0 + Rg329gZlRKBHJpNJeyFZ5AWIpTjl0nX7MYytgjok= +Received: by timira.takhisis.invalid (Postfix, from userid 1000) + id 08E8D60131; Fri, 1 May 2015 10:36:24 +0200 (CEST) +Date: Fri, 1 May 2015 10:36:24 +0200 +From: Stefano Zacchiroli +To: Jack Peirce +Subject: Re: notmuch-mutt BSD compatibility +Message-ID: <20150501083623.GA6796@upsilon.cc> +References: <20150501052438.GA19579@ganesh.Home> +MIME-Version: 1.0 +Content-Type: multipart/signed; micalg=pgp-sha256; + protocol="application/pgp-signature"; boundary="MW5yreqqjyrRcusr" +Content-Disposition: inline +In-Reply-To: <20150501052438.GA19579@ganesh.Home> +User-Agent: Mutt/1.5.23 (2014-03-12) +Cc: "notmuch@notmuchmail.org" +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Fri, 01 May 2015 08:44:46 -0000 + + +--MW5yreqqjyrRcusr +Content-Type: multipart/mixed; boundary="3V7upXqbjpZ4EhLz" +Content-Disposition: inline + + +--3V7upXqbjpZ4EhLz +Content-Type: text/plain; charset=iso-8859-1 +Content-Disposition: inline +Content-Transfer-Encoding: quoted-printable + +On Fri, May 01, 2015 at 05:24:39AM +0000, Jack Peirce wrote: +> Some of the flags used in the notmuch-mutt script included in the +> contrib directory are not supported by the OpenBSD implementation of +> ln and xargs. + +I wasn't aware of that, so thanks for spotting it and for your patch. + +The patch looks good to me. I've also tested on my GNU/Linux machine and +it works fine. + +David, please consider the attached (format-)patch for inclusion into +the upcoming release of Notmuch. + +Cheers. +--=20 +Stefano Zacchiroli . . . . . . . zack@upsilon.cc . . . . o . . . o . o +Ma=EEtre de conf=E9rences . . . . . http://upsilon.cc/zack . . . o . . . o o +Former Debian Project Leader . . @zack on identi.ca . . o o o . . . o . +=AB the first rule of tautology club is the first rule of tautology club =BB + +--3V7upXqbjpZ4EhLz +Content-Type: text/x-diff; charset=us-ascii +Content-Disposition: attachment; filename="0001-notmuch-mutt-fix-xargs-ln-usage-for-OpenBSD-compatib.patch" +Content-Transfer-Encoding: quoted-printable + +=46rom 8641b7bc815d3a50a25069018faeb773b30499f2 Mon Sep 17 00:00:00 2001 +=46rom: Jack Peirce +Date: Fri, 1 May 2015 10:32:05 +0200 +Subject: [PATCH] notmuch-mutt: fix xargs/ln usage for OpenBSD compatibility + +- xargs: use -r flag instead of --no-run-if-empty +- ln: use -I flag/3rd form of ln command instead of -t flag/4th form + +Signed-off-by: Stefano Zacchiroli +--- + contrib/notmuch-mutt/notmuch-mutt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/contrib/notmuch-mutt/notmuch-mutt b/contrib/notmuch-mutt/notmu= +ch-mutt +index 126cbf4..b47b365 100755 +--- a/contrib/notmuch-mutt/notmuch-mutt ++++ b/contrib/notmuch-mutt/notmuch-mutt +@@ -50,7 +50,7 @@ sub search($$$) { + empty_maildir($maildir); + system("notmuch search --output=3Dfiles $dup_option $query" + . " | sed -e 's: :\\\\ :g'" +- . " | xargs --no-run-if-empty ln -s -t $maildir/cur/"); ++ . " | xargs -r -I searchoutput ln -s searchoutput $maildir/cur/"); + } +=20 + sub prompt($$) { +--=20 +2.1.4 + + +--3V7upXqbjpZ4EhLz-- + +--MW5yreqqjyrRcusr +Content-Type: application/pgp-signature; name="signature.asc" +Content-Description: Digital signature + +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIVAwUBVUM7B5wxUDxthmOWAQhK8g//cjDelVZDI/N+eXBcVsTm6lAzfZkqOCeV +20s8rPvdShvNZmT3P1w9JZu5waOZAzW2w3pP85PSiiO6KVmtaJespfrMBjgfrW3F +AsrEMtpYvmsAvITrho5oHngoVDKOMezS6p3JkeqvGR3+sabABm5/sqVkdMKVRaJD +ahcTOqwi5UYecPGizkk0tvR1jRwsuLt8EuRootc6CH2S88Y+4yoEwSZE1BbylUUM +d3Y1x1hlB6hiezOTaf48YPP6qS1b5Zc9FS0J6zZaQmekurvm+S47OahB4Dyj9Pa2 +19wu1UHEAqit+ImEkkbSS/xt99HGHnjNZJJAFvJwhAyh1kZ/sHvXHLsAxnsl6Et1 +/yZzSNDDo3YqvMlILS6CyqIzdkPmQYoLxW9+aIDTfhQntCDwvd1qOsHuaqs5MBNG +G1wF1sA6/POGV8iTS9Mr3p99ChArYTlRDLz9AIZ8Elb60/QmmhUnwFg3940q8030 +DqLqMNUweK948muVW/Nh+irRY6XEZl48JSTqNdWR0dRytpoaBKPR/l4I9E/AhVK8 +g/d0JPJ+KNeW4Qk+n08TnFDd94PU3asreGcUtN0YUJLcBWjTl/F5Nt6SGnTK8ZRP +ZhLZ2C1OcZnJCybfitehwA4aCxRe5eEYY42y9YKuUhDntYAxK29ARDdXTtGh2TL5 +aLXtW1WMXfg= +=AYZr +-----END PGP SIGNATURE----- + +--MW5yreqqjyrRcusr-- -- 2.26.2