From owner-cvs-src@FreeBSD.ORG  Wed Jun 16 23:27:56 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 0997616A4CE; Wed, 16 Jun 2004 23:27:56 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 038D343D31; Wed, 16 Jun 2004 23:27:56 +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 i5GNQ1Tk075441;
	Wed, 16 Jun 2004 23:26:01 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5GNQ1FT075440;
	Wed, 16 Jun 2004 23:26:01 GMT
	(envelope-from mlaier)
Message-Id: <200406162326.i5GNQ1FT075440@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Wed, 16 Jun 2004 23:26:01 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: OPENBSD
Subject: cvs commit: src/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: Wed, 16 Jun 2004 23:27:56 -0000

mlaier      2004-06-16 23:26:01 UTC

  FreeBSD src repository

  src/contrib/pf - Imported sources
  Update of /home/ncvs/src/contrib/pf
  In directory repoman.freebsd.org:/tmp/cvs-serv75312
  
  Log Message:
  Import userland of pf 3.5 from OpenBSD (OPENBSD_3_5_BASE).
  
  Status:
  
  Vendor Tag:	OPENBSD
  Release Tags:	pf_openbsd_3_5
  		
  U src/contrib/pf/authpf/authpf.8
  C src/contrib/pf/authpf/authpf.c
  U src/contrib/pf/authpf/pathnames.h
  C src/contrib/pf/ftp-proxy/ftp-proxy.8
  C src/contrib/pf/ftp-proxy/ftp-proxy.c
  U src/contrib/pf/ftp-proxy/getline.c
  U src/contrib/pf/ftp-proxy/util.c
  U src/contrib/pf/ftp-proxy/util.h
  C src/contrib/pf/man/pf.4
  U src/contrib/pf/man/pf.conf.5
  U src/contrib/pf/man/pf.os.5
  C src/contrib/pf/man/pflog.4
  C src/contrib/pf/man/pfsync.4
  C src/contrib/pf/pfctl/parse.y
  U src/contrib/pf/pfctl/pf_print_state.c
  U src/contrib/pf/pfctl/pfctl.8
  C src/contrib/pf/pfctl/pfctl.c
  C src/contrib/pf/pfctl/pfctl.h
  C src/contrib/pf/pfctl/pfctl_altq.c
  U src/contrib/pf/pfctl/pfctl_osfp.c
  C src/contrib/pf/pfctl/pfctl_parser.c
  C src/contrib/pf/pfctl/pfctl_parser.h
  C src/contrib/pf/pfctl/pfctl_qstats.c
  U src/contrib/pf/pfctl/pfctl_radix.c
  C src/contrib/pf/pfctl/pfctl_table.c
  U src/contrib/pf/pflogd/pflogd.8
  C src/contrib/pf/pflogd/pflogd.c
  U src/contrib/pf/pflogd/pidfile.c
  U src/contrib/pf/pflogd/pidfile.h
  N src/contrib/pf/pflogd/privsep.c
  N src/contrib/pf/pflogd/pflogd.h
  N src/contrib/pf/pflogd/privsep_fdpass.c
  
  15 conflicts created by this import.
  Use the following command to help the merge:
  
  	cvs checkout -jOPENBSD:yesterday -jOPENBSD src/contrib/pf