From owner-svn-src-all@FreeBSD.ORG Fri Dec 16 02:58:55 2011 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 278DE106566B; Fri, 16 Dec 2011 02:58:55 +0000 (UTC) (envelope-from peterjeremy@acm.org) Received: from mail27.syd.optusnet.com.au (mail27.syd.optusnet.com.au [211.29.133.168]) by mx1.freebsd.org (Postfix) with ESMTP id A7CD68FC19; Fri, 16 Dec 2011 02:58:54 +0000 (UTC) Received: from server.vk2pj.dyndns.org (c220-239-116-103.belrs4.nsw.optusnet.com.au [220.239.116.103]) by mail27.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id pBG2wqEu004278 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 16 Dec 2011 13:58:53 +1100 X-Bogosity: Ham, spamicity=0.000000 Received: from server.vk2pj.dyndns.org (localhost.vk2pj.dyndns.org [127.0.0.1]) by server.vk2pj.dyndns.org (8.14.5/8.14.4) with ESMTP id pBG2wpqL079599; Fri, 16 Dec 2011 13:58:51 +1100 (EST) (envelope-from peter@server.vk2pj.dyndns.org) Received: (from peter@localhost) by server.vk2pj.dyndns.org (8.14.5/8.14.4/Submit) id pBG2wpE2079598; Fri, 16 Dec 2011 13:58:51 +1100 (EST) (envelope-from peter) Date: Fri, 16 Dec 2011 13:58:51 +1100 From: Peter Jeremy To: "Bjoern A. Zeeb" Message-ID: <20111216025851.GA79528@server.vk2pj.dyndns.org> References: <201106281157.p5SBvP5g048097@svn.freebsd.org> <20111214014637.GA30470@server.vk2pj.dyndns.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SLDf9lqlvOQaIe6s" Content-Disposition: inline In-Reply-To: <20111214014637.GA30470@server.vk2pj.dyndns.org> X-PGP-Key: http://members.optusnet.com.au/peterjeremy/pubkey.asc User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r223637 - in head: . contrib/pf/authpf contrib/pf/ftp-proxy contrib/pf/man contrib/pf/pfctl contrib/pf/pflogd sbin/pflogd sys/conf sys/contrib/altq/altq sys/contrib/pf/net sys/modules s... X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Fri, 16 Dec 2011 02:58:55 -0000 --SLDf9lqlvOQaIe6s Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2011-Jun-28 11:57:25 +0000, "Bjoern A. Zeeb" wrote: >Author: bz >Date: Tue Jun 28 11:57:25 2011 >New Revision: 223637 >URL: http://svn.freebsd.org/changeset/base/223637 > >Log: > Update packet filter (pf) code to OpenBSD 4.5. Further to my mail last Wednesday, I've found nested "#ifdef __FreeBSD__" conditionals in pf_ioctl.c as well - it looks like conditional code was added to support network stack virtualisation without noting that the code was already protectd by a "#ifdef __FreeBSD__". And cross-checking the $OpenBSD$ tags in the FreeBSD repo against the OpenBSD CVSweb throws up consistent off-by-one errors - as an example, src/sys/contrib/pf/net/if_pfsync.h in FreeBSD 9.0 states "$OpenBSD: if_pfsync.h,v 1.35 2008/06/29 08:42:15 mcbride Exp $" but the actual content matches if_pfsync.h v1.36 in OpenBSD CVSweb. Is it possible that the pf code was checked out of an OpenBSD repo without the correct $OpenBSD$ tag expansion? This caused me a degree of confusion whilst trying to correlate the FreeBSD code with the OpenBSD code to try and update bin/124825 --=20 Peter Jeremy --SLDf9lqlvOQaIe6s Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (FreeBSD) iEYEARECAAYFAk7qs+sACgkQ/opHv/APuIcIQACgsjqOcBa+XsH9CgLqudwxWHA1 GRsAnjZPG1qnyrZ/2KXnPQykcAU7y2J4 =RFxA -----END PGP SIGNATURE----- --SLDf9lqlvOQaIe6s--