From owner-svn-src-all@FreeBSD.ORG Thu Feb 5 20:11:45 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57DA7803 for ; Thu, 5 Feb 2015 20:11:45 +0000 (UTC) Received: from nm18-vm0.bullet.mail.bf1.yahoo.com (nm18-vm0.bullet.mail.bf1.yahoo.com [98.139.213.138]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F3016343 for ; Thu, 5 Feb 2015 20:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1423167101; bh=B9HOald4ptvqllbqp+z/tuKHqAobDe1Wm0GXYxWw58A=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=ha0yd8L+LCCWgTuFQweHyWODanb2cxT4+9+ko+OClILcUb/JksFOr/CUzSwtpto5MWiyvMf7XdVFmOdRbcxjwXcei3fRTSGHYaGiA/1nqppf4/39p/v1vEhcORMVqf4Vi0TBBbvlfIy1rFoKTrocAh795yogj3GaHHT5kc0BtSHw1FcqFdhld36QEI3rxICWvbbn5STBzqyeJA3ii+BP5UT+apTixDHloshbgpLw0aZFPugSlhBdhfrJSpCaxwUKkrL1Vp8rNSoenQQVI6N7hhxvagjDMyfkhD2je9b7irzCIoReszquqNJ3a5wM/bBMOLxsw/NT/sVa84WRPUdQpQ== Received: from [98.139.215.142] by nm18.bullet.mail.bf1.yahoo.com with NNFMP; 05 Feb 2015 20:11:41 -0000 Received: from [98.139.211.198] by tm13.bullet.mail.bf1.yahoo.com with NNFMP; 05 Feb 2015 20:11:41 -0000 Received: from [127.0.0.1] by smtp207.mail.bf1.yahoo.com with NNFMP; 05 Feb 2015 20:11:41 -0000 X-Yahoo-Newman-Id: 623293.68205.bm@smtp207.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: YN5zpFIVM1nqGBeiKT._5ARvmG1RbOieP1.rJk0JllRz33J _CyrV79GVp4zZ8hZIICJApcgCv_UM8iCPDJuZDzbNlTQhQPQp.wqTadpzCBx 3dMmnS5j9T4B4SB1yN3n0Q_MQHgfixlr6NecNO07N0NQ39cRiYXeCiDTkcz7 53lNmz971CPBummvXJANqaKbY9M95KRwml0XfPE60UwnnFewwhb3yXBU9egl t0.tKTRymnipR.YLamUvkv01Kb0W30hxHXMF7.AsQq73sbDsoAdunw7QllEp QtfhhTH0e5kQJ5Fn16wGzUo4KX1d5k2Kl6YTX1dfruJNLJOo10YytZup3U.x 548WL.vsbNo_S.SsE36yr6dl6eepQbn0UmaG47iqCyC128D5HGyon2TdzvLq KOaO1V_vqXXB_DFAftNkdnk7yj1OKmXYwZO_3WGe4.Iww6zkh6lQKLhGPTK4 apMHYd8L9YVx9sWLZTC3i5ZgHiTGwexHuO0f1tC7T9hj6FUuOiY0tIig7UM3 NlNh7Y_fehYJ_n8HKCK.qx2ZEZZ5edBLi X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <54D3CE82.2050204@FreeBSD.org> Date: Thu, 05 Feb 2015 15:11:46 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Luigi Rizzo , Xin LI Subject: Re: lost change 272451 - CAP_EVENT for tcpdump (Re: svn commit: r276788 - in head: contrib/tcpdump contrib/tcpdump/lbl contrib/tcpdump/missing usr.sbin/tcpdump/tcpdump References: In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Cc: "svn-src-head@freebsd.org" , "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Feb 2015 20:11:45 -0000 On 02/05/15 13:30, Luigi Rizzo wrote: > Hi, > the update to tcpdump 4.6.2 also lost svn272451 and 272653 (addition of > CAP_EVENT to the capabilities given to tcpdump). > > Given this and the other bug fixed in 277638, I am not sure if there > are other local changes that have been lost in the merge. > Also I wonder whether there is something we should have done > differently when applying local changes to code in contrib/ to make > sure that the merge from vendor does not overwrite them ? > > cheers > luigi FWIW, I think what happened here is that upstream merged our capsicum changes only partially and the corresponding clash made it difficult to understand what came from where. If our local changes are too big and upstream is very active, this complexity is unavoidable but it is always good to try to upstream all that we can, and the tcpdump maintainers have been rather open to taking changes. Cheers, Pedro.