Module Name:	src
Committed By:	yamt
Date:		Sun Nov 14 11:09:12 UTC 2004

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

Log Message:
import pf from OpenBSD 3.6. (userland part)


Vendor Tag:	OPENBSD
Release Tags:	v3_6
		
N src/dist/pf/etc/pf.conf
N src/dist/pf/etc/pf.os
N src/dist/pf/etc/spamd.conf
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
U src/dist/pf/libexec/ftp-proxy/getline.c
C src/dist/pf/libexec/ftp-proxy/util.c
C src/dist/pf/libexec/ftp-proxy/util.h
U src/dist/pf/libexec/spamd/Makefile
C src/dist/pf/libexec/spamd/grey.c
U src/dist/pf/libexec/spamd/grey.h
U src/dist/pf/libexec/spamd/sdl.c
U src/dist/pf/libexec/spamd/sdl.h
U src/dist/pf/libexec/spamd/spamd.8
C src/dist/pf/libexec/spamd/spamd.c
U src/dist/pf/libexec/spamd-setup/Makefile
U src/dist/pf/libexec/spamd-setup/spamd-setup.8
C src/dist/pf/libexec/spamd-setup/spamd-setup.c
U src/dist/pf/libexec/spamlogd/Makefile
C src/dist/pf/libexec/spamlogd/spamlogd.8
C src/dist/pf/libexec/spamlogd/spamlogd.c
U src/dist/pf/sbin/pfctl/Makefile
C src/dist/pf/sbin/pfctl/parse.y
U 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
N 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
C src/dist/pf/sbin/pfctl/pfctl_qstats.c
C src/dist/pf/sbin/pfctl/pfctl_radix.c
C src/dist/pf/sbin/pfctl/pfctl_table.c
U src/dist/pf/sbin/pflogd/Makefile
U src/dist/pf/sbin/pflogd/pflogd.8
U src/dist/pf/sbin/pflogd/pflogd.c
U src/dist/pf/sbin/pflogd/pflogd.h
U src/dist/pf/sbin/pflogd/privsep.c
U src/dist/pf/sbin/pflogd/privsep_fdpass.c
N src/dist/pf/share/man/man4/pflog.4
N src/dist/pf/share/man/man4/pf.4
N src/dist/pf/share/man/man5/pf.conf.5
N src/dist/pf/share/man/man5/pf.os.5
N src/dist/pf/share/man/man5/spamd.conf.5
N src/dist/pf/share/pf/Makefile
N src/dist/pf/share/pf/ackpri
N src/dist/pf/share/pf/faq-example1
N src/dist/pf/share/pf/faq-example2
N src/dist/pf/share/pf/faq-example3
N src/dist/pf/share/pf/queue1
N src/dist/pf/share/pf/queue2
N src/dist/pf/share/pf/queue3
N src/dist/pf/share/pf/queue4
N src/dist/pf/share/pf/spamd
C 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
C src/dist/pf/usr.sbin/authpf/pathnames.h
U src/dist/pf/usr.sbin/spamdb/Makefile
U src/dist/pf/usr.sbin/spamdb/spamdb.8
U src/dist/pf/usr.sbin/spamdb/spamdb.c

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

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