CVS commit: src

[YAMAMOTO Takashi <yamt%netbsd.org@localhost>]

Module Name:    src
Committed By:   yamt
Date:           Wed Jun 18 09:06:28 UTC 2008

Modified Files:
        src/dist/pf/etc: pf.conf pf.os
        src/dist/pf/sbin/pfctl: Makefile parse.y pf_print_state.c pfctl.8
            pfctl.c pfctl.h pfctl_altq.c pfctl_optimize.c pfctl_osfp.c
            pfctl_parser.c pfctl_parser.h pfctl_radix.c pfctl_table.c
        src/dist/pf/sbin/pflogd: Makefile pflogd.8 pflogd.c pflogd.h privsep.c
        src/dist/pf/share/man/man4: pf.4 pflog.4
        src/dist/pf/share/man/man5: pf.conf.5 pf.os.5
        src/dist/pf/share/pf: Makefile ackpri faq-example1 faq-example2
            faq-example3 queue1 queue2 queue3 queue4 spamd
        src/dist/pf/usr.sbin/authpf: authpf.8 authpf.c
        src/distrib/sets/lists/base: mi
        src/distrib/sets/lists/etc: mi
        src/distrib/sets/lists/man: mi
        src/etc/mtree: NetBSD.dist special
        src/etc/rc.d: Makefile pflogd
        src/share/man/man5: rc.conf.5
        src/sys/altq: altq_cbq.c altq_hfsc.c altq_priq.c altq_red.c
        src/sys/dist/pf/net: if_pflog.c if_pflog.h pf.c pf_if.c pf_ioctl.c
            pf_norm.c pf_osfp.c pf_table.c pfvar.h
        src/sys/kern: init_main.c uipc_socket.c uipc_socket2.c
        src/sys/lkm/net/pf: Makefile
        src/sys/net: files.pf if.c if.h
        src/sys/netinet: ip_icmp.c
        src/sys/sys: mbuf.h socketvar.h
        src/usr.sbin/pf: Makefile compat_openbsd.h
        src/usr.sbin/pf/ftp-proxy: Makefile
        src/usr.sbin/pf/pfctl: Makefile
        src/usr.sbin/postinstall: postinstall
Added Files:
        src/dist/pf/libexec/tftp-proxy: Makefile filter.c filter.h tftp-proxy.8
            tftp-proxy.c
        src/dist/pf/usr.sbin/ftp-proxy: Makefile filter.c filter.h ftp-proxy.8
            ftp-proxy.c ipf.c ipf.h
        src/etc/rc.d: ftp_proxy
        src/sys/dist/pf/net: TODO if_compat.c if_compat.h pf_mtag.c pf_mtag.h
            pf_ruleset.c
        src/sys/dist/pf/netinet: tcp_rndiss.c tcp_rndiss.h
        src/usr.sbin/pf/tftp-proxy: Makefile
Removed Files:
        src/dist/pf/libexec/ftp-proxy: Makefile ftp-proxy.8 ftp-proxy.c
            getline.c ipf.c util.c util.h

Log Message:
merge yamt-pf42 branch.
(import newer pf from OpenBSD 4.2)

ok'ed by peter@.  requested by core@


To generate a diff of this commit:
cvs rdiff -r1.3 -r1.4 src/dist/pf/etc/pf.conf
cvs rdiff -r1.2 -r1.3 src/dist/pf/etc/pf.os
cvs rdiff -r1.2 -r0 src/dist/pf/libexec/ftp-proxy/Makefile
cvs rdiff -r1.10 -r0 src/dist/pf/libexec/ftp-proxy/ftp-proxy.8
cvs rdiff -r1.12 -r0 src/dist/pf/libexec/ftp-proxy/ftp-proxy.c
cvs rdiff -r1.3 -r0 src/dist/pf/libexec/ftp-proxy/getline.c
cvs rdiff -r1.4 -r0 src/dist/pf/libexec/ftp-proxy/ipf.c
cvs rdiff -r1.5 -r0 src/dist/pf/libexec/ftp-proxy/util.c \
    src/dist/pf/libexec/ftp-proxy/util.h
