Module Name:	src
Committed By:	pavel
Date:		Tue May 22 22:52:10 UTC 2007

Modified Files:
	src/regress/sys/kern/ipf [netbsd-4]: Makefile
	src/regress/sys/kern/ipf/expected [netbsd-4]: i11 i4 i9
	src/sys/dist/ipf/netinet [netbsd-4]: fil.c ip_compat.h ip_fil.h
	    ip_fil_netbsd.c ip_ftp_pxy.c ip_nat.c ip_nat.h ip_proxy.c
	    ip_state.c ip_state.h ipl.h
	src/usr.sbin/ipf/libipf [netbsd-4]: Makefile

Log Message:
Pull up following revision(s) (requested by martin in ticket #656):
	sys/dist/ipf/netinet/fil.c		sync with ipfilter-4-1-22-pullup
	sys/dist/ipf/netinet/ip_compat.h	sync with ipfilter-4-1-22-pullup
	sys/dist/ipf/netinet/ip_fil.h		sync with ipfilter-4-1-22-pullup
	sys/dist/ipf/netinet/ip_fil_netbsd.c	sync with ipfilter-4-1-22-pullup
	sys/dist/ipf/netinet/ip_ftp_pxy.c	sync with ipfilter-4-1-22-pullup
	sys/dist/ipf/netinet/ip_nat.c		sync with ipfilter-4-1-22-pullup
	sys/dist/ipf/netinet/ip_nat.h		sync with ipfilter-4-1-22-pullup
	sys/dist/ipf/netinet/ip_proxy.c		sync with ipfilter-4-1-22-pullup
	sys/dist/ipf/netinet/ip_state.c		sync with ipfilter-4-1-22-pullup
	sys/dist/ipf/netinet/ip_state.h		sync with ipfilter-4-1-22-pullup
	sys/dist/ipf/netinet/ipl.h		sync with ipfilter-4-1-22-pullup
	dist/ipf/HISTORY			sync with ipfilter-4-1-22-pullup
	dist/ipf/Makefile			sync with ipfilter-4-1-22-pullup
	dist/ipf/ip_fil.c			sync with ipfilter-4-1-22-pullup
	dist/ipf/ipf.h				sync with ipfilter-4-1-22-pullup
	dist/ipf/mlfk_ipl.c			sync with ipfilter-4-1-22-pullup
	dist/ipf/lib/Makefile			sync with ipfilter-4-1-22-pullup
	dist/ipf/lib/printfr.c			sync with ipfilter-4-1-22-pullup
	dist/ipf/lib/printstate.c		sync with ipfilter-4-1-22-pullup
	dist/ipf/lib/printtqtable.c		sync with ipfilter-4-1-22-pullup
	dist/ipf/man/ipf.8			sync with ipfilter-4-1-22-pullup
	dist/ipf/man/ipfstat.8			sync with ipfilter-4-1-22-pullup
	dist/ipf/tools/ipf.c			sync with ipfilter-4-1-22-pullup
	dist/ipf/tools/ipfcomp.c		sync with ipfilter-4-1-22-pullup
	dist/ipf/tools/ipfstat.c		sync with ipfilter-4-1-22-pullup
	dist/ipf/tools/ipnat.c			sync with ipfilter-4-1-22-pullup
	regress/sys/kern/ipf/Makefile		sync with ipfilter-4-1-22-pullup
	regress/sys/kern/ipf/expected/i11	sync with ipfilter-4-1-22-pullup
	regress/sys/kern/ipf/expected/i4	sync with ipfilter-4-1-22-pullup
	regress/sys/kern/ipf/expected/i9	sync with ipfilter-4-1-22-pullup
	usr.sbin/ipf/libipf/Makefile		sync with ipfilter-4-1-22-pullup
Update IP-Filter to 4.1.22.
(Using a helper tag ipfilter-4-1-22-pullup created on HEAD.)


To generate a diff of this commit:
cvs rdiff -r1.11.4.1 -r1.11.4.2 src/regress/sys/kern/ipf/Makefile
cvs rdiff -r1.1.1.3 -r1.1.1.3.4.1 src/regress/sys/kern/ipf/expected/i11
cvs rdiff -r1.1.1.4 -r1.1.1.4.4.1 src/regress/sys/kern/ipf/expected/i4 \
    src/regress/sys/kern/ipf/expected/i9
cvs rdiff -r1.28.2.1 -r1.28.2.2 src/sys/dist/ipf/netinet/fil.c \
    src/sys/dist/ipf/netinet/ip_fil_netbsd.c
cvs rdiff -r1.11.12.1 -r1.11.12.2 src/sys/dist/ipf/netinet/ip_compat.h
cvs rdiff -r1.6.12.1 -r1.6.12.2 src/sys/dist/ipf/netinet/ip_fil.h \
    src/sys/dist/ipf/netinet/ipl.h
cvs rdiff -r1.10.12.1 -r1.10.12.2 src/sys/dist/ipf/netinet/ip_ftp_pxy.c
cvs rdiff -r1.19.2.2 -r1.19.2.3 src/sys/dist/ipf/netinet/ip_nat.c
cvs rdiff -r1.7.12.1 -r1.7.12.2 src/sys/dist/ipf/netinet/ip_nat.h
cvs rdiff -r1.11.6.1 -r1.11.6.2 src/sys/dist/ipf/netinet/ip_proxy.c
cvs rdiff -r1.15.2.2 -r1.15.2.3 src/sys/dist/ipf/netinet/ip_state.c
cvs rdiff -r1.5.12.1 -r1.5.12.2 src/sys/dist/ipf/netinet/ip_state.h
cvs rdiff -r1.6.4.1 -r1.6.4.2 src/usr.sbin/ipf/libipf/Makefile

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