From owner-cvs-src@FreeBSD.ORG  Tue May  3 16:55:26 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 03ADA16A4CE; Tue,  3 May 2005 16:55:26 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id BF50043D5F; Tue,  3 May 2005 16:55:25 +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 j43GtKEm061316;
	Tue, 3 May 2005 16:55:20 GMT
	(envelope-from mlaier@repoman.freebsd.org)
Received: (from mlaier@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j43GtKM2061315;
	Tue, 3 May 2005 16:55:20 GMT
	(envelope-from mlaier)
Message-Id: <200505031655.j43GtKM2061315@repoman.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Tue, 3 May 2005 16:55:20 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/pf/authpf authpf.c src/contrib/pf/ftp-proxy
 ftp-proxy.8 ftp-proxy.c src/contrib/pf/man pf.4 pf.conf.5 pflog.4
 pfsync.4 src/contrib/pf/pfctl parse.y pf_print_state.c pfctl.c
 pfctl.h pfctl_altq.c pfctl_optimize.c pfctl_parser.c ...
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:55:26 -0000

mlaier      2005-05-03 16:55:20 UTC

  FreeBSD src repository

  Modified files:
    contrib/pf/authpf    authpf.c 
    contrib/pf/ftp-proxy ftp-proxy.8 ftp-proxy.c 
    contrib/pf/man       pf.4 pf.conf.5 pflog.4 pfsync.4 
    contrib/pf/pfctl     parse.y pf_print_state.c pfctl.c pfctl.h 
                         pfctl_altq.c pfctl_optimize.c 
                         pfctl_parser.c pfctl_parser.h 
                         pfctl_qstats.c pfctl_table.c 
    contrib/pf/pflogd    pflogd.c pidfile.c privsep.c 
  Log:
  Resolve conflicts created during the import of pf 3.7 Some features are
  missing and will be implemented in a second step.  This is functional as is.
  
  Tested by:      freebsd-pf, pfsense.org
  Obtained from:  OpenBSD
  
  Revision  Changes    Path
  1.6       +177 -262  src/contrib/pf/authpf/authpf.c
  1.4       +20 -1     src/contrib/pf/ftp-proxy/ftp-proxy.8
  1.6       +62 -18    src/contrib/pf/ftp-proxy/ftp-proxy.c
  1.7       +627 -351  src/contrib/pf/man/pf.4
  1.8       +287 -83   src/contrib/pf/man/pf.conf.5
  1.4       +0 -0      src/contrib/pf/man/pflog.4
  1.5       +33 -16    src/contrib/pf/man/pfsync.4
  1.7       +457 -187  src/contrib/pf/pfctl/parse.y
  1.3       +4 -1      src/contrib/pf/pfctl/pf_print_state.c
  1.6       +413 -313  src/contrib/pf/pfctl/pfctl.c
  1.6       +9 -8      src/contrib/pf/pfctl/pfctl.h
  1.7       +46 -17    src/contrib/pf/pfctl/pfctl_altq.c
  1.2       +7 -0      src/contrib/pf/pfctl/pfctl_optimize.c
  1.7       +120 -93   src/contrib/pf/pfctl/pfctl_parser.c
  1.6       +54 -7     src/contrib/pf/pfctl/pfctl_parser.h
  1.6       +5 -3      src/contrib/pf/pfctl/pfctl_qstats.c
  1.7       +14 -22    src/contrib/pf/pfctl/pfctl_table.c
  1.8       +30 -7     src/contrib/pf/pflogd/pflogd.c
  1.4       +0 -0      src/contrib/pf/pflogd/pidfile.c
  1.3       +11 -7     src/contrib/pf/pflogd/privsep.c