cvs rdiff -r0 -r1.2 src/dist/pf/libexec/tftp-proxy/Makefile \
    src/dist/pf/libexec/tftp-proxy/filter.c \
    src/dist/pf/libexec/tftp-proxy/filter.h \
    src/dist/pf/libexec/tftp-proxy/tftp-proxy.8 \
    src/dist/pf/libexec/tftp-proxy/tftp-proxy.c
cvs rdiff -r1.1.1.2 -r1.2 src/dist/pf/sbin/pfctl/Makefile
cvs rdiff -r1.10 -r1.11 src/dist/pf/sbin/pfctl/parse.y
cvs rdiff -r1.3 -r1.4 src/dist/pf/sbin/pfctl/pf_print_state.c
cvs rdiff -r1.6 -r1.7 src/dist/pf/sbin/pfctl/pfctl.8 \
    src/dist/pf/sbin/pfctl/pfctl_osfp.c src/dist/pf/sbin/pfctl/pfctl_table.c
cvs rdiff -r1.4 -r1.5 src/dist/pf/sbin/pfctl/pfctl.c \
    src/dist/pf/sbin/pfctl/pfctl.h src/dist/pf/sbin/pfctl/pfctl_parser.h \
    src/dist/pf/sbin/pfctl/pfctl_radix.c
cvs rdiff -r1.7 -r1.8 src/dist/pf/sbin/pfctl/pfctl_altq.c
cvs rdiff -r1.5 -r1.6 src/dist/pf/sbin/pfctl/pfctl_optimize.c
cvs rdiff -r1.9 -r1.10 src/dist/pf/sbin/pfctl/pfctl_parser.c
cvs rdiff -r1.1.1.1 -r1.2 src/dist/pf/sbin/pflogd/Makefile
cvs rdiff -r1.3 -r1.4 src/dist/pf/sbin/pflogd/pflogd.8 \
    src/dist/pf/sbin/pflogd/pflogd.h
cvs rdiff -r1.4 -r1.5 src/dist/pf/sbin/pflogd/pflogd.c
cvs rdiff -r1.5 -r1.6 src/dist/pf/sbin/pflogd/privsep.c
cvs rdiff -r1.6 -r1.7 src/dist/pf/share/man/man4/pf.4
cvs rdiff -r1.3 -r1.4 src/dist/pf/share/man/man4/pflog.4
cvs rdiff -r1.12 -r1.13 src/dist/pf/share/man/man5/pf.conf.5
cvs rdiff -r1.3 -r1.4 src/dist/pf/share/man/man5/pf.os.5
cvs rdiff -r1.1.1.1 -r1.2 src/dist/pf/share/pf/Makefile \
    src/dist/pf/share/pf/ackpri src/dist/pf/share/pf/faq-example1 \
    src/dist/pf/share/pf/faq-example2 src/dist/pf/share/pf/faq-example3 \
    src/dist/pf/share/pf/queue1 src/dist/pf/share/pf/queue2 \
    src/dist/pf/share/pf/queue3 src/dist/pf/share/pf/queue4 \
    src/dist/pf/share/pf/spamd
cvs rdiff -r1.6 -r1.7 src/dist/pf/usr.sbin/authpf/authpf.8
cvs rdiff -r1.5 -r1.6 src/dist/pf/usr.sbin/authpf/authpf.c
cvs rdiff -r0 -r1.2 src/dist/pf/usr.sbin/ftp-proxy/Makefile \
    src/dist/pf/usr.sbin/ftp-proxy/filter.c \
    src/dist/pf/usr.sbin/ftp-proxy/filter.h \
    src/dist/pf/usr.sbin/ftp-proxy/ftp-proxy.8 \
    src/dist/pf/usr.sbin/ftp-proxy/ftp-proxy.c \
    src/dist/pf/usr.sbin/ftp-proxy/ipf.c src/dist/pf/usr.sbin/ftp-proxy/ipf.h
