From owner-cvs-src@FreeBSD.ORG  Tue May  3 16:34:45 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1440616A550; Tue,  3 May 2005 16:34:45 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id ECF1843D39; Tue,  3 May 2005 16:34:44 +0000 (GMT)
	(envelope-from mlaier@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j43GYbMA053206;
	Tue, 3 May 2005 16:34:37 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j43GYbG2053205;
	Tue, 3 May 2005 16:34:37 GMT
	(envelope-from mlaier)
Message-Id: <200505031634.j43GYbG2053205@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Tue, 3 May 2005 16:34:37 +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-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 May 2005 16:34:45 -0000

mlaier      2005-05-03 16:34:37 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-serv53180
  
  Log Message:
  Import pf from OpenBSD 3.7 (OPENBSD_3_7 as of today)
  
  Status:
  
  Vendor Tag:	OPENBSD
  Release Tags:	pf_openbsd_3_7
  		
  C src/sys/contrib/pf/net/if_pflog.c
  C src/sys/contrib/pf/net/if_pflog.h
  C src/sys/contrib/pf/net/if_pfsync.c
  C 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
  C src/sys/contrib/pf/net/pf_ioctl.c
  C src/sys/contrib/pf/net/pf_norm.c
  C src/sys/contrib/pf/net/pf_osfp.c
  C 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
  
  11 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jOPENBSD:yesterday -jOPENBSD src/sys/contrib/pf