From owner-svn-src-all@FreeBSD.ORG Thu Feb 5 20:48:03 2015 Return-Path: Delivered-To: svn-src-all@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 3F76F8EA for ; Thu, 5 Feb 2015 20:48:03 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1CEB7957 for ; Thu, 5 Feb 2015 20:48:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.9/8.14.9) with ESMTP id t15Km2FS033273 for ; Thu, 5 Feb 2015 20:48:02 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.9/8.14.9/Submit) id t15Km20G033268 for svn-src-all@freebsd.org; Thu, 5 Feb 2015 20:48:02 GMT (envelope-from bdrewery) Received: (qmail 76325 invoked from network); 5 Feb 2015 14:47:58 -0600 Received: from unknown (HELO ?10.10.1.139?) (freebsd@shatow.net@10.10.1.139) by sweb.xzibition.com with ESMTPA; 5 Feb 2015 14:47:58 -0600 Message-ID: <54D3D703.7020405@FreeBSD.org> Date: Thu, 05 Feb 2015 14:48:03 -0600 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Pedro Giffuni , 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: <54D3CE82.2050204@FreeBSD.org> In-Reply-To: <54D3CE82.2050204@FreeBSD.org> OpenPGP: id=6E4697CF; url=http://www.shatow.net/bryan/bryan2.asc Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7nDBmtWcjCl8qesb10bInepqjvnEH8VCo" 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:48:03 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --7nDBmtWcjCl8qesb10bInepqjvnEH8VCo Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 2/5/2015 2:11 PM, Pedro Giffuni wrote: >=20 > On 02/05/15 13:30, Luigi Rizzo wrote: >> Hi, >> the update to tcpdump 4.6.2 also lost svn272451 and 272653 (addition o= f >> 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 >=20 > 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. >=20 > 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. >=20 > Cheers, >=20 > Pedro. I've been sitting on a change for a while that I don't think upstream can take. https://people.freebsd.org/~bdrewery/patches/tcpdump-pflog-uid.diff is a version of the patch. I'm not sure if it was my final one. I would need to test again before committing. The problem is that pf is implemented differently on FreeBSD and OpenBSD for pid/uid tracking. The code would be overly complex to support both and I gave up on that. Even getting it to work on FreeBSD required the _KERNEL define hack for UID_MAX, which our pf uses to note 'no uid value'= =2E I was considering committing this, but was not sure on the proper way to note our changes. #if __FreeBSD__ was my guess. --=20 Regards, Bryan Drewery --7nDBmtWcjCl8qesb10bInepqjvnEH8VCo Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBAgAGBQJU09cDAAoJEDXXcbtuRpfPceIH/RoWKyUkWIc6nwG4o6L/sIxH ceQLrN9PKObZ2DQfWKKL069xk2J0XZZrxfjHaR+fdWWRcfT+TYIAOiOijpGmp9D7 O28dbZL0byPeVye/6ySlbV7VtL6i98v6dEUiTpHebeYYuGWmmZQCFLVIe+AVRlc7 wgU0svS0v0psg5YVsfTHz2mqm6SAimJWmCi37dViKkjWEXmo75X+/cm5s2cLCU1+ u7CGBMoLRleRX330+d92jHrvzH0SL0u930q4s/X/Oj8LZTeAk3pBt/4dU9RGYF76 BG1IlaJMjtoYAdXduSRTm+fFbK0nKvgCX6f2P5cYVfx5upagxDuzij57NDPl7Bw= =9T/E -----END PGP SIGNATURE----- --7nDBmtWcjCl8qesb10bInepqjvnEH8VCo--