cvs rdiff -r1.753 -r1.754 src/distrib/sets/lists/base/mi
cvs rdiff -r1.199 -r1.200 src/distrib/sets/lists/etc/mi
cvs rdiff -r1.1078 -r1.1079 src/distrib/sets/lists/man/mi
cvs rdiff -r1.368 -r1.369 src/etc/mtree/NetBSD.dist
cvs rdiff -r1.119 -r1.120 src/etc/mtree/special
cvs rdiff -r1.67 -r1.68 src/etc/rc.d/Makefile
cvs rdiff -r0 -r1.2 src/etc/rc.d/ftp_proxy
cvs rdiff -r1.2 -r1.3 src/etc/rc.d/pflogd
cvs rdiff -r1.118 -r1.119 src/share/man/man5/rc.conf.5
cvs rdiff -r1.24 -r1.25 src/sys/altq/altq_cbq.c
cvs rdiff -r1.23 -r1.24 src/sys/altq/altq_hfsc.c
cvs rdiff -r1.19 -r1.20 src/sys/altq/altq_priq.c
cvs rdiff -r1.27 -r1.28 src/sys/altq/altq_red.c
cvs rdiff -r0 -r1.2 src/sys/dist/pf/net/TODO src/sys/dist/pf/net/if_compat.c \
    src/sys/dist/pf/net/if_compat.h src/sys/dist/pf/net/pf_mtag.c \
    src/sys/dist/pf/net/pf_mtag.h src/sys/dist/pf/net/pf_ruleset.c
cvs rdiff -r1.11 -r1.12 src/sys/dist/pf/net/if_pflog.c
cvs rdiff -r1.4 -r1.5 src/sys/dist/pf/net/if_pflog.h
cvs rdiff -r1.51 -r1.52 src/sys/dist/pf/net/pf.c
cvs rdiff -r1.15 -r1.16 src/sys/dist/pf/net/pf_if.c \
    src/sys/dist/pf/net/pfvar.h
cvs rdiff -r1.32 -r1.33 src/sys/dist/pf/net/pf_ioctl.c
cvs rdiff -r1.18 -r1.19 src/sys/dist/pf/net/pf_norm.c
cvs rdiff -r1.7 -r1.8 src/sys/dist/pf/net/pf_osfp.c
cvs rdiff -r1.13 -r1.14 src/sys/dist/pf/net/pf_table.c
cvs rdiff -r0 -r1.2 src/sys/dist/pf/netinet/tcp_rndiss.c \
    src/sys/dist/pf/netinet/tcp_rndiss.h
cvs rdiff -r1.359 -r1.360 src/sys/kern/init_main.c
cvs rdiff -r1.167 -r1.168 src/sys/kern/uipc_socket.c
cvs rdiff -r1.95 -r1.96 src/sys/kern/uipc_socket2.c
cvs rdiff -r1.6 -r1.7 src/sys/lkm/net/pf/Makefile
cvs rdiff -r1.3 -r1.4 src/sys/net/files.pf
cvs rdiff -r1.226 -r1.227 src/sys/net/if.c
cvs rdiff -r1.138 -r1.139 src/sys/net/if.h
cvs rdiff -r1.119 -r1.120 src/sys/netinet/ip_icmp.c
cvs rdiff -r1.142 -r1.143 src/sys/sys/mbuf.h
cvs rdiff -r1.110 -r1.111 src/sys/sys/socketvar.h
cvs rdiff -r1.7 -r1.8 src/usr.sbin/pf/Makefile
cvs rdiff -r1.4 -r1.5 src/usr.sbin/pf/compat_openbsd.h
cvs rdiff -r1.2 -r1.3 src/usr.sbin/pf/ftp-proxy/Makefile
cvs rdiff -r1.3 -r1.4 src/usr.sbin/pf/pfctl/Makefile
cvs rdiff -r0 -r1.2 src/usr.sbin/pf/tftp-proxy/Makefile
cvs rdiff -r1.61 -r1.62 src/usr.sbin/postinstall/postinstall

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