From owner-freebsd-net@FreeBSD.ORG Thu May 28 04:40:15 2015 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8617BB41 for ; Thu, 28 May 2015 04:40:15 +0000 (UTC) (envelope-from pkelsey@gmail.com) Received: from mail-yh0-x232.google.com (mail-yh0-x232.google.com [IPv6:2607:f8b0:4002:c01::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4561DE7A for ; Thu, 28 May 2015 04:40:15 +0000 (UTC) (envelope-from pkelsey@gmail.com) Received: by yhda23 with SMTP id a23so8167997yhd.2 for ; Wed, 27 May 2015 21:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:date:message-id:subject:from:to:content-type; bh=DbajXVin1jwOnWtxsKaHtmNZ2UXeXGQcko9kKDrwvpM=; b=gtAc/5SSstkExhe2MCKznehlJX/8CTkESPw6K8cInA+DThhhZ6I41cSmybySIUjKOk 0v442gVqNG7yKj2ji/gQnAQxfO7w5pHgrJjS++8fqCxnT5xx5G2r+mtgKfceIzF5E9Ah BDbEZMb/eRnFKtcxJpYOgjl9gLdTY4iVvAqHd+AXNIhzL0HVUSdCb+UVGKRnY1IPeOw0 aQEa4t1cAZ/EXnD0FSTlraBdk2Nfn/m5DHxfsFNIoo1aoKFVQ7NKiXFaJMGsFxM41jKk boeLmE9D1C7FZgLN98EU2IMV76RNINvA5/vqeWaKEIz1cWaQ+4LwAah4EQfnHsOeMdIr D9Ig== MIME-Version: 1.0 X-Received: by 10.170.53.1 with SMTP id 1mr949933ykv.51.1432788014170; Wed, 27 May 2015 21:40:14 -0700 (PDT) Sender: pkelsey@gmail.com Received: by 10.13.201.71 with HTTP; Wed, 27 May 2015 21:40:14 -0700 (PDT) Date: Thu, 28 May 2015 00:40:14 -0400 X-Google-Sender-Auth: GuXukhTxabuiwI-IYupo5nwS8PM Message-ID: Subject: Looking for input on "locally patch tcpdump or merge in latest release from upstream?" From: Patrick Kelsey To: "freebsd-net@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 May 2015 04:40:15 -0000 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). Thanks! -Patrick