Module Name:	src
Committed By:	yamt
Date:		Sun Nov 14 11:26:48 UTC 2004

Modified Files:
	src/dist/pf/etc: pf.conf pf.os spamd.conf
	src/dist/pf/libexec/ftp-proxy: ftp-proxy.8 ftp-proxy.c ipf.c util.c
	    util.h
	src/dist/pf/libexec/spamd: grey.c spamd.c
	src/dist/pf/libexec/spamd-setup: spamd-setup.c
	src/dist/pf/libexec/spamlogd: spamlogd.8 spamlogd.c
	src/dist/pf/sbin/pfctl: parse.y pfctl.8 pfctl.c pfctl.h pfctl_altq.c
	    pfctl_optimize.c pfctl_osfp.c pfctl_parser.c pfctl_parser.h
	    pfctl_qstats.c pfctl_radix.c pfctl_table.c
	src/dist/pf/share/man/man4: pf.4 pflog.4
	src/dist/pf/share/man/man5: pf.conf.5 pf.os.5 spamd.conf.5
	src/dist/pf/usr.sbin/authpf: Makefile authpf.8 authpf.c pathnames.h
	src/etc: Makefile
	src/share/man/man4: Makefile
	src/share/man/man5: Makefile
	src/usr.sbin/pf: Makefile Makefile.inc
	src/usr.sbin/pf/authpf: Makefile
	src/usr.sbin/pf/pfctl: Makefile
Added Files:
	src/usr.sbin/pf/etc: Makefile
	src/usr.sbin/pf/man: Makefile
	src/usr.sbin/pf/man/man4: Makefile
	src/usr.sbin/pf/man/man5: Makefile
Removed Files:
	src/etc: pf.conf pf.os spamd.conf
	src/share/man/man4: pf.4 pflog.4
	src/share/man/man5: pf.conf.5 pf.os.5 spamd.conf.5
	src/share/pf: Makefile ackpri faq-example1 faq-example2 faq-example3
	    queue1 queue2 queue3 queue4 spamd

Log Message:
merge after importing pf from openbsd 3.6. (userland part)

some files were imported to the different places from the previous version.
v3_5:
	etc/pf.conf
	etc/pf.os
	etc/spamd.conf
	share/man/man4/pf.4
	share/man/man4/pflog.4
	share/man/man5/pf.conf.5
	share/man/man5/pf.os.5
	share/man/man5/spamd.conf.5
v3_6:
	dist/pf/etc/pf.conf
	dist/pf/etc/pf.os
	dist/pf/etc/spamd.conf
	dist/pf/share/man/man4/pf.4
	dist/pf/share/man/man4/pflog.4
	dist/pf/share/man/man5/pf.conf.5
	dist/pf/share/man/man5/pf.os.5
	dist/pf/share/man/man5/spamd.conf.5


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r1.2 src/dist/pf/etc/pf.conf src/dist/pf/etc/pf.os \
    src/dist/pf/etc/spamd.conf
cvs rdiff -r1.4 -r1.5 src/dist/pf/libexec/ftp-proxy/ftp-proxy.8 \
    src/dist/pf/libexec/ftp-proxy/util.c
cvs rdiff -r1.6 -r1.7 src/dist/pf/libexec/ftp-proxy/ftp-proxy.c
cvs rdiff -r1.1 -r1.2 src/dist/pf/libexec/ftp-proxy/ipf.c
cvs rdiff -r1.3 -r1.4 src/dist/pf/libexec/ftp-proxy/util.h
cvs rdiff -r1.3 -r1.4 src/dist/pf/libexec/spamd/grey.c
cvs rdiff -r1.4 -r1.5 src/dist/pf/libexec/spamd/spamd.c
cvs rdiff -r1.2 -r1.3 src/dist/pf/libexec/spamd-setup/spamd-setup.c
cvs rdiff -r1.2 -r1.3 src/dist/pf/libexec/spamlogd/spamlogd.8
cvs rdiff -r1.3 -r1.4 src/dist/pf/libexec/spamlogd/spamlogd.c
cvs rdiff -r1.4 -r1.5 src/dist/pf/sbin/pfctl/parse.y \
    src/dist/pf/sbin/pfctl/pfctl_parser.c
cvs rdiff -r1.3 -r1.4 src/dist/pf/sbin/pfctl/pfctl.8 \
    src/dist/pf/sbin/pfctl/pfctl_altq.c src/dist/pf/sbin/pfctl/pfctl_osfp.c \
    src/dist/pf/sbin/pfctl/pfctl_qstats.c \
    src/dist/pf/sbin/pfctl/pfctl_radix.c src/dist/pf/sbin/pfctl/pfctl_table.c
cvs rdiff -r1.2 -r1.3 src/dist/pf/sbin/pfctl/pfctl.c \
    src/dist/pf/sbin/pfctl/pfctl.h src/dist/pf/sbin/pfctl/pfctl_parser.h
cvs rdiff -r1.1.1.1 -r1.2 src/dist/pf/sbin/pfctl/pfctl_optimize.c
cvs rdiff -r1.1.1.1 -r1.2 src/dist/pf/share/man/man4/pf.4 \
    src/dist/pf/share/man/man4/pflog.4
cvs rdiff -r1.1.1.1 -r1.2 src/dist/pf/share/man/man5/pf.conf.5 \
    src/dist/pf/share/man/man5/pf.os.5 \
    src/dist/pf/share/man/man5/spamd.conf.5
cvs rdiff -r1.2 -r1.3 src/dist/pf/usr.sbin/authpf/Makefile \
    src/dist/pf/usr.sbin/authpf/authpf.c \
    src/dist/pf/usr.sbin/authpf/pathnames.h
cvs rdiff -r1.4 -r1.5 src/dist/pf/usr.sbin/authpf/authpf.8
cvs rdiff -r1.292 -r1.293 src/etc/Makefile
cvs rdiff -r1.2 -r0 src/etc/pf.conf src/etc/pf.os src/etc/spamd.conf
cvs rdiff -r1.334 -r1.335 src/share/man/man4/Makefile
cvs rdiff -r1.2 -r0 src/share/man/man4/pf.4 src/share/man/man4/pflog.4
cvs rdiff -r1.52 -r1.53 src/share/man/man5/Makefile
cvs rdiff -r1.2 -r0 src/share/man/man5/pf.conf.5 src/share/man/man5/pf.os.5 \
    src/share/man/man5/spamd.conf.5
cvs rdiff -r1.2 -r0 src/share/pf/Makefile
cvs rdiff -r1.1.1.1 -r0 src/share/pf/ackpri src/share/pf/faq-example1 \
    src/share/pf/faq-example2 src/share/pf/faq-example3 src/share/pf/queue1 \
    src/share/pf/queue2 src/share/pf/queue3 src/share/pf/queue4 \
    src/share/pf/spamd
cvs rdiff -r1.1 -r1.2 src/usr.sbin/pf/Makefile
cvs rdiff -r1.2 -r1.3 src/usr.sbin/pf/Makefile.inc
cvs rdiff -r1.1 -r1.2 src/usr.sbin/pf/authpf/Makefile
cvs rdiff -r0 -r1.1 src/usr.sbin/pf/etc/Makefile
cvs rdiff -r0 -r1.1 src/usr.sbin/pf/man/Makefile
cvs rdiff -r0 -r1.1 src/usr.sbin/pf/man/man4/Makefile
cvs rdiff -r0 -r1.1 src/usr.sbin/pf/man/man5/Makefile
cvs rdiff -r1.2 -r1.3 src/usr.sbin/pf/pfctl/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.