From owner-cvs-src@FreeBSD.ORG  Sun May  2 12:43:33 2004
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 09BDF16A4CE; Sun,  2 May 2004 12:43:33 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id ECA5F43D1F; Sun,  2 May 2004 12:43:32 -0700 (PDT)
	(envelope-from dhartmei@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i42JhWGe050656;
	Sun, 2 May 2004 12:43:32 -0700 (PDT)
	(envelope-from dhartmei@repoman.freebsd.org)
Received: (from dhartmei@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i42JhWuH050655;
	Sun, 2 May 2004 12:43:32 -0700 (PDT)
	(envelope-from dhartmei)
Message-Id: <200405021943.i42JhWuH050655@repoman.freebsd.org>
From: Daniel Hartmeier <dhartmei@FreeBSD.org>
Date: Sun, 2 May 2004 12:43:32 -0700 (PDT)
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/net - 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: Sun, 02 May 2004 19:43:33 -0000

dhartmei    2004/05/02 12:43:32 PDT

  FreeBSD src repository

  src/sys/contrib/pf/net - Imported sources
  Update of /home/ncvs/src/sys/contrib/pf/net
  In directory repoman.freebsd.org:/tmp/cvs-serv50371
  
  Log Message:
  Import OpenBSD 3.4-stable fixes
  
  Status:
  
  Vendor Tag:	OPENBSD
  Release Tags:	pf_openbsd_3_4_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_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
  U src/sys/contrib/pf/net/pfvar.h
  
  3 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jOPENBSD:yesterday -jOPENBSD src/sys/contrib/pf/net