Date: Wed, 27 May 2015 21:55:51 -0700 From: hiren panchasara <hiren@strugglingcoder.info> To: Patrick Kelsey <pkelsey@freebsd.org> Cc: "freebsd-net@freebsd.org" <freebsd-net@freebsd.org>, delphij@FreeBSD.org Subject: Re: Looking for input on "locally patch tcpdump or merge in latest release from upstream?" Message-ID: <20150528045551.GS95600@strugglingcoder.info> In-Reply-To: <CAD44qMVQ-KR66G_eH0rEL6%2BLuoeV=UiDqTi==s60Ubspbkt2Fg@mail.gmail.com> References: <CAD44qMVQ-KR66G_eH0rEL6%2BLuoeV=UiDqTi==s60Ubspbkt2Fg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
[-- Attachment #1 --] On 05/28/15 at 12:40P, Patrick Kelsey wrote: > Hi, > > I've had a patch for a capsicum-related issue in tcpdump sitting around > since last September ( > https://lists.freebsd.org/pipermail/freebsd-current/2014-September/052049.html) > that is still needed and that I want finally address in the tree (the patch > was reviewed by rwatson@ and pjd@ back then). > > This issue was patched separately in the upstream tcpdump sources in > February ( > https://github.com/the-tcpdump-group/tcpdump/commit/887bf88fd058f8c0ef9a5af1a95b43753e3ad2eb), > along with a refactor of the associated capsicum code, and that work has > been present in tcpdump releases since 4.7.3 ( > http://www.tcpdump.org/tcpdump-changes.txt). > > The last tcpdump release imported into the FreeBSD tree was 4.6.2 ( > http://svnweb.freebsd.org/base/vendor/tcpdump/). > > tcpdump release import/merges have recently resulted in some confusion/lost > local patches due to the extent of the diffs (e.g., the thread at > https://lists.freebsd.org/pipermail/svn-src-head/2015-February/067853.html). > > I see three possible ways to proceed: > > 1. Apply the minimal-local-diff patch from last September to our local > tcpdump sources. This seems like it might contribute to a future > difficult/lossy tcpdump vendor import/merge. > > 2. Import tcpdump 4.7.3 or later to address this issue. Are there any > reasons why this might not be desired? I don't have a feel for when/why > past tcpdump vendor imports have been performed or avoided. > > 3. Cherry-pick the upstream patch and apply it to our local sources, > directly addressing only this issue and avoiding future tcpdump vendor > import/merge problems related to this issue. > > I'm looking for input on the above. If left to my own devices, I'd go with > (3). Latest upstream release is 4.7.4 and the one before that was 4.6.2 which we already have in the tree. I think we should get latest instead of picking bits and pieces when possible. CCing Xin for his input as he has been doing last few imports. Cheers, Hiren [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQF8BAEBCgBmBQJVZp/WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNEUyMEZBMUQ4Nzg4RjNGMTdFNjZGMDI4 QjkyNTBFMTU2M0VERkU1AAoJEIuSUOFWPt/ln3QH/0z4pGdaRzskjEu1QACKy1SG cElSl4yHVqv075EuQldrXsUkvJXgmnuQgVLdMrnepqWaHMf+MR5+LYYztV5HvnOO iP3QCk3XvGxpkGPtPCKwcfW6qcge4p/AN8h9gh1exjVhsceF6fxB1X5xmDC3XsSj 0MZmFUVSxF2Va27cBXPGNla+gwBp93mB7dhY8cBUljYN/5IS4V1r57ACsDxSDIAw LwEBSJO5AbNwGqagJfdklAKq2QjVhtPKd237dNNegC9QcJZVBMktIZbWPYwjMCbT mLNvfXlSGLKTDAoJQuf1FL/DdKalMKSCmZ00pv+gZFk+v1zlu9edCK68q/2ejgo= =MBWT -----END PGP SIGNATURE-----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150528045551.GS95600>