CVS commit: src

[Martti Kuparinen <martti%netbsd.org@localhost>]

Module Name:    src
Committed By:   martti
Date:           Tue Dec  1 07:03:20 UTC 2009

Update of /cvsroot/src
In directory ivanova.netbsd.org:/tmp/cvs-serv16304

Log Message:
Import PF from OpenBSD 4.2

Status:

Vendor Tag:     OPENBSD
Release Tags:   v4_2
                
C src/dist/pf/usr.sbin/ftp-proxy/Makefile
C src/dist/pf/usr.sbin/ftp-proxy/ftp-proxy.8
C src/dist/pf/usr.sbin/ftp-proxy/filter.c
C src/dist/pf/usr.sbin/ftp-proxy/filter.h
C src/dist/pf/usr.sbin/ftp-proxy/ftp-proxy.c
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
C src/dist/pf/share/pf/Makefile
C src/dist/pf/share/pf/ackpri
C src/dist/pf/share/pf/faq-example1
C src/dist/pf/share/pf/faq-example2
C src/dist/pf/share/pf/faq-example3
C src/dist/pf/share/pf/queue1
C src/dist/pf/share/pf/queue2
C src/dist/pf/share/pf/queue3
C src/dist/pf/share/pf/queue4
C src/dist/pf/share/pf/spamd
C src/dist/pf/share/man/man5/pf.conf.5
C src/dist/pf/share/man/man5/pf.os.5
C src/dist/pf/share/man/man4/pf.4
C src/dist/pf/share/man/man4/pflog.4
C src/dist/pf/share/man/man4/pfsync.4
C src/dist/pf/sbin/pflogd/Makefile
C src/dist/pf/sbin/pflogd/pflogd.8
C src/dist/pf/sbin/pflogd/pflogd.c
C src/dist/pf/sbin/pflogd/pflogd.h
C src/dist/pf/sbin/pflogd/privsep.c
C src/dist/pf/sbin/pflogd/privsep_fdpass.c
C src/dist/pf/sbin/pfctl/Makefile
C src/dist/pf/sbin/pfctl/pfctl.8
C src/dist/pf/sbin/pfctl/parse.y
C src/dist/pf/sbin/pfctl/pfctl_altq.c
C src/dist/pf/sbin/pfctl/pfctl.c
C src/dist/pf/sbin/pfctl/pfctl.h
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
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
C src/dist/pf/sbin/pfctl/pf_print_state.c
C src/dist/pf/libexec/tftp-proxy/Makefile
C src/dist/pf/libexec/tftp-proxy/tftp-proxy.8
C src/dist/pf/libexec/tftp-proxy/filter.c
C src/dist/pf/libexec/tftp-proxy/filter.h
C src/dist/pf/libexec/tftp-proxy/tftp-proxy.c
C src/dist/pf/etc/pf.os
C src/dist/pf/etc/pf.conf
C src/sys/dist/pf/netinet/tcp_rndiss.h
C src/sys/dist/pf/netinet/tcp_rndiss.c
C src/sys/dist/pf/net/if_pflog.c
C src/sys/dist/pf/net/if_pflog.h
C src/sys/dist/pf/net/if_pfsync.c
C src/sys/dist/pf/net/if_pfsync.h
C src/sys/dist/pf/net/pf.c
C src/sys/dist/pf/net/pf_if.c
C src/sys/dist/pf/net/pf_ioctl.c
C src/sys/dist/pf/net/pf_norm.c
C src/sys/dist/pf/net/pf_osfp.c
C src/sys/dist/pf/net/pf_ruleset.c
C src/sys/dist/pf/net/pf_table.c
C src/sys/dist/pf/net/pfvar.h
C src/sys/dist/pf/net/pf_mtag.c
C src/sys/dist/pf/net/pf_mtag.h
C src/sys/dist/pf/net/if_compat.h
C src/sys/dist/pf/net/if_compat.c

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

        cvs checkout -jOPENBSD:yesterday -jOPENBSD src