Module Name:	src
Committed By:	peter
Date:		Fri Jul  1 12:29:55 UTC 2005

Update of /cvsroot/src/dist/pf
In directory ivanova.netbsd.org:/tmp/cvs-serv15809

Log Message:
Import pf from OpenBSD 3.7 (userland part).


Vendor Tag:	OPENBSD
Release Tags:	v3_7
		
U src/dist/pf/etc/pf.conf
U src/dist/pf/etc/pf.os
U src/dist/pf/libexec/ftp-proxy/Makefile
C src/dist/pf/libexec/ftp-proxy/ftp-proxy.8
C src/dist/pf/libexec/ftp-proxy/ftp-proxy.c
C src/dist/pf/libexec/ftp-proxy/getline.c
U src/dist/pf/libexec/ftp-proxy/util.c
C src/dist/pf/libexec/ftp-proxy/util.h
U src/dist/pf/sbin/pfctl/Makefile
C src/dist/pf/sbin/pfctl/parse.y
C src/dist/pf/sbin/pfctl/pf_print_state.c
C src/dist/pf/sbin/pfctl/pfctl.8
C src/dist/pf/sbin/pfctl/pfctl.c
C src/dist/pf/sbin/pfctl/pfctl.h
C src/dist/pf/sbin/pfctl/pfctl_altq.c
C src/dist/pf/sbin/pfctl/pfctl_optimize.c
C src/dist/pf/sbin/pfctl/pfctl_osfp.c
C src/dist/pf/sbin/pfctl/pfctl_parser.c
C src/dist/pf/sbin/pfctl/pfctl_parser.h
U src/dist/pf/sbin/pfctl/pfctl_qstats.c
U src/dist/pf/sbin/pfctl/pfctl_radix.c
C src/dist/pf/sbin/pfctl/pfctl_table.c
U src/dist/pf/sbin/pflogd/Makefile
C src/dist/pf/sbin/pflogd/pflogd.8
C src/dist/pf/sbin/pflogd/pflogd.c
U src/dist/pf/sbin/pflogd/pflogd.h
C src/dist/pf/sbin/pflogd/privsep.c
U src/dist/pf/sbin/pflogd/privsep_fdpass.c
C src/dist/pf/share/man/man4/pf.4
U src/dist/pf/share/man/man4/pflog.4
C src/dist/pf/share/man/man5/pf.conf.5
U src/dist/pf/share/man/man5/pf.os.5
U src/dist/pf/share/pf/Makefile
U src/dist/pf/share/pf/ackpri
U src/dist/pf/share/pf/faq-example1
U src/dist/pf/share/pf/faq-example2
U src/dist/pf/share/pf/faq-example3
U src/dist/pf/share/pf/queue1
U src/dist/pf/share/pf/queue2
U src/dist/pf/share/pf/queue3
U src/dist/pf/share/pf/queue4
U src/dist/pf/share/pf/spamd
U src/dist/pf/usr.sbin/authpf/Makefile
C src/dist/pf/usr.sbin/authpf/authpf.8
C src/dist/pf/usr.sbin/authpf/authpf.c
U src/dist/pf/usr.sbin/authpf/pathnames.h

22 conflicts created by this import.
Use the following command to help the merge:

	cvs checkout -jOPENBSD:yesterday -jOPENBSD src/dist/pf