From owner-cvs-all@FreeBSD.ORG  Thu Aug 12 13:46:22 2004
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id ECD6D16A4CE; Thu, 12 Aug 2004 13:46:22 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id E027643D1F; Thu, 12 Aug 2004 13:46:22 +0000 (GMT)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7CDkMlX024204;
	Thu, 12 Aug 2004 13:46:22 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7CDkM8M024203;
	Thu, 12 Aug 2004 13:46:22 GMT
	(envelope-from mlaier)
Message-Id: <200408121346.i7CDkM8M024203@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Thu, 12 Aug 2004 13:46:22 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: OPENBSD
Subject: cvs commit: src/sys/contrib/pf - Imported sources
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Aug 2004 13:46:23 -0000

mlaier      2004-08-12 13:46:22 UTC

  FreeBSD src repository

  src/sys/contrib/pf - Imported sources
  Update of /home/ncvs/src/sys/contrib/pf
  In directory repoman.freebsd.org:/tmp/cvs-serv24103
  
  Log Message:
  Import a couple of fixes from OpenBSD-current, which did not make -stable in
  OpenBSD for various reasons.
  
  Discussed with:	yongari
  
  Status:
  
  Vendor Tag:	OPENBSD
  Release Tags:	pf_openbsd_3_5_003
  		
  U src/sys/contrib/pf/net/if_pflog.c
  U src/sys/contrib/pf/net/if_pflog.h
  U src/sys/contrib/pf/net/if_pfsync.c
  U src/sys/contrib/pf/net/if_pfsync.h
  C src/sys/contrib/pf/net/pf.c
  C src/sys/contrib/pf/net/pf_if.c
  U src/sys/contrib/pf/net/pf_ioctl.c
  C src/sys/contrib/pf/net/pf_norm.c
  U src/sys/contrib/pf/net/pf_osfp.c
  U src/sys/contrib/pf/net/pf_table.c
  C src/sys/contrib/pf/net/pfvar.h
  U src/sys/contrib/pf/netinet/in4_cksum.c
  
  4 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jOPENBSD:yesterday -jOPENBSD src/sys/contrib/pf