aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2013-07-19 05:41:57 +0000
committerCy Schubert <cy@FreeBSD.org>2013-07-19 05:41:57 +0000
commitf27f47054d2675045dce8688b408aa9340a118f7 (patch)
tree225b5acf68c01bc6a260b386c2b2dbf4fa2839e3
parent39ff65a633dd44a40233913b84b347003c732868 (diff)
downloadsrc-f27f47054d2675045dce8688b408aa9340a118f7.tar.gz
src-f27f47054d2675045dce8688b408aa9340a118f7.zip
As per the developers handbook (5.3.1 step 1), prepare the vendor trees for
import of new ipfilter vendor sources by flattening them. To keep the tags consistent with dist, the tags are also flattened. Approved by: glebius (Mentor)
Notes
Notes: svn path=/vendor/ipfilter/dist/; revision=253467
-rw-r--r--.cvsignore (renamed from contrib/ipfilter/.cvsignore)0
-rw-r--r--BNF (renamed from contrib/ipfilter/BNF)0
-rw-r--r--BSD/.cvsignore (renamed from contrib/ipfilter/BSD/.cvsignore)0
-rw-r--r--BSD/Makefile (renamed from contrib/ipfilter/BSD/Makefile)0
-rw-r--r--BSD/Makefile.ipsend (renamed from contrib/ipfilter/BSD/Makefile.ipsend)0
-rwxr-xr-xBSD/ipfadm-rcd (renamed from contrib/ipfilter/BSD/ipfadm-rcd)0
-rw-r--r--BSD/kupgrade (renamed from contrib/ipfilter/BSD/kupgrade)0
-rwxr-xr-xBSD/make-devices (renamed from contrib/ipfilter/BSD/make-devices)0
-rw-r--r--BugReport (renamed from contrib/ipfilter/BugReport)0
-rw-r--r--COMPILE.2.5 (renamed from contrib/ipfilter/COMPILE.2.5)0
-rw-r--r--COMPILE.Solaris2 (renamed from contrib/ipfilter/COMPILE.Solaris2)0
-rw-r--r--FAQ.FreeBSD (renamed from contrib/ipfilter/FAQ.FreeBSD)0
-rw-r--r--FWTK/FWTK.sed (renamed from contrib/ipfilter/FWTK/FWTK.sed)0
-rw-r--r--FWTK/Index (renamed from contrib/ipfilter/FWTK/Index)0
-rw-r--r--FWTK/README (renamed from contrib/ipfilter/FWTK/README)0
-rw-r--r--FWTK/README.ipfilter (renamed from contrib/ipfilter/FWTK/README.ipfilter)0
-rw-r--r--FWTK/ftp-gw.diff (renamed from contrib/ipfilter/FWTK/ftp-gw.diff)0
-rw-r--r--FWTK/fwtk-2.1-transparency.txt (renamed from contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt)0
-rw-r--r--FWTK/fwtk_transparent.diff (renamed from contrib/ipfilter/FWTK/fwtk_transparent.diff)0
-rw-r--r--FWTK/fwtkp (renamed from contrib/ipfilter/FWTK/fwtkp)0
-rw-r--r--FWTK/tproxy.diff (renamed from contrib/ipfilter/FWTK/tproxy.diff)0
-rw-r--r--FreeBSD-2.2/files.diffs (renamed from contrib/ipfilter/FreeBSD-2.2/files.diffs)0
-rw-r--r--FreeBSD-2.2/files.newconf.diffs (renamed from contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs)0
-rw-r--r--FreeBSD-2.2/in_proto.c.diffs (renamed from contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs)0
-rw-r--r--FreeBSD-2.2/ip_input.c.diffs (renamed from contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs)0
-rw-r--r--FreeBSD-2.2/ip_output.c.diffs (renamed from contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs)0
-rwxr-xr-xFreeBSD-2.2/kinstall (renamed from contrib/ipfilter/FreeBSD-2.2/kinstall)0
-rwxr-xr-xFreeBSD-2.2/minstall (renamed from contrib/ipfilter/FreeBSD-2.2/minstall)0
-rwxr-xr-xFreeBSD-2.2/unkinstall (renamed from contrib/ipfilter/FreeBSD-2.2/unkinstall)0
-rwxr-xr-xFreeBSD-2.2/unminstall (renamed from contrib/ipfilter/FreeBSD-2.2/unminstall)0
-rw-r--r--FreeBSD-3/INST.FreeBSD-3 (renamed from contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3)0
-rwxr-xr-xFreeBSD-3/kinstall (renamed from contrib/ipfilter/FreeBSD-3/kinstall)0
-rwxr-xr-xFreeBSD-3/unkinstall (renamed from contrib/ipfilter/FreeBSD-3/unkinstall)0
-rw-r--r--FreeBSD-4.0/INST.FreeBSD-4 (renamed from contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4)0
-rwxr-xr-xFreeBSD-4.0/ipv6-patch (renamed from contrib/ipfilter/FreeBSD-4.0/ipv6-patch)0
-rwxr-xr-xFreeBSD-4.0/ipv6-patch-4.0 (renamed from contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0)0
-rw-r--r--FreeBSD-4.0/ipv6-patch-4.1 (renamed from contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1)0
-rw-r--r--FreeBSD-4.0/ipv6-patch-4.2 (renamed from contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2)0
-rwxr-xr-xFreeBSD-4.0/kinstall (renamed from contrib/ipfilter/FreeBSD-4.0/kinstall)0
-rwxr-xr-xFreeBSD-4.0/unkinstall (renamed from contrib/ipfilter/FreeBSD-4.0/unkinstall)0
-rw-r--r--FreeBSD/conf.c.diffs (renamed from contrib/ipfilter/FreeBSD/conf.c.diffs)0
-rw-r--r--FreeBSD/files.diffs (renamed from contrib/ipfilter/FreeBSD/files.diffs)0
-rw-r--r--FreeBSD/files.newconf.diffs (renamed from contrib/ipfilter/FreeBSD/files.newconf.diffs)0
-rw-r--r--FreeBSD/files.oldconf.diffs (renamed from contrib/ipfilter/FreeBSD/files.oldconf.diffs)0
-rw-r--r--FreeBSD/filez.diffs (renamed from contrib/ipfilter/FreeBSD/filez.diffs)0
-rw-r--r--FreeBSD/in_proto.c.diffs (renamed from contrib/ipfilter/FreeBSD/in_proto.c.diffs)0
-rw-r--r--FreeBSD/ip_input.c.diffs (renamed from contrib/ipfilter/FreeBSD/ip_input.c.diffs)0
-rw-r--r--FreeBSD/ip_output.c.diffs (renamed from contrib/ipfilter/FreeBSD/ip_output.c.diffs)0
-rwxr-xr-xFreeBSD/kinstall (renamed from contrib/ipfilter/FreeBSD/kinstall)0
-rwxr-xr-xFreeBSD/minstall (renamed from contrib/ipfilter/FreeBSD/minstall)0
-rwxr-xr-xFreeBSD/unkinstall (renamed from contrib/ipfilter/FreeBSD/unkinstall)0
-rwxr-xr-xFreeBSD/unminstall (renamed from contrib/ipfilter/FreeBSD/unminstall)0
-rw-r--r--HISTORY (renamed from contrib/ipfilter/HISTORY)0
-rw-r--r--IMPORTANT (renamed from contrib/ipfilter/IMPORTANT)0
-rw-r--r--INST.FreeBSD-2.2 (renamed from contrib/ipfilter/INST.FreeBSD-2.2)0
-rw-r--r--INSTALL.BSDOS (renamed from contrib/ipfilter/INSTALL.BSDOS)0
-rw-r--r--INSTALL.BSDOS3 (renamed from contrib/ipfilter/INSTALL.BSDOS3)0
-rw-r--r--INSTALL.FreeBSD (renamed from contrib/ipfilter/INSTALL.FreeBSD)0
-rw-r--r--INSTALL.IRIX (renamed from contrib/ipfilter/INSTALL.IRIX)0
-rw-r--r--INSTALL.Linux (renamed from contrib/ipfilter/INSTALL.Linux)0
-rw-r--r--INSTALL.NetBSD (renamed from contrib/ipfilter/INSTALL.NetBSD)0
-rw-r--r--INSTALL.Sol2 (renamed from contrib/ipfilter/INSTALL.Sol2)0
-rw-r--r--INSTALL.SunOS (renamed from contrib/ipfilter/INSTALL.SunOS)0
-rw-r--r--INSTALL.xBSD (renamed from contrib/ipfilter/INSTALL.xBSD)0
-rw-r--r--IPF.KANJI (renamed from contrib/ipfilter/IPF.KANJI)0
-rw-r--r--IPFILTER.LICENCE (renamed from contrib/ipfilter/IPFILTER.LICENCE)0
-rw-r--r--LICENCE (renamed from contrib/ipfilter/LICENCE)0
-rw-r--r--Makefile (renamed from contrib/ipfilter/Makefile)0
-rw-r--r--NAT.FreeBSD (renamed from contrib/ipfilter/NAT.FreeBSD)0
-rw-r--r--QNX_OCL.txt (renamed from contrib/ipfilter/QNX_OCL.txt)0
-rw-r--r--README (renamed from contrib/ipfilter/README)0
-rw-r--r--STYLE.TXT (renamed from contrib/ipfilter/STYLE.TXT)0
-rw-r--r--UPGRADE_NOTICE (renamed from contrib/ipfilter/UPGRADE_NOTICE)0
-rw-r--r--WhatsNew40.txt (renamed from contrib/ipfilter/WhatsNew40.txt)0
-rw-r--r--Y2K (renamed from contrib/ipfilter/Y2K)0
-rw-r--r--bpf-ipf.h (renamed from contrib/ipfilter/bpf-ipf.h)0
-rw-r--r--bpf.h (renamed from contrib/ipfilter/bpf.h)0
-rw-r--r--bpf_filter.c (renamed from contrib/ipfilter/bpf_filter.c)0
-rwxr-xr-xbsdinstall (renamed from contrib/ipfilter/bsdinstall)0
-rwxr-xr-xbuildlinux (renamed from contrib/ipfilter/buildlinux)0
-rwxr-xr-xbuildsunos (renamed from contrib/ipfilter/buildsunos)0
-rw-r--r--common.c (renamed from contrib/ipfilter/common.c)0
-rw-r--r--etc/etc.sed (renamed from contrib/ipfilter/etc/etc.sed)0
-rw-r--r--etc/protocols (renamed from contrib/ipfilter/etc/protocols)0
-rw-r--r--etc/services (renamed from contrib/ipfilter/etc/services)0
-rw-r--r--facpri.c (renamed from contrib/ipfilter/facpri.c)0
-rw-r--r--facpri.h (renamed from contrib/ipfilter/facpri.h)0
-rw-r--r--fil.c (renamed from contrib/ipfilter/fil.c)0
-rw-r--r--fils.c (renamed from contrib/ipfilter/fils.c)0
-rw-r--r--inet_addr.c (renamed from contrib/ipfilter/inet_addr.c)0
-rw-r--r--ip_auth.c (renamed from contrib/ipfilter/ip_auth.c)0
-rw-r--r--ip_auth.h (renamed from contrib/ipfilter/ip_auth.h)0
-rw-r--r--ip_compat.h (renamed from contrib/ipfilter/ip_compat.h)0
-rw-r--r--ip_fil.c (renamed from contrib/ipfilter/ip_fil.c)0
-rw-r--r--ip_fil.h (renamed from contrib/ipfilter/ip_fil.h)0
-rw-r--r--ip_fil_freebsd.c (renamed from contrib/ipfilter/ip_fil_freebsd.c)0
-rw-r--r--ip_frag.c (renamed from contrib/ipfilter/ip_frag.c)0
-rw-r--r--ip_frag.h (renamed from contrib/ipfilter/ip_frag.h)0
-rw-r--r--ip_ftp_pxy.c (renamed from contrib/ipfilter/ip_ftp_pxy.c)0
-rw-r--r--ip_h323_pxy.c (renamed from contrib/ipfilter/ip_h323_pxy.c)0
-rw-r--r--ip_htable.c (renamed from contrib/ipfilter/ip_htable.c)0
-rw-r--r--ip_htable.h (renamed from contrib/ipfilter/ip_htable.h)0
-rw-r--r--ip_ipsec_pxy.c (renamed from contrib/ipfilter/ip_ipsec_pxy.c)0
-rw-r--r--ip_irc_pxy.c (renamed from contrib/ipfilter/ip_irc_pxy.c)0
-rw-r--r--ip_lfil.c (renamed from contrib/ipfilter/ip_lfil.c)0
-rw-r--r--ip_log.c (renamed from contrib/ipfilter/ip_log.c)0
-rw-r--r--ip_lookup.c (renamed from contrib/ipfilter/ip_lookup.c)0
-rw-r--r--ip_lookup.h (renamed from contrib/ipfilter/ip_lookup.h)0
-rw-r--r--ip_msnrpc_pxy.c (renamed from contrib/ipfilter/ip_msnrpc_pxy.c)0
-rw-r--r--ip_nat.c (renamed from contrib/ipfilter/ip_nat.c)0
-rw-r--r--ip_nat.h (renamed from contrib/ipfilter/ip_nat.h)0
-rw-r--r--ip_netbios_pxy.c (renamed from contrib/ipfilter/ip_netbios_pxy.c)0
-rw-r--r--ip_pool.c (renamed from contrib/ipfilter/ip_pool.c)0
-rw-r--r--ip_pool.h (renamed from contrib/ipfilter/ip_pool.h)0
-rw-r--r--ip_pptp_pxy.c (renamed from contrib/ipfilter/ip_pptp_pxy.c)0
-rw-r--r--ip_proxy.c (renamed from contrib/ipfilter/ip_proxy.c)0
-rw-r--r--ip_proxy.h (renamed from contrib/ipfilter/ip_proxy.h)0
-rw-r--r--ip_raudio_pxy.c (renamed from contrib/ipfilter/ip_raudio_pxy.c)0
-rw-r--r--ip_rcmd_pxy.c (renamed from contrib/ipfilter/ip_rcmd_pxy.c)0
-rw-r--r--ip_rpcb_pxy.c (renamed from contrib/ipfilter/ip_rpcb_pxy.c)0
-rw-r--r--ip_scan.c (renamed from contrib/ipfilter/ip_scan.c)0
-rw-r--r--ip_scan.h (renamed from contrib/ipfilter/ip_scan.h)0
-rw-r--r--ip_sfil.c (renamed from contrib/ipfilter/ip_sfil.c)0
-rw-r--r--ip_state.c (renamed from contrib/ipfilter/ip_state.c)0
-rw-r--r--ip_state.h (renamed from contrib/ipfilter/ip_state.h)0
-rw-r--r--ip_sync.c (renamed from contrib/ipfilter/ip_sync.c)0
-rw-r--r--ip_sync.h (renamed from contrib/ipfilter/ip_sync.h)0
-rw-r--r--ipf.c (renamed from contrib/ipfilter/ipf.c)0
-rw-r--r--ipf.h (renamed from contrib/ipfilter/ipf.h)0
-rw-r--r--ipfs.c (renamed from contrib/ipfilter/ipfs.c)0
-rw-r--r--ipft_ef.c (renamed from contrib/ipfilter/ipft_ef.c)0
-rw-r--r--ipft_hx.c (renamed from contrib/ipfilter/ipft_hx.c)0
-rw-r--r--ipft_pc.c (renamed from contrib/ipfilter/ipft_pc.c)0
-rw-r--r--ipft_sn.c (renamed from contrib/ipfilter/ipft_sn.c)0
-rw-r--r--ipft_td.c (renamed from contrib/ipfilter/ipft_td.c)0
-rw-r--r--ipft_tx.c (renamed from contrib/ipfilter/ipft_tx.c)0
-rw-r--r--ipl.h (renamed from contrib/ipfilter/ipl.h)0
-rw-r--r--ipl_ldev.c (renamed from contrib/ipfilter/ipl_ldev.c)0
-rw-r--r--iplang/.cvsignore (renamed from contrib/ipfilter/iplang/.cvsignore)0
-rw-r--r--iplang/BNF (renamed from contrib/ipfilter/iplang/BNF)0
-rw-r--r--iplang/Makefile (renamed from contrib/ipfilter/iplang/Makefile)0
-rw-r--r--iplang/iplang.h (renamed from contrib/ipfilter/iplang/iplang.h)0
-rw-r--r--iplang/iplang.tst (renamed from contrib/ipfilter/iplang/iplang.tst)0
-rw-r--r--iplang/iplang_l.l (renamed from contrib/ipfilter/iplang/iplang_l.l)0
-rw-r--r--iplang/iplang_y.y (renamed from contrib/ipfilter/iplang/iplang_y.y)0
-rw-r--r--ipmon.c (renamed from contrib/ipfilter/ipmon.c)0
-rw-r--r--ipmon.h (renamed from contrib/ipfilter/ipmon.h)0
-rw-r--r--ipnat.c (renamed from contrib/ipfilter/ipnat.c)0
-rw-r--r--ipsd/Celler/ip_compat.h (renamed from contrib/ipfilter/ipsd/Celler/ip_compat.h)0
-rw-r--r--ipsd/Makefile (renamed from contrib/ipfilter/ipsd/Makefile)0
-rw-r--r--ipsd/README (renamed from contrib/ipfilter/ipsd/README)0
-rw-r--r--ipsd/ip_compat.h (renamed from contrib/ipfilter/ipsd/ip_compat.h)0
-rw-r--r--ipsd/ipsd.c (renamed from contrib/ipfilter/ipsd/ipsd.c)0
-rw-r--r--ipsd/ipsd.h (renamed from contrib/ipfilter/ipsd/ipsd.h)0
-rw-r--r--ipsd/ipsd.sed (renamed from contrib/ipfilter/ipsd/ipsd.sed)0
-rw-r--r--ipsd/ipsdr.c (renamed from contrib/ipfilter/ipsd/ipsdr.c)0
-rw-r--r--ipsd/linux.h (renamed from contrib/ipfilter/ipsd/linux.h)0
-rw-r--r--ipsd/sbpf.c (renamed from contrib/ipfilter/ipsd/sbpf.c)0
-rw-r--r--ipsd/sdlpi.c (renamed from contrib/ipfilter/ipsd/sdlpi.c)0
-rw-r--r--ipsd/slinux.c (renamed from contrib/ipfilter/ipsd/slinux.c)0
-rw-r--r--ipsd/snit.c (renamed from contrib/ipfilter/ipsd/snit.c)0
-rw-r--r--ipsend/.OLD/ip_compat.h (renamed from contrib/ipfilter/ipsend/.OLD/ip_compat.h)0
-rw-r--r--ipsend/.cvsignore (renamed from contrib/ipfilter/ipsend/.cvsignore)0
-rw-r--r--ipsend/44arp.c (renamed from contrib/ipfilter/ipsend/44arp.c)0
-rw-r--r--ipsend/Crashable (renamed from contrib/ipfilter/ipsend/Crashable)0
-rw-r--r--ipsend/Makefile (renamed from contrib/ipfilter/ipsend/Makefile)0
-rw-r--r--ipsend/README (renamed from contrib/ipfilter/ipsend/README)0
-rw-r--r--ipsend/arp.c (renamed from contrib/ipfilter/ipsend/arp.c)0
-rw-r--r--ipsend/dlcommon.c (renamed from contrib/ipfilter/ipsend/dlcommon.c)0
-rw-r--r--ipsend/dltest.h (renamed from contrib/ipfilter/ipsend/dltest.h)0
-rw-r--r--ipsend/hpux.c (renamed from contrib/ipfilter/ipsend/hpux.c)0
-rw-r--r--ipsend/in_var.h (renamed from contrib/ipfilter/ipsend/in_var.h)0
-rw-r--r--ipsend/ip.c (renamed from contrib/ipfilter/ipsend/ip.c)0
-rw-r--r--ipsend/ip_compat.h (renamed from contrib/ipfilter/ipsend/ip_compat.h)0
-rw-r--r--ipsend/ip_var.h (renamed from contrib/ipfilter/ipsend/ip_var.h)0
-rw-r--r--ipsend/ipresend.1 (renamed from contrib/ipfilter/ipsend/ipresend.1)0
-rw-r--r--ipsend/ipresend.c (renamed from contrib/ipfilter/ipsend/ipresend.c)0
-rw-r--r--ipsend/ipsend.1 (renamed from contrib/ipfilter/ipsend/ipsend.1)0
-rw-r--r--ipsend/ipsend.5 (renamed from contrib/ipfilter/ipsend/ipsend.5)0
-rw-r--r--ipsend/ipsend.c (renamed from contrib/ipfilter/ipsend/ipsend.c)0
-rw-r--r--ipsend/ipsend.h (renamed from contrib/ipfilter/ipsend/ipsend.h)0
-rw-r--r--ipsend/ipsend.sed (renamed from contrib/ipfilter/ipsend/ipsend.sed)0
-rw-r--r--ipsend/ipsopt.c (renamed from contrib/ipfilter/ipsend/ipsopt.c)0
-rw-r--r--ipsend/iptest.1 (renamed from contrib/ipfilter/ipsend/iptest.1)0
-rw-r--r--ipsend/iptest.c (renamed from contrib/ipfilter/ipsend/iptest.c)0
-rw-r--r--ipsend/iptests.c (renamed from contrib/ipfilter/ipsend/iptests.c)0
-rw-r--r--ipsend/larp.c (renamed from contrib/ipfilter/ipsend/larp.c)0
-rw-r--r--ipsend/linux.h (renamed from contrib/ipfilter/ipsend/linux.h)0
-rw-r--r--ipsend/lsock.c (renamed from contrib/ipfilter/ipsend/lsock.c)0
-rw-r--r--ipsend/resend.c (renamed from contrib/ipfilter/ipsend/resend.c)0
-rw-r--r--ipsend/sbpf.c (renamed from contrib/ipfilter/ipsend/sbpf.c)0
-rw-r--r--ipsend/sdlpi.c (renamed from contrib/ipfilter/ipsend/sdlpi.c)0
-rw-r--r--ipsend/sirix.c (renamed from contrib/ipfilter/ipsend/sirix.c)0
-rw-r--r--ipsend/slinux.c (renamed from contrib/ipfilter/ipsend/slinux.c)0
-rw-r--r--ipsend/snit.c (renamed from contrib/ipfilter/ipsend/snit.c)0
-rw-r--r--ipsend/sock.c (renamed from contrib/ipfilter/ipsend/sock.c)0
-rw-r--r--ipsend/sockraw.c (renamed from contrib/ipfilter/ipsend/sockraw.c)0
-rw-r--r--ipsend/tcpip.h (renamed from contrib/ipfilter/ipsend/tcpip.h)0
-rw-r--r--ipsend/ultrix.c (renamed from contrib/ipfilter/ipsend/ultrix.c)0
-rw-r--r--ipt.c (renamed from contrib/ipfilter/ipt.c)0
-rw-r--r--ipt.h (renamed from contrib/ipfilter/ipt.h)0
-rw-r--r--kmem.c (renamed from contrib/ipfilter/kmem.c)0
-rw-r--r--kmem.h (renamed from contrib/ipfilter/kmem.h)0
-rw-r--r--l4check/Makefile (renamed from contrib/ipfilter/l4check/Makefile)0
-rw-r--r--l4check/http.check (renamed from contrib/ipfilter/l4check/http.check)0
-rw-r--r--l4check/http.ok (renamed from contrib/ipfilter/l4check/http.ok)0
-rw-r--r--l4check/l4check.c (renamed from contrib/ipfilter/l4check/l4check.c)0
-rw-r--r--l4check/l4check.conf (renamed from contrib/ipfilter/l4check/l4check.conf)0
-rw-r--r--lib/Makefile (renamed from contrib/ipfilter/lib/Makefile)0
-rw-r--r--lib/addicmp.c (renamed from contrib/ipfilter/lib/addicmp.c)0
-rw-r--r--lib/addipopt.c (renamed from contrib/ipfilter/lib/addipopt.c)0
-rw-r--r--lib/addkeep.c (renamed from contrib/ipfilter/lib/addkeep.c)0
-rw-r--r--lib/alist_free.c (renamed from contrib/ipfilter/lib/alist_free.c)0
-rw-r--r--lib/alist_new.c (renamed from contrib/ipfilter/lib/alist_new.c)0
-rw-r--r--lib/bcopywrap.c (renamed from contrib/ipfilter/lib/bcopywrap.c)0
-rw-r--r--lib/binprint.c (renamed from contrib/ipfilter/lib/binprint.c)0
-rw-r--r--lib/buildopts.c (renamed from contrib/ipfilter/lib/buildopts.c)0
-rw-r--r--lib/checkrev.c (renamed from contrib/ipfilter/lib/checkrev.c)0
-rw-r--r--lib/count4bits.c (renamed from contrib/ipfilter/lib/count4bits.c)0
-rw-r--r--lib/count6bits.c (renamed from contrib/ipfilter/lib/count6bits.c)0
-rw-r--r--lib/debug.c (renamed from contrib/ipfilter/lib/debug.c)0
-rw-r--r--lib/extras.c (renamed from contrib/ipfilter/lib/extras.c)0
-rw-r--r--lib/facpri.c (renamed from contrib/ipfilter/lib/facpri.c)0
-rw-r--r--lib/facpri.h (renamed from contrib/ipfilter/lib/facpri.h)0
-rw-r--r--lib/fill6bits.c (renamed from contrib/ipfilter/lib/fill6bits.c)0
-rw-r--r--lib/flags.c (renamed from contrib/ipfilter/lib/flags.c)0
-rw-r--r--lib/genmask.c (renamed from contrib/ipfilter/lib/genmask.c)0
-rw-r--r--lib/gethost.c (renamed from contrib/ipfilter/lib/gethost.c)0
-rw-r--r--lib/getifname.c (renamed from contrib/ipfilter/lib/getifname.c)0
-rw-r--r--lib/getline.c (renamed from contrib/ipfilter/lib/getline.c)0
-rw-r--r--lib/getnattype.c (renamed from contrib/ipfilter/lib/getnattype.c)0
-rw-r--r--lib/getport.c (renamed from contrib/ipfilter/lib/getport.c)0
-rw-r--r--lib/getportproto.c (renamed from contrib/ipfilter/lib/getportproto.c)0
-rw-r--r--lib/getproto.c (renamed from contrib/ipfilter/lib/getproto.c)0
-rw-r--r--lib/getsumd.c (renamed from contrib/ipfilter/lib/getsumd.c)0
-rw-r--r--lib/hexdump.c (renamed from contrib/ipfilter/lib/hexdump.c)0
-rw-r--r--lib/hostmask.c (renamed from contrib/ipfilter/lib/hostmask.c)0
-rw-r--r--lib/hostname.c (renamed from contrib/ipfilter/lib/hostname.c)0
-rw-r--r--lib/hostnum.c (renamed from contrib/ipfilter/lib/hostnum.c)0
-rw-r--r--lib/icmpcode.c (renamed from contrib/ipfilter/lib/icmpcode.c)0
-rw-r--r--lib/inet_addr.c (renamed from contrib/ipfilter/lib/inet_addr.c)0
-rw-r--r--lib/initparse.c (renamed from contrib/ipfilter/lib/initparse.c)0
-rw-r--r--lib/ionames.c (renamed from contrib/ipfilter/lib/ionames.c)0
-rw-r--r--lib/ipf_dotuning.c (renamed from contrib/ipfilter/lib/ipf_dotuning.c)0
-rw-r--r--lib/ipft_ef.c (renamed from contrib/ipfilter/lib/ipft_ef.c)0
-rw-r--r--lib/ipft_hx.c (renamed from contrib/ipfilter/lib/ipft_hx.c)0
-rw-r--r--lib/ipft_pc.c (renamed from contrib/ipfilter/lib/ipft_pc.c)0
-rw-r--r--lib/ipft_sn.c (renamed from contrib/ipfilter/lib/ipft_sn.c)0
-rw-r--r--lib/ipft_td.c (renamed from contrib/ipfilter/lib/ipft_td.c)0
-rw-r--r--lib/ipft_tx.c (renamed from contrib/ipfilter/lib/ipft_tx.c)0
-rw-r--r--lib/ipoptsec.c (renamed from contrib/ipfilter/lib/ipoptsec.c)0
-rw-r--r--lib/kmem.c (renamed from contrib/ipfilter/lib/kmem.c)0
-rw-r--r--lib/kmem.h (renamed from contrib/ipfilter/lib/kmem.h)0
-rw-r--r--lib/kmemcpywrap.c (renamed from contrib/ipfilter/lib/kmemcpywrap.c)0
-rw-r--r--lib/kvatoname.c (renamed from contrib/ipfilter/lib/kvatoname.c)0
-rw-r--r--lib/load_file.c (renamed from contrib/ipfilter/lib/load_file.c)0
-rw-r--r--lib/load_hash.c (renamed from contrib/ipfilter/lib/load_hash.c)0
-rw-r--r--lib/load_hashnode.c (renamed from contrib/ipfilter/lib/load_hashnode.c)0
-rw-r--r--lib/load_http.c (renamed from contrib/ipfilter/lib/load_http.c)0
-rw-r--r--lib/load_pool.c (renamed from contrib/ipfilter/lib/load_pool.c)0
-rw-r--r--lib/load_poolnode.c (renamed from contrib/ipfilter/lib/load_poolnode.c)0
-rw-r--r--lib/load_url.c (renamed from contrib/ipfilter/lib/load_url.c)0
-rw-r--r--lib/loglevel.c (renamed from contrib/ipfilter/lib/loglevel.c)0
-rw-r--r--lib/make_range.c (renamed from contrib/ipfilter/lib/make_range.c)0
-rw-r--r--lib/mutex_emul.c (renamed from contrib/ipfilter/lib/mutex_emul.c)0
-rw-r--r--lib/nametokva.c (renamed from contrib/ipfilter/lib/nametokva.c)0
-rw-r--r--lib/nat_setgroupmap.c (renamed from contrib/ipfilter/lib/nat_setgroupmap.c)0
-rw-r--r--lib/natparse.c (renamed from contrib/ipfilter/lib/natparse.c)0
-rw-r--r--lib/ntomask.c (renamed from contrib/ipfilter/lib/ntomask.c)0
-rw-r--r--lib/optname.c (renamed from contrib/ipfilter/lib/optname.c)0
-rw-r--r--lib/optprint.c (renamed from contrib/ipfilter/lib/optprint.c)0
-rw-r--r--lib/optprintv6.c (renamed from contrib/ipfilter/lib/optprintv6.c)0
-rw-r--r--lib/optvalue.c (renamed from contrib/ipfilter/lib/optvalue.c)0
-rw-r--r--lib/parse.c (renamed from contrib/ipfilter/lib/parse.c)0
-rw-r--r--lib/portname.c (renamed from contrib/ipfilter/lib/portname.c)0
-rw-r--r--lib/portnum.c (renamed from contrib/ipfilter/lib/portnum.c)0
-rw-r--r--lib/ports.c (renamed from contrib/ipfilter/lib/ports.c)0
-rw-r--r--lib/print_toif.c (renamed from contrib/ipfilter/lib/print_toif.c)0
-rw-r--r--lib/printactivenat.c (renamed from contrib/ipfilter/lib/printactivenat.c)0
-rw-r--r--lib/printaps.c (renamed from contrib/ipfilter/lib/printaps.c)0
-rw-r--r--lib/printbuf.c (renamed from contrib/ipfilter/lib/printbuf.c)0
-rw-r--r--lib/printfr.c (renamed from contrib/ipfilter/lib/printfr.c)0
-rw-r--r--lib/printfraginfo.c (renamed from contrib/ipfilter/lib/printfraginfo.c)0
-rw-r--r--lib/printhash.c (renamed from contrib/ipfilter/lib/printhash.c)0
-rw-r--r--lib/printhash_live.c (renamed from contrib/ipfilter/lib/printhash_live.c)0
-rw-r--r--lib/printhashdata.c (renamed from contrib/ipfilter/lib/printhashdata.c)0
-rw-r--r--lib/printhashnode.c (renamed from contrib/ipfilter/lib/printhashnode.c)0
-rw-r--r--lib/printhostmap.c (renamed from contrib/ipfilter/lib/printhostmap.c)0
-rw-r--r--lib/printhostmask.c (renamed from contrib/ipfilter/lib/printhostmask.c)0
-rw-r--r--lib/printifname.c (renamed from contrib/ipfilter/lib/printifname.c)0
-rw-r--r--lib/printip.c (renamed from contrib/ipfilter/lib/printip.c)0
-rw-r--r--lib/printlog.c (renamed from contrib/ipfilter/lib/printlog.c)0
-rw-r--r--lib/printmask.c (renamed from contrib/ipfilter/lib/printmask.c)0
-rw-r--r--lib/printnat.c (renamed from contrib/ipfilter/lib/printnat.c)0
-rw-r--r--lib/printpacket.c (renamed from contrib/ipfilter/lib/printpacket.c)0
-rw-r--r--lib/printpacket6.c (renamed from contrib/ipfilter/lib/printpacket6.c)0
-rw-r--r--lib/printpool.c (renamed from contrib/ipfilter/lib/printpool.c)0
-rw-r--r--lib/printpool_live.c (renamed from contrib/ipfilter/lib/printpool_live.c)0
-rw-r--r--lib/printpooldata.c (renamed from contrib/ipfilter/lib/printpooldata.c)0
-rw-r--r--lib/printpoolnode.c (renamed from contrib/ipfilter/lib/printpoolnode.c)0
-rw-r--r--lib/printportcmp.c (renamed from contrib/ipfilter/lib/printportcmp.c)0
-rw-r--r--lib/printproto.c (renamed from contrib/ipfilter/lib/printproto.c)0
-rw-r--r--lib/printsbuf.c (renamed from contrib/ipfilter/lib/printsbuf.c)0
-rw-r--r--lib/printstate.c (renamed from contrib/ipfilter/lib/printstate.c)0
-rw-r--r--lib/printtqtable.c (renamed from contrib/ipfilter/lib/printtqtable.c)0
-rw-r--r--lib/printtunable.c (renamed from contrib/ipfilter/lib/printtunable.c)0
-rw-r--r--lib/ratoi.c (renamed from contrib/ipfilter/lib/ratoi.c)0
-rw-r--r--lib/ratoui.c (renamed from contrib/ipfilter/lib/ratoui.c)0
-rw-r--r--lib/remove_hash.c (renamed from contrib/ipfilter/lib/remove_hash.c)0
-rw-r--r--lib/remove_hashnode.c (renamed from contrib/ipfilter/lib/remove_hashnode.c)0
-rw-r--r--lib/remove_pool.c (renamed from contrib/ipfilter/lib/remove_pool.c)0
-rw-r--r--lib/remove_poolnode.c (renamed from contrib/ipfilter/lib/remove_poolnode.c)0
-rw-r--r--lib/resetlexer.c (renamed from contrib/ipfilter/lib/resetlexer.c)0
-rw-r--r--lib/rwlock_emul.c (renamed from contrib/ipfilter/lib/rwlock_emul.c)0
-rw-r--r--lib/tcp_flags.c (renamed from contrib/ipfilter/lib/tcp_flags.c)0
-rw-r--r--lib/tcpflags.c (renamed from contrib/ipfilter/lib/tcpflags.c)0
-rw-r--r--lib/tcpoptnames.c (renamed from contrib/ipfilter/lib/tcpoptnames.c)0
-rw-r--r--lib/to_interface.c (renamed from contrib/ipfilter/lib/to_interface.c)0
-rw-r--r--lib/v6ionames.c (renamed from contrib/ipfilter/lib/v6ionames.c)0
-rw-r--r--lib/v6optvalue.c (renamed from contrib/ipfilter/lib/v6optvalue.c)0
-rw-r--r--lib/var.c (renamed from contrib/ipfilter/lib/var.c)0
-rw-r--r--lib/verbose.c (renamed from contrib/ipfilter/lib/verbose.c)0
-rw-r--r--linux.h (renamed from contrib/ipfilter/linux.h)0
-rw-r--r--man/Makefile (renamed from contrib/ipfilter/man/Makefile)0
-rw-r--r--man/ipf.1 (renamed from contrib/ipfilter/man/ipf.1)0
-rw-r--r--man/ipf.4 (renamed from contrib/ipfilter/man/ipf.4)0
-rw-r--r--man/ipf.5 (renamed from contrib/ipfilter/man/ipf.5)0
-rw-r--r--man/ipf.8 (renamed from contrib/ipfilter/man/ipf.8)0
-rw-r--r--man/ipfilter.4 (renamed from contrib/ipfilter/man/ipfilter.4)0
-rw-r--r--man/ipfilter.4.mandoc (renamed from contrib/ipfilter/man/ipfilter.4.mandoc)0
-rw-r--r--man/ipfilter.5 (renamed from contrib/ipfilter/man/ipfilter.5)0
-rw-r--r--man/ipfs.8 (renamed from contrib/ipfilter/man/ipfs.8)0
-rw-r--r--man/ipfstat.8 (renamed from contrib/ipfilter/man/ipfstat.8)0
-rw-r--r--man/ipftest.1 (renamed from contrib/ipfilter/man/ipftest.1)0
-rw-r--r--man/ipl.4 (renamed from contrib/ipfilter/man/ipl.4)0
-rw-r--r--man/ipmon.5 (renamed from contrib/ipfilter/man/ipmon.5)0
-rw-r--r--man/ipmon.8 (renamed from contrib/ipfilter/man/ipmon.8)0
-rw-r--r--man/ipnat.1 (renamed from contrib/ipfilter/man/ipnat.1)0
-rw-r--r--man/ipnat.4 (renamed from contrib/ipfilter/man/ipnat.4)0
-rw-r--r--man/ipnat.5 (renamed from contrib/ipfilter/man/ipnat.5)0
-rw-r--r--man/ipnat.8 (renamed from contrib/ipfilter/man/ipnat.8)0
-rw-r--r--man/ippool.5 (renamed from contrib/ipfilter/man/ippool.5)0
-rw-r--r--man/ippool.8 (renamed from contrib/ipfilter/man/ippool.8)0
-rw-r--r--man/ipscan.5 (renamed from contrib/ipfilter/man/ipscan.5)0
-rw-r--r--man/ipscan.8 (renamed from contrib/ipfilter/man/ipscan.8)0
-rw-r--r--man/man.sed (renamed from contrib/ipfilter/man/man.sed)0
-rw-r--r--man/mkfilters.1 (renamed from contrib/ipfilter/man/mkfilters.1)0
-rw-r--r--md5.c (renamed from contrib/ipfilter/md5.c)0
-rw-r--r--md5.h (renamed from contrib/ipfilter/md5.h)0
-rw-r--r--misc.c (renamed from contrib/ipfilter/misc.c)0
-rw-r--r--mkfilters (renamed from contrib/ipfilter/mkfilters)0
-rw-r--r--ml_ipl.c (renamed from contrib/ipfilter/ml_ipl.c)0
-rw-r--r--mlf_ipl.c (renamed from contrib/ipfilter/mlf_ipl.c)0
-rw-r--r--mlf_rule.c (renamed from contrib/ipfilter/mlf_rule.c)0
-rw-r--r--mlfk_ipl.c (renamed from contrib/ipfilter/mlfk_ipl.c)0
-rw-r--r--mlfk_rule.c (renamed from contrib/ipfilter/mlfk_rule.c)0
-rw-r--r--mlh_rule.c (renamed from contrib/ipfilter/mlh_rule.c)0
-rw-r--r--mli_ipl.c (renamed from contrib/ipfilter/mli_ipl.c)0
-rw-r--r--mln_ipl.c (renamed from contrib/ipfilter/mln_ipl.c)0
-rw-r--r--mls_ipl.c (renamed from contrib/ipfilter/mls_ipl.c)0
-rw-r--r--natparse.c (renamed from contrib/ipfilter/natparse.c)0
-rw-r--r--net/.cvsignore (renamed from contrib/ipfilter/net/.cvsignore)0
-rw-r--r--opt.c (renamed from contrib/ipfilter/opt.c)0
-rw-r--r--opt_inet6.h (renamed from contrib/ipfilter/opt_inet6.h)0
-rw-r--r--opts.h (renamed from contrib/ipfilter/opts.h)0
-rw-r--r--parse.c (renamed from contrib/ipfilter/parse.c)0
-rw-r--r--pcap-ipf.h (renamed from contrib/ipfilter/pcap-ipf.h)0
-rw-r--r--pcap.h (renamed from contrib/ipfilter/pcap.h)0
-rw-r--r--perl/Ipfanaly.pl (renamed from contrib/ipfilter/perl/Ipfanaly.pl)0
-rw-r--r--perl/Isbgraph (renamed from contrib/ipfilter/perl/Isbgraph)0
-rw-r--r--perl/LICENSE (renamed from contrib/ipfilter/perl/LICENSE)0
-rw-r--r--perl/Services (renamed from contrib/ipfilter/perl/Services)0
-rw-r--r--perl/ipf-mrtg.pl (renamed from contrib/ipfilter/perl/ipf-mrtg.pl)0
-rw-r--r--perl/ipfmeta.pl (renamed from contrib/ipfilter/perl/ipfmeta.pl)0
-rw-r--r--perl/logfilter.pl (renamed from contrib/ipfilter/perl/logfilter.pl)0
-rw-r--r--perl/plog (renamed from contrib/ipfilter/perl/plog)0
-rw-r--r--printnat.c (renamed from contrib/ipfilter/printnat.c)0
-rw-r--r--printstate.c (renamed from contrib/ipfilter/printstate.c)0
-rw-r--r--radix.c (renamed from contrib/ipfilter/radix.c)0
-rw-r--r--radix_ipf.h (renamed from contrib/ipfilter/radix_ipf.h)0
-rw-r--r--relay.c (renamed from contrib/ipfilter/relay.c)0
-rw-r--r--rules/.cvsignore (renamed from contrib/ipfilter/rules/.cvsignore)0
-rw-r--r--rules/BASIC.NAT (renamed from contrib/ipfilter/rules/BASIC.NAT)0
-rw-r--r--rules/BASIC_1.FW (renamed from contrib/ipfilter/rules/BASIC_1.FW)0
-rw-r--r--rules/BASIC_2.FW (renamed from contrib/ipfilter/rules/BASIC_2.FW)0
-rw-r--r--rules/example.1 (renamed from contrib/ipfilter/rules/example.1)0
-rw-r--r--rules/example.10 (renamed from contrib/ipfilter/rules/example.10)0
-rw-r--r--rules/example.11 (renamed from contrib/ipfilter/rules/example.11)0
-rw-r--r--rules/example.12 (renamed from contrib/ipfilter/rules/example.12)0
-rw-r--r--rules/example.13 (renamed from contrib/ipfilter/rules/example.13)0
-rw-r--r--rules/example.2 (renamed from contrib/ipfilter/rules/example.2)0
-rw-r--r--rules/example.3 (renamed from contrib/ipfilter/rules/example.3)0
-rw-r--r--rules/example.4 (renamed from contrib/ipfilter/rules/example.4)0
-rw-r--r--rules/example.5 (renamed from contrib/ipfilter/rules/example.5)0
-rw-r--r--rules/example.6 (renamed from contrib/ipfilter/rules/example.6)0
-rw-r--r--rules/example.7 (renamed from contrib/ipfilter/rules/example.7)0
-rw-r--r--rules/example.8 (renamed from contrib/ipfilter/rules/example.8)0
-rw-r--r--rules/example.9 (renamed from contrib/ipfilter/rules/example.9)0
-rw-r--r--rules/example.sr (renamed from contrib/ipfilter/rules/example.sr)0
-rw-r--r--rules/firewall (renamed from contrib/ipfilter/rules/firewall)0
-rw-r--r--rules/ftp-proxy (renamed from contrib/ipfilter/rules/ftp-proxy)0
-rwxr-xr-xrules/ftppxy (renamed from contrib/ipfilter/rules/ftppxy)0
-rw-r--r--rules/ip_rules (renamed from contrib/ipfilter/rules/ip_rules)0
-rw-r--r--rules/ipmon.conf (renamed from contrib/ipfilter/rules/ipmon.conf)0
-rw-r--r--rules/nat-setup (renamed from contrib/ipfilter/rules/nat-setup)0
-rw-r--r--rules/nat.eg (renamed from contrib/ipfilter/rules/nat.eg)0
-rw-r--r--rules/pool.conf (renamed from contrib/ipfilter/rules/pool.conf)0
-rw-r--r--rules/rules.sed (renamed from contrib/ipfilter/rules/rules.sed)0
-rw-r--r--rules/server (renamed from contrib/ipfilter/rules/server)0
-rw-r--r--rules/tcpstate (renamed from contrib/ipfilter/rules/tcpstate)0
-rw-r--r--samples/.cvsignore (renamed from contrib/ipfilter/samples/.cvsignore)0
-rw-r--r--samples/Makefile (renamed from contrib/ipfilter/samples/Makefile)0
-rw-r--r--samples/ipfilter-pb.gif (renamed from contrib/ipfilter/samples/ipfilter-pb.gif)bin795 -> 795 bytes
-rw-r--r--samples/proxy.c (renamed from contrib/ipfilter/samples/proxy.c)0
-rw-r--r--samples/relay.c (renamed from contrib/ipfilter/samples/relay.c)0
-rw-r--r--samples/userauth.c (renamed from contrib/ipfilter/samples/userauth.c)0
-rw-r--r--snoop.h (renamed from contrib/ipfilter/snoop.h)0
-rw-r--r--solaris.c (renamed from contrib/ipfilter/solaris.c)0
-rw-r--r--test/.cvsignore (renamed from contrib/ipfilter/test/.cvsignore)0
-rw-r--r--test/Makefile (renamed from contrib/ipfilter/test/Makefile)0
-rw-r--r--test/README.TXT (renamed from contrib/ipfilter/test/README.TXT)0
-rw-r--r--test/bpftest (renamed from contrib/ipfilter/test/bpftest)0
-rw-r--r--test/dotest (renamed from contrib/ipfilter/test/dotest)0
-rwxr-xr-xtest/dotest6 (renamed from contrib/ipfilter/test/dotest6)0
-rw-r--r--test/expected/1 (renamed from contrib/ipfilter/test/expected/1)0
-rw-r--r--test/expected/10 (renamed from contrib/ipfilter/test/expected/10)0
-rw-r--r--test/expected/11 (renamed from contrib/ipfilter/test/expected/11)0
-rw-r--r--test/expected/12 (renamed from contrib/ipfilter/test/expected/12)0
-rw-r--r--test/expected/14 (renamed from contrib/ipfilter/test/expected/14)0
-rw-r--r--test/expected/2 (renamed from contrib/ipfilter/test/expected/2)0
-rw-r--r--test/expected/3 (renamed from contrib/ipfilter/test/expected/3)0
-rw-r--r--test/expected/4 (renamed from contrib/ipfilter/test/expected/4)0
-rw-r--r--test/expected/5 (renamed from contrib/ipfilter/test/expected/5)0
-rw-r--r--test/expected/6 (renamed from contrib/ipfilter/test/expected/6)0
-rw-r--r--test/expected/7 (renamed from contrib/ipfilter/test/expected/7)0
-rw-r--r--test/expected/8 (renamed from contrib/ipfilter/test/expected/8)0
-rw-r--r--test/expected/9 (renamed from contrib/ipfilter/test/expected/9)0
-rw-r--r--test/expected/Makefile (renamed from contrib/ipfilter/test/expected/Makefile)0
-rw-r--r--test/expected/bpf-f1 (renamed from contrib/ipfilter/test/expected/bpf-f1)0
-rw-r--r--test/expected/bpf1 (renamed from contrib/ipfilter/test/expected/bpf1)0
-rw-r--r--test/expected/expected.sed (renamed from contrib/ipfilter/test/expected/expected.sed)0
-rw-r--r--test/expected/f1 (renamed from contrib/ipfilter/test/expected/f1)0
-rw-r--r--test/expected/f10 (renamed from contrib/ipfilter/test/expected/f10)0
-rw-r--r--test/expected/f11 (renamed from contrib/ipfilter/test/expected/f11)0
-rw-r--r--test/expected/f12 (renamed from contrib/ipfilter/test/expected/f12)0
-rw-r--r--test/expected/f13 (renamed from contrib/ipfilter/test/expected/f13)0
-rw-r--r--test/expected/f14 (renamed from contrib/ipfilter/test/expected/f14)0
-rw-r--r--test/expected/f15 (renamed from contrib/ipfilter/test/expected/f15)0
-rw-r--r--test/expected/f16 (renamed from contrib/ipfilter/test/expected/f16)0
-rw-r--r--test/expected/f17 (renamed from contrib/ipfilter/test/expected/f17)0
-rw-r--r--test/expected/f18 (renamed from contrib/ipfilter/test/expected/f18)0
-rw-r--r--test/expected/f19 (renamed from contrib/ipfilter/test/expected/f19)0
-rw-r--r--test/expected/f2 (renamed from contrib/ipfilter/test/expected/f2)0
-rw-r--r--test/expected/f20 (renamed from contrib/ipfilter/test/expected/f20)0
-rw-r--r--test/expected/f24 (renamed from contrib/ipfilter/test/expected/f24)0
-rw-r--r--test/expected/f3 (renamed from contrib/ipfilter/test/expected/f3)0
-rw-r--r--test/expected/f4 (renamed from contrib/ipfilter/test/expected/f4)0
-rw-r--r--test/expected/f5 (renamed from contrib/ipfilter/test/expected/f5)0
-rw-r--r--test/expected/f6 (renamed from contrib/ipfilter/test/expected/f6)0
-rw-r--r--test/expected/f7 (renamed from contrib/ipfilter/test/expected/f7)0
-rw-r--r--test/expected/f8 (renamed from contrib/ipfilter/test/expected/f8)0
-rw-r--r--test/expected/f9 (renamed from contrib/ipfilter/test/expected/f9)0
-rw-r--r--test/expected/i1 (renamed from contrib/ipfilter/test/expected/i1)0
-rw-r--r--test/expected/i10 (renamed from contrib/ipfilter/test/expected/i10)0
-rw-r--r--test/expected/i11 (renamed from contrib/ipfilter/test/expected/i11)0
-rw-r--r--test/expected/i12 (renamed from contrib/ipfilter/test/expected/i12)0
-rw-r--r--test/expected/i13 (renamed from contrib/ipfilter/test/expected/i13)0
-rw-r--r--test/expected/i14 (renamed from contrib/ipfilter/test/expected/i14)0
-rw-r--r--test/expected/i15 (renamed from contrib/ipfilter/test/expected/i15)0
-rw-r--r--test/expected/i16 (renamed from contrib/ipfilter/test/expected/i16)0
-rw-r--r--test/expected/i17 (renamed from contrib/ipfilter/test/expected/i17)0
-rw-r--r--test/expected/i18 (renamed from contrib/ipfilter/test/expected/i18)0
-rw-r--r--test/expected/i19 (renamed from contrib/ipfilter/test/expected/i19)0
-rw-r--r--test/expected/i19.dist (renamed from contrib/ipfilter/test/expected/i19.dist)0
-rw-r--r--test/expected/i2 (renamed from contrib/ipfilter/test/expected/i2)0
-rw-r--r--test/expected/i20 (renamed from contrib/ipfilter/test/expected/i20)0
-rw-r--r--test/expected/i21 (renamed from contrib/ipfilter/test/expected/i21)0
-rw-r--r--test/expected/i3 (renamed from contrib/ipfilter/test/expected/i3)0
-rw-r--r--test/expected/i4 (renamed from contrib/ipfilter/test/expected/i4)0
-rw-r--r--test/expected/i5 (renamed from contrib/ipfilter/test/expected/i5)0
-rw-r--r--test/expected/i6 (renamed from contrib/ipfilter/test/expected/i6)0
-rw-r--r--test/expected/i7 (renamed from contrib/ipfilter/test/expected/i7)0
-rw-r--r--test/expected/i8 (renamed from contrib/ipfilter/test/expected/i8)0
-rw-r--r--test/expected/i9 (renamed from contrib/ipfilter/test/expected/i9)0
-rw-r--r--test/expected/in1 (renamed from contrib/ipfilter/test/expected/in1)0
-rw-r--r--test/expected/in2 (renamed from contrib/ipfilter/test/expected/in2)0
-rw-r--r--test/expected/in3 (renamed from contrib/ipfilter/test/expected/in3)0
-rw-r--r--test/expected/in4 (renamed from contrib/ipfilter/test/expected/in4)0
-rw-r--r--test/expected/in5 (renamed from contrib/ipfilter/test/expected/in5)0
-rw-r--r--test/expected/in6 (renamed from contrib/ipfilter/test/expected/in6)0
-rw-r--r--test/expected/ip1 (renamed from contrib/ipfilter/test/expected/ip1)0
-rw-r--r--test/expected/ip2 (renamed from contrib/ipfilter/test/expected/ip2)0
-rw-r--r--test/expected/ipv6.1 (renamed from contrib/ipfilter/test/expected/ipv6.1)0
-rw-r--r--test/expected/ipv6.2 (renamed from contrib/ipfilter/test/expected/ipv6.2)0
-rw-r--r--test/expected/ipv6.3 (renamed from contrib/ipfilter/test/expected/ipv6.3)0
-rw-r--r--test/expected/ipv6.5 (renamed from contrib/ipfilter/test/expected/ipv6.5)0
-rw-r--r--test/expected/ipv6.6 (renamed from contrib/ipfilter/test/expected/ipv6.6)0
-rw-r--r--test/expected/l1 (renamed from contrib/ipfilter/test/expected/l1)0
-rw-r--r--test/expected/l1.b (renamed from contrib/ipfilter/test/expected/l1.b)0
-rw-r--r--test/expected/n1 (renamed from contrib/ipfilter/test/expected/n1)0
-rw-r--r--test/expected/n10 (renamed from contrib/ipfilter/test/expected/n10)0
-rw-r--r--test/expected/n11 (renamed from contrib/ipfilter/test/expected/n11)0
-rw-r--r--test/expected/n12 (renamed from contrib/ipfilter/test/expected/n12)0
-rw-r--r--test/expected/n13 (renamed from contrib/ipfilter/test/expected/n13)0
-rw-r--r--test/expected/n14 (renamed from contrib/ipfilter/test/expected/n14)0
-rw-r--r--test/expected/n16 (renamed from contrib/ipfilter/test/expected/n16)0
-rw-r--r--test/expected/n2 (renamed from contrib/ipfilter/test/expected/n2)0
-rw-r--r--test/expected/n3 (renamed from contrib/ipfilter/test/expected/n3)0
-rw-r--r--test/expected/n4 (renamed from contrib/ipfilter/test/expected/n4)0
-rw-r--r--test/expected/n5 (renamed from contrib/ipfilter/test/expected/n5)0
-rw-r--r--test/expected/n6 (renamed from contrib/ipfilter/test/expected/n6)0
-rw-r--r--test/expected/n7 (renamed from contrib/ipfilter/test/expected/n7)0
-rw-r--r--test/expected/n8 (renamed from contrib/ipfilter/test/expected/n8)0
-rw-r--r--test/expected/n9 (renamed from contrib/ipfilter/test/expected/n9)0
-rw-r--r--test/expected/ni1 (renamed from contrib/ipfilter/test/expected/ni1)0
-rw-r--r--test/expected/ni10 (renamed from contrib/ipfilter/test/expected/ni10)0
-rw-r--r--test/expected/ni11 (renamed from contrib/ipfilter/test/expected/ni11)0
-rw-r--r--test/expected/ni12 (renamed from contrib/ipfilter/test/expected/ni12)0
-rw-r--r--test/expected/ni13 (renamed from contrib/ipfilter/test/expected/ni13)0
-rw-r--r--test/expected/ni14 (renamed from contrib/ipfilter/test/expected/ni14)0
-rw-r--r--test/expected/ni15 (renamed from contrib/ipfilter/test/expected/ni15)0
-rw-r--r--test/expected/ni16 (renamed from contrib/ipfilter/test/expected/ni16)0
-rw-r--r--test/expected/ni19 (renamed from contrib/ipfilter/test/expected/ni19)0
-rw-r--r--test/expected/ni2 (renamed from contrib/ipfilter/test/expected/ni2)0
-rw-r--r--test/expected/ni20 (renamed from contrib/ipfilter/test/expected/ni20)0
-rw-r--r--test/expected/ni21 (renamed from contrib/ipfilter/test/expected/ni21)0
-rw-r--r--test/expected/ni23 (renamed from contrib/ipfilter/test/expected/ni23)0
-rw-r--r--test/expected/ni3 (renamed from contrib/ipfilter/test/expected/ni3)0
-rw-r--r--test/expected/ni4 (renamed from contrib/ipfilter/test/expected/ni4)0
-rw-r--r--test/expected/ni5 (renamed from contrib/ipfilter/test/expected/ni5)0
-rw-r--r--test/expected/ni6 (renamed from contrib/ipfilter/test/expected/ni6)0
-rw-r--r--test/expected/ni7 (renamed from contrib/ipfilter/test/expected/ni7)0
-rw-r--r--test/expected/ni8 (renamed from contrib/ipfilter/test/expected/ni8)0
-rw-r--r--test/expected/ni9 (renamed from contrib/ipfilter/test/expected/ni9)0
-rw-r--r--test/expected/p1 (renamed from contrib/ipfilter/test/expected/p1)0
-rw-r--r--test/expected/p2 (renamed from contrib/ipfilter/test/expected/p2)0
-rw-r--r--test/expected/p3 (renamed from contrib/ipfilter/test/expected/p3)0
-rw-r--r--test/expected/p5 (renamed from contrib/ipfilter/test/expected/p5)0
-rw-r--r--test/hextest (renamed from contrib/ipfilter/test/hextest)0
-rw-r--r--test/input/1 (renamed from contrib/ipfilter/test/input/1)0
-rw-r--r--test/input/10 (renamed from contrib/ipfilter/test/input/10)0
-rw-r--r--test/input/11 (renamed from contrib/ipfilter/test/input/11)0
-rw-r--r--test/input/12 (renamed from contrib/ipfilter/test/input/12)0
-rw-r--r--test/input/13 (renamed from contrib/ipfilter/test/input/13)0
-rw-r--r--test/input/14 (renamed from contrib/ipfilter/test/input/14)0
-rw-r--r--test/input/2 (renamed from contrib/ipfilter/test/input/2)0
-rw-r--r--test/input/3 (renamed from contrib/ipfilter/test/input/3)0
-rw-r--r--test/input/4 (renamed from contrib/ipfilter/test/input/4)0
-rw-r--r--test/input/5 (renamed from contrib/ipfilter/test/input/5)0
-rw-r--r--test/input/6 (renamed from contrib/ipfilter/test/input/6)0
-rw-r--r--test/input/7 (renamed from contrib/ipfilter/test/input/7)0
-rw-r--r--test/input/8 (renamed from contrib/ipfilter/test/input/8)0
-rw-r--r--test/input/9 (renamed from contrib/ipfilter/test/input/9)0
-rw-r--r--test/input/f1 (renamed from contrib/ipfilter/test/input/f1)0
-rw-r--r--test/input/f10 (renamed from contrib/ipfilter/test/input/f10)0
-rw-r--r--test/input/f11 (renamed from contrib/ipfilter/test/input/f11)0
-rw-r--r--test/input/f12 (renamed from contrib/ipfilter/test/input/f12)0
-rw-r--r--test/input/f13 (renamed from contrib/ipfilter/test/input/f13)0
-rw-r--r--test/input/f14 (renamed from contrib/ipfilter/test/input/f14)0
-rw-r--r--test/input/f15 (renamed from contrib/ipfilter/test/input/f15)0
-rw-r--r--test/input/f16 (renamed from contrib/ipfilter/test/input/f16)0
-rw-r--r--test/input/f17 (renamed from contrib/ipfilter/test/input/f17)0
-rw-r--r--test/input/f18 (renamed from contrib/ipfilter/test/input/f18)0
-rw-r--r--test/input/f19 (renamed from contrib/ipfilter/test/input/f19)0
-rw-r--r--test/input/f2 (renamed from contrib/ipfilter/test/input/f2)0
-rw-r--r--test/input/f20 (renamed from contrib/ipfilter/test/input/f20)0
-rw-r--r--test/input/f24 (renamed from contrib/ipfilter/test/input/f24)0
-rw-r--r--test/input/f3 (renamed from contrib/ipfilter/test/input/f3)0
-rw-r--r--test/input/f4 (renamed from contrib/ipfilter/test/input/f4)0
-rw-r--r--test/input/f5 (renamed from contrib/ipfilter/test/input/f5)0
-rw-r--r--test/input/f6 (renamed from contrib/ipfilter/test/input/f6)0
-rw-r--r--test/input/f7 (renamed from contrib/ipfilter/test/input/f7)0
-rw-r--r--test/input/f8 (renamed from contrib/ipfilter/test/input/f8)0
-rw-r--r--test/input/f9 (renamed from contrib/ipfilter/test/input/f9)0
-rw-r--r--test/input/input.sed (renamed from contrib/ipfilter/test/input/input.sed)0
-rw-r--r--test/input/ip2.data (renamed from contrib/ipfilter/test/input/ip2.data)0
-rw-r--r--test/input/ipf6-1 (renamed from contrib/ipfilter/test/input/ipf6-1)0
-rw-r--r--test/input/ipv6.1 (renamed from contrib/ipfilter/test/input/ipv6.1)0
-rw-r--r--test/input/ipv6.2 (renamed from contrib/ipfilter/test/input/ipv6.2)0
-rw-r--r--test/input/ipv6.3 (renamed from contrib/ipfilter/test/input/ipv6.3)0
-rw-r--r--test/input/ipv6.5 (renamed from contrib/ipfilter/test/input/ipv6.5)0
-rw-r--r--test/input/ipv6.6 (renamed from contrib/ipfilter/test/input/ipv6.6)0
-rw-r--r--test/input/l1 (renamed from contrib/ipfilter/test/input/l1)0
-rw-r--r--test/input/n1 (renamed from contrib/ipfilter/test/input/n1)0
-rw-r--r--test/input/n10 (renamed from contrib/ipfilter/test/input/n10)0
-rw-r--r--test/input/n11 (renamed from contrib/ipfilter/test/input/n11)0
-rw-r--r--test/input/n12 (renamed from contrib/ipfilter/test/input/n12)0
-rw-r--r--test/input/n13 (renamed from contrib/ipfilter/test/input/n13)0
-rw-r--r--test/input/n14 (renamed from contrib/ipfilter/test/input/n14)0
-rw-r--r--test/input/n16 (renamed from contrib/ipfilter/test/input/n16)0
-rw-r--r--test/input/n2 (renamed from contrib/ipfilter/test/input/n2)0
-rw-r--r--test/input/n3 (renamed from contrib/ipfilter/test/input/n3)0
-rw-r--r--test/input/n4 (renamed from contrib/ipfilter/test/input/n4)0
-rw-r--r--test/input/n5 (renamed from contrib/ipfilter/test/input/n5)0
-rw-r--r--test/input/n6 (renamed from contrib/ipfilter/test/input/n6)0
-rw-r--r--test/input/n7 (renamed from contrib/ipfilter/test/input/n7)0
-rw-r--r--test/input/n8 (renamed from contrib/ipfilter/test/input/n8)0
-rw-r--r--test/input/n9 (renamed from contrib/ipfilter/test/input/n9)0
-rw-r--r--test/input/ni1 (renamed from contrib/ipfilter/test/input/ni1)0
-rw-r--r--test/input/ni10 (renamed from contrib/ipfilter/test/input/ni10)0
-rw-r--r--test/input/ni11 (renamed from contrib/ipfilter/test/input/ni11)0
-rw-r--r--test/input/ni12 (renamed from contrib/ipfilter/test/input/ni12)0
-rw-r--r--test/input/ni13 (renamed from contrib/ipfilter/test/input/ni13)0
-rw-r--r--test/input/ni14 (renamed from contrib/ipfilter/test/input/ni14)0
-rw-r--r--test/input/ni15 (renamed from contrib/ipfilter/test/input/ni15)0
-rw-r--r--test/input/ni16 (renamed from contrib/ipfilter/test/input/ni16)0
-rw-r--r--test/input/ni17 (renamed from contrib/ipfilter/test/input/ni17)0
-rw-r--r--test/input/ni19 (renamed from contrib/ipfilter/test/input/ni19)0
-rw-r--r--test/input/ni2 (renamed from contrib/ipfilter/test/input/ni2)0
-rw-r--r--test/input/ni20 (renamed from contrib/ipfilter/test/input/ni20)0
-rw-r--r--test/input/ni21 (renamed from contrib/ipfilter/test/input/ni21)0
-rw-r--r--test/input/ni23 (renamed from contrib/ipfilter/test/input/ni23)0
-rw-r--r--test/input/ni3 (renamed from contrib/ipfilter/test/input/ni3)0
-rw-r--r--test/input/ni4 (renamed from contrib/ipfilter/test/input/ni4)0
-rw-r--r--test/input/ni5 (renamed from contrib/ipfilter/test/input/ni5)0
-rw-r--r--test/input/ni6 (renamed from contrib/ipfilter/test/input/ni6)0
-rw-r--r--test/input/ni7 (renamed from contrib/ipfilter/test/input/ni7)0
-rw-r--r--test/input/ni8 (renamed from contrib/ipfilter/test/input/ni8)0
-rw-r--r--test/input/ni9 (renamed from contrib/ipfilter/test/input/ni9)0
-rw-r--r--test/input/p1 (renamed from contrib/ipfilter/test/input/p1)0
-rw-r--r--test/input/p2 (renamed from contrib/ipfilter/test/input/p2)0
-rw-r--r--test/input/p3 (renamed from contrib/ipfilter/test/input/p3)0
-rw-r--r--test/input/p5 (renamed from contrib/ipfilter/test/input/p5)0
-rwxr-xr-xtest/intest (renamed from contrib/ipfilter/test/intest)0
-rw-r--r--test/iptest (renamed from contrib/ipfilter/test/iptest)0
-rw-r--r--test/itest (renamed from contrib/ipfilter/test/itest)0
-rwxr-xr-xtest/logtest (renamed from contrib/ipfilter/test/logtest)0
-rwxr-xr-xtest/mhtest (renamed from contrib/ipfilter/test/mhtest)0
-rwxr-xr-xtest/mtest (renamed from contrib/ipfilter/test/mtest)0
-rwxr-xr-xtest/natipftest (renamed from contrib/ipfilter/test/natipftest)0
-rwxr-xr-xtest/nattest (renamed from contrib/ipfilter/test/nattest)0
-rw-r--r--test/ptest (renamed from contrib/ipfilter/test/ptest)0
-rw-r--r--test/regress/1 (renamed from contrib/ipfilter/test/regress/1)0
-rw-r--r--test/regress/10 (renamed from contrib/ipfilter/test/regress/10)0
-rw-r--r--test/regress/11 (renamed from contrib/ipfilter/test/regress/11)0
-rw-r--r--test/regress/12 (renamed from contrib/ipfilter/test/regress/12)0
-rw-r--r--test/regress/13 (renamed from contrib/ipfilter/test/regress/13)0
-rw-r--r--test/regress/14 (renamed from contrib/ipfilter/test/regress/14)0
-rw-r--r--test/regress/2 (renamed from contrib/ipfilter/test/regress/2)0
-rw-r--r--test/regress/3 (renamed from contrib/ipfilter/test/regress/3)0
-rw-r--r--test/regress/4 (renamed from contrib/ipfilter/test/regress/4)0
-rw-r--r--test/regress/5 (renamed from contrib/ipfilter/test/regress/5)0
-rw-r--r--test/regress/6 (renamed from contrib/ipfilter/test/regress/6)0
-rw-r--r--test/regress/7 (renamed from contrib/ipfilter/test/regress/7)0
-rw-r--r--test/regress/8 (renamed from contrib/ipfilter/test/regress/8)0
-rw-r--r--test/regress/9 (renamed from contrib/ipfilter/test/regress/9)0
-rw-r--r--test/regress/bpf-f1 (renamed from contrib/ipfilter/test/regress/bpf-f1)0
-rw-r--r--test/regress/bpf1 (renamed from contrib/ipfilter/test/regress/bpf1)0
-rw-r--r--test/regress/f1 (renamed from contrib/ipfilter/test/regress/f1)0
-rw-r--r--test/regress/f10 (renamed from contrib/ipfilter/test/regress/f10)0
-rw-r--r--test/regress/f11 (renamed from contrib/ipfilter/test/regress/f11)0
-rw-r--r--test/regress/f12 (renamed from contrib/ipfilter/test/regress/f12)0
-rw-r--r--test/regress/f13 (renamed from contrib/ipfilter/test/regress/f13)0
-rw-r--r--test/regress/f14 (renamed from contrib/ipfilter/test/regress/f14)0
-rw-r--r--test/regress/f15 (renamed from contrib/ipfilter/test/regress/f15)0
-rw-r--r--test/regress/f16 (renamed from contrib/ipfilter/test/regress/f16)0
-rw-r--r--test/regress/f17 (renamed from contrib/ipfilter/test/regress/f17)0
-rw-r--r--test/regress/f18 (renamed from contrib/ipfilter/test/regress/f18)0
-rw-r--r--test/regress/f19 (renamed from contrib/ipfilter/test/regress/f19)0
-rw-r--r--test/regress/f2 (renamed from contrib/ipfilter/test/regress/f2)0
-rw-r--r--test/regress/f20 (renamed from contrib/ipfilter/test/regress/f20)0
-rw-r--r--test/regress/f24 (renamed from contrib/ipfilter/test/regress/f24)0
-rw-r--r--test/regress/f3 (renamed from contrib/ipfilter/test/regress/f3)0
-rw-r--r--test/regress/f4 (renamed from contrib/ipfilter/test/regress/f4)0
-rw-r--r--test/regress/f5 (renamed from contrib/ipfilter/test/regress/f5)0
-rw-r--r--test/regress/f6 (renamed from contrib/ipfilter/test/regress/f6)0
-rw-r--r--test/regress/f7 (renamed from contrib/ipfilter/test/regress/f7)0
-rw-r--r--test/regress/f8 (renamed from contrib/ipfilter/test/regress/f8)0
-rw-r--r--test/regress/f9 (renamed from contrib/ipfilter/test/regress/f9)0
-rw-r--r--test/regress/i1 (renamed from contrib/ipfilter/test/regress/i1)0
-rw-r--r--test/regress/i10 (renamed from contrib/ipfilter/test/regress/i10)0
-rw-r--r--test/regress/i11 (renamed from contrib/ipfilter/test/regress/i11)0
-rw-r--r--test/regress/i12 (renamed from contrib/ipfilter/test/regress/i12)0
-rw-r--r--test/regress/i13 (renamed from contrib/ipfilter/test/regress/i13)0
-rw-r--r--test/regress/i14 (renamed from contrib/ipfilter/test/regress/i14)0
-rw-r--r--test/regress/i15 (renamed from contrib/ipfilter/test/regress/i15)0
-rw-r--r--test/regress/i16 (renamed from contrib/ipfilter/test/regress/i16)0
-rw-r--r--test/regress/i17 (renamed from contrib/ipfilter/test/regress/i17)0
-rw-r--r--test/regress/i18 (renamed from contrib/ipfilter/test/regress/i18)0
-rw-r--r--test/regress/i19 (renamed from contrib/ipfilter/test/regress/i19)0
-rw-r--r--test/regress/i2 (renamed from contrib/ipfilter/test/regress/i2)0
-rw-r--r--test/regress/i20 (renamed from contrib/ipfilter/test/regress/i20)0
-rw-r--r--test/regress/i21 (renamed from contrib/ipfilter/test/regress/i21)0
-rw-r--r--test/regress/i3 (renamed from contrib/ipfilter/test/regress/i3)0
-rw-r--r--test/regress/i4 (renamed from contrib/ipfilter/test/regress/i4)0
-rw-r--r--test/regress/i5 (renamed from contrib/ipfilter/test/regress/i5)0
-rw-r--r--test/regress/i6 (renamed from contrib/ipfilter/test/regress/i6)0
-rw-r--r--test/regress/i7 (renamed from contrib/ipfilter/test/regress/i7)0
-rw-r--r--test/regress/i8 (renamed from contrib/ipfilter/test/regress/i8)0
-rw-r--r--test/regress/i9 (renamed from contrib/ipfilter/test/regress/i9)0
-rw-r--r--test/regress/in1 (renamed from contrib/ipfilter/test/regress/in1)0
-rw-r--r--test/regress/in2 (renamed from contrib/ipfilter/test/regress/in2)0
-rw-r--r--test/regress/in3 (renamed from contrib/ipfilter/test/regress/in3)0
-rw-r--r--test/regress/in4 (renamed from contrib/ipfilter/test/regress/in4)0
-rw-r--r--test/regress/in5 (renamed from contrib/ipfilter/test/regress/in5)0
-rw-r--r--test/regress/in6 (renamed from contrib/ipfilter/test/regress/in6)0
-rw-r--r--test/regress/ip1 (renamed from contrib/ipfilter/test/regress/ip1)0
-rw-r--r--test/regress/ip2 (renamed from contrib/ipfilter/test/regress/ip2)0
-rw-r--r--test/regress/ipf6-1 (renamed from contrib/ipfilter/test/regress/ipf6-1)0
-rw-r--r--test/regress/ipv6.1 (renamed from contrib/ipfilter/test/regress/ipv6.1)0
-rw-r--r--test/regress/ipv6.2 (renamed from contrib/ipfilter/test/regress/ipv6.2)0
-rw-r--r--test/regress/ipv6.3 (renamed from contrib/ipfilter/test/regress/ipv6.3)0
-rw-r--r--test/regress/ipv6.5 (renamed from contrib/ipfilter/test/regress/ipv6.5)0
-rw-r--r--test/regress/ipv6.6 (renamed from contrib/ipfilter/test/regress/ipv6.6)0
-rw-r--r--test/regress/l1 (renamed from contrib/ipfilter/test/regress/l1)0
-rw-r--r--test/regress/n1 (renamed from contrib/ipfilter/test/regress/n1)0
-rw-r--r--test/regress/n10 (renamed from contrib/ipfilter/test/regress/n10)0
-rw-r--r--test/regress/n11 (renamed from contrib/ipfilter/test/regress/n11)0
-rw-r--r--test/regress/n12 (renamed from contrib/ipfilter/test/regress/n12)0
-rw-r--r--test/regress/n13 (renamed from contrib/ipfilter/test/regress/n13)0
-rw-r--r--test/regress/n14 (renamed from contrib/ipfilter/test/regress/n14)0
-rw-r--r--test/regress/n16 (renamed from contrib/ipfilter/test/regress/n16)0
-rw-r--r--test/regress/n2 (renamed from contrib/ipfilter/test/regress/n2)0
-rw-r--r--test/regress/n3 (renamed from contrib/ipfilter/test/regress/n3)0
-rw-r--r--test/regress/n4 (renamed from contrib/ipfilter/test/regress/n4)0
-rw-r--r--test/regress/n5 (renamed from contrib/ipfilter/test/regress/n5)0
-rw-r--r--test/regress/n6 (renamed from contrib/ipfilter/test/regress/n6)0
-rw-r--r--test/regress/n7 (renamed from contrib/ipfilter/test/regress/n7)0
-rw-r--r--test/regress/n8 (renamed from contrib/ipfilter/test/regress/n8)0
-rw-r--r--test/regress/n9 (renamed from contrib/ipfilter/test/regress/n9)0
-rw-r--r--test/regress/ni1.ipf (renamed from contrib/ipfilter/test/regress/ni1.ipf)0
-rw-r--r--test/regress/ni1.nat (renamed from contrib/ipfilter/test/regress/ni1.nat)0
-rw-r--r--test/regress/ni10.ipf (renamed from contrib/ipfilter/test/regress/ni10.ipf)0
-rw-r--r--test/regress/ni10.nat (renamed from contrib/ipfilter/test/regress/ni10.nat)0
-rw-r--r--test/regress/ni11.ipf (renamed from contrib/ipfilter/test/regress/ni11.ipf)0
-rw-r--r--test/regress/ni11.nat (renamed from contrib/ipfilter/test/regress/ni11.nat)0
-rw-r--r--test/regress/ni12.ipf (renamed from contrib/ipfilter/test/regress/ni12.ipf)0
-rw-r--r--test/regress/ni12.nat (renamed from contrib/ipfilter/test/regress/ni12.nat)0
-rw-r--r--test/regress/ni13.ipf (renamed from contrib/ipfilter/test/regress/ni13.ipf)0
-rw-r--r--test/regress/ni13.nat (renamed from contrib/ipfilter/test/regress/ni13.nat)0
-rw-r--r--test/regress/ni14.ipf (renamed from contrib/ipfilter/test/regress/ni14.ipf)0
-rw-r--r--test/regress/ni14.nat (renamed from contrib/ipfilter/test/regress/ni14.nat)0
-rw-r--r--test/regress/ni15.ipf (renamed from contrib/ipfilter/test/regress/ni15.ipf)0
-rw-r--r--test/regress/ni15.nat (renamed from contrib/ipfilter/test/regress/ni15.nat)0
-rw-r--r--test/regress/ni16.ipf (renamed from contrib/ipfilter/test/regress/ni16.ipf)0
-rw-r--r--test/regress/ni16.nat (renamed from contrib/ipfilter/test/regress/ni16.nat)0
-rw-r--r--test/regress/ni17.nat (renamed from contrib/ipfilter/test/regress/ni17.nat)0
-rw-r--r--test/regress/ni19.ipf (renamed from contrib/ipfilter/test/regress/ni19.ipf)0
-rw-r--r--test/regress/ni19.nat (renamed from contrib/ipfilter/test/regress/ni19.nat)0
-rw-r--r--test/regress/ni2.ipf (renamed from contrib/ipfilter/test/regress/ni2.ipf)0
-rw-r--r--test/regress/ni2.nat (renamed from contrib/ipfilter/test/regress/ni2.nat)0
-rw-r--r--test/regress/ni20.ipf (renamed from contrib/ipfilter/test/regress/ni20.ipf)0
-rw-r--r--test/regress/ni20.nat (renamed from contrib/ipfilter/test/regress/ni20.nat)0
-rw-r--r--test/regress/ni21.ipf (renamed from contrib/ipfilter/test/regress/ni21.ipf)0
-rw-r--r--test/regress/ni21.nat (renamed from contrib/ipfilter/test/regress/ni21.nat)0
-rw-r--r--test/regress/ni23.ipf (renamed from contrib/ipfilter/test/regress/ni23.ipf)0
-rw-r--r--test/regress/ni23.nat (renamed from contrib/ipfilter/test/regress/ni23.nat)0
-rw-r--r--test/regress/ni3.ipf (renamed from contrib/ipfilter/test/regress/ni3.ipf)0
-rw-r--r--test/regress/ni3.nat (renamed from contrib/ipfilter/test/regress/ni3.nat)0
-rw-r--r--test/regress/ni4.ipf (renamed from contrib/ipfilter/test/regress/ni4.ipf)0
-rw-r--r--test/regress/ni4.nat (renamed from contrib/ipfilter/test/regress/ni4.nat)0
-rw-r--r--test/regress/ni5.ipf (renamed from contrib/ipfilter/test/regress/ni5.ipf)0
-rw-r--r--test/regress/ni5.nat (renamed from contrib/ipfilter/test/regress/ni5.nat)0
-rw-r--r--test/regress/ni6.ipf (renamed from contrib/ipfilter/test/regress/ni6.ipf)0
-rw-r--r--test/regress/ni6.nat (renamed from contrib/ipfilter/test/regress/ni6.nat)0
-rw-r--r--test/regress/ni7.ipf (renamed from contrib/ipfilter/test/regress/ni7.ipf)0
-rw-r--r--test/regress/ni7.nat (renamed from contrib/ipfilter/test/regress/ni7.nat)0
-rw-r--r--test/regress/ni8.ipf (renamed from contrib/ipfilter/test/regress/ni8.ipf)0
-rw-r--r--test/regress/ni8.nat (renamed from contrib/ipfilter/test/regress/ni8.nat)0
-rw-r--r--test/regress/ni9.ipf (renamed from contrib/ipfilter/test/regress/ni9.ipf)0
-rw-r--r--test/regress/ni9.nat (renamed from contrib/ipfilter/test/regress/ni9.nat)0
-rw-r--r--test/regress/p1.ipf (renamed from contrib/ipfilter/test/regress/p1.ipf)0
-rw-r--r--test/regress/p1.pool (renamed from contrib/ipfilter/test/regress/p1.pool)0
-rw-r--r--test/regress/p2.ipf (renamed from contrib/ipfilter/test/regress/p2.ipf)0
-rw-r--r--test/regress/p3.ipf (renamed from contrib/ipfilter/test/regress/p3.ipf)0
-rw-r--r--test/regress/p3.pool (renamed from contrib/ipfilter/test/regress/p3.pool)0
-rw-r--r--test/regress/p5.ipf (renamed from contrib/ipfilter/test/regress/p5.ipf)0
-rw-r--r--test/regress/p5.pool (renamed from contrib/ipfilter/test/regress/p5.pool)0
-rw-r--r--test/regress/regress.sed (renamed from contrib/ipfilter/test/regress/regress.sed)0
-rw-r--r--test/test.format (renamed from contrib/ipfilter/test/test.format)0
-rw-r--r--test/test.sed (renamed from contrib/ipfilter/test/test.sed)0
-rwxr-xr-xtest/vfycksum.pl (renamed from contrib/ipfilter/test/vfycksum.pl)0
-rw-r--r--todo (renamed from contrib/ipfilter/todo)0
-rw-r--r--tools/BNF.ipf (renamed from contrib/ipfilter/tools/BNF.ipf)0
-rw-r--r--tools/BNF.ipnat (renamed from contrib/ipfilter/tools/BNF.ipnat)0
-rw-r--r--tools/Makefile (renamed from contrib/ipfilter/tools/Makefile)0
-rw-r--r--tools/ipf.c (renamed from contrib/ipfilter/tools/ipf.c)0
-rw-r--r--tools/ipf_y.y (renamed from contrib/ipfilter/tools/ipf_y.y)0
-rw-r--r--tools/ipfcomp.c (renamed from contrib/ipfilter/tools/ipfcomp.c)0
-rw-r--r--tools/ipfs.c (renamed from contrib/ipfilter/tools/ipfs.c)0
-rw-r--r--tools/ipfstat.c (renamed from contrib/ipfilter/tools/ipfstat.c)0
-rw-r--r--tools/ipftest.c (renamed from contrib/ipfilter/tools/ipftest.c)0
-rw-r--r--tools/ipmon.c (renamed from contrib/ipfilter/tools/ipmon.c)0
-rw-r--r--tools/ipmon_y.y (renamed from contrib/ipfilter/tools/ipmon_y.y)0
-rw-r--r--tools/ipnat.c (renamed from contrib/ipfilter/tools/ipnat.c)0
-rw-r--r--tools/ipnat_y.y (renamed from contrib/ipfilter/tools/ipnat_y.y)0
-rw-r--r--tools/ippool.c (renamed from contrib/ipfilter/tools/ippool.c)0
-rw-r--r--tools/ippool_y.y (renamed from contrib/ipfilter/tools/ippool_y.y)0
-rw-r--r--tools/ipscan_y.y (renamed from contrib/ipfilter/tools/ipscan_y.y)0
-rw-r--r--tools/ipsyncm.c (renamed from contrib/ipfilter/tools/ipsyncm.c)0
-rw-r--r--tools/ipsyncs.c (renamed from contrib/ipfilter/tools/ipsyncs.c)0
-rw-r--r--tools/lex_var.h (renamed from contrib/ipfilter/tools/lex_var.h)0
-rw-r--r--tools/lexer.c (renamed from contrib/ipfilter/tools/lexer.c)0
-rw-r--r--tools/lexer.h (renamed from contrib/ipfilter/tools/lexer.h)0
794 files changed, 0 insertions, 0 deletions
diff --git a/contrib/ipfilter/.cvsignore b/.cvsignore
index 616828f4144d..616828f4144d 100644
--- a/contrib/ipfilter/.cvsignore
+++ b/.cvsignore
diff --git a/contrib/ipfilter/BNF b/BNF
index 404cc281fccf..404cc281fccf 100644
--- a/contrib/ipfilter/BNF
+++ b/BNF
diff --git a/contrib/ipfilter/BSD/.cvsignore b/BSD/.cvsignore
index c149a0043f45..c149a0043f45 100644
--- a/contrib/ipfilter/BSD/.cvsignore
+++ b/BSD/.cvsignore
diff --git a/contrib/ipfilter/BSD/Makefile b/BSD/Makefile
index fe8a4d4e567f..fe8a4d4e567f 100644
--- a/contrib/ipfilter/BSD/Makefile
+++ b/BSD/Makefile
diff --git a/contrib/ipfilter/BSD/Makefile.ipsend b/BSD/Makefile.ipsend
index a83de1c6a92c..a83de1c6a92c 100644
--- a/contrib/ipfilter/BSD/Makefile.ipsend
+++ b/BSD/Makefile.ipsend
diff --git a/contrib/ipfilter/BSD/ipfadm-rcd b/BSD/ipfadm-rcd
index 41f62b0223df..41f62b0223df 100755
--- a/contrib/ipfilter/BSD/ipfadm-rcd
+++ b/BSD/ipfadm-rcd
diff --git a/contrib/ipfilter/BSD/kupgrade b/BSD/kupgrade
index 04b257d7ca60..04b257d7ca60 100644
--- a/contrib/ipfilter/BSD/kupgrade
+++ b/BSD/kupgrade
diff --git a/contrib/ipfilter/BSD/make-devices b/BSD/make-devices
index d512e1c76b23..d512e1c76b23 100755
--- a/contrib/ipfilter/BSD/make-devices
+++ b/BSD/make-devices
diff --git a/contrib/ipfilter/BugReport b/BugReport
index 699483189012..699483189012 100644
--- a/contrib/ipfilter/BugReport
+++ b/BugReport
diff --git a/contrib/ipfilter/COMPILE.2.5 b/COMPILE.2.5
index ae550f896e49..ae550f896e49 100644
--- a/contrib/ipfilter/COMPILE.2.5
+++ b/COMPILE.2.5
diff --git a/contrib/ipfilter/COMPILE.Solaris2 b/COMPILE.Solaris2
index 45442c5a4051..45442c5a4051 100644
--- a/contrib/ipfilter/COMPILE.Solaris2
+++ b/COMPILE.Solaris2
diff --git a/contrib/ipfilter/FAQ.FreeBSD b/FAQ.FreeBSD
index 3b069c9f4b53..3b069c9f4b53 100644
--- a/contrib/ipfilter/FAQ.FreeBSD
+++ b/FAQ.FreeBSD
diff --git a/contrib/ipfilter/FWTK/FWTK.sed b/FWTK/FWTK.sed
index e69de29bb2d1..e69de29bb2d1 100644
--- a/contrib/ipfilter/FWTK/FWTK.sed
+++ b/FWTK/FWTK.sed
diff --git a/contrib/ipfilter/FWTK/Index b/FWTK/Index
index f5d7043ca39c..f5d7043ca39c 100644
--- a/contrib/ipfilter/FWTK/Index
+++ b/FWTK/Index
diff --git a/contrib/ipfilter/FWTK/README b/FWTK/README
index 3ed0e2fa6d21..3ed0e2fa6d21 100644
--- a/contrib/ipfilter/FWTK/README
+++ b/FWTK/README
diff --git a/contrib/ipfilter/FWTK/README.ipfilter b/FWTK/README.ipfilter
index fd461cc6cfd8..fd461cc6cfd8 100644
--- a/contrib/ipfilter/FWTK/README.ipfilter
+++ b/FWTK/README.ipfilter
diff --git a/contrib/ipfilter/FWTK/ftp-gw.diff b/FWTK/ftp-gw.diff
index be613423c86f..be613423c86f 100644
--- a/contrib/ipfilter/FWTK/ftp-gw.diff
+++ b/FWTK/ftp-gw.diff
diff --git a/contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt b/FWTK/fwtk-2.1-transparency.txt
index 2e719383f32b..2e719383f32b 100644
--- a/contrib/ipfilter/FWTK/fwtk-2.1-transparency.txt
+++ b/FWTK/fwtk-2.1-transparency.txt
diff --git a/contrib/ipfilter/FWTK/fwtk_transparent.diff b/FWTK/fwtk_transparent.diff
index a6c21fa1f1d1..a6c21fa1f1d1 100644
--- a/contrib/ipfilter/FWTK/fwtk_transparent.diff
+++ b/FWTK/fwtk_transparent.diff
diff --git a/contrib/ipfilter/FWTK/fwtkp b/FWTK/fwtkp
index aba869db0e7b..aba869db0e7b 100644
--- a/contrib/ipfilter/FWTK/fwtkp
+++ b/FWTK/fwtkp
diff --git a/contrib/ipfilter/FWTK/tproxy.diff b/FWTK/tproxy.diff
index 234404bf2364..234404bf2364 100644
--- a/contrib/ipfilter/FWTK/tproxy.diff
+++ b/FWTK/tproxy.diff
diff --git a/contrib/ipfilter/FreeBSD-2.2/files.diffs b/FreeBSD-2.2/files.diffs
index 2ada3fa4b300..2ada3fa4b300 100644
--- a/contrib/ipfilter/FreeBSD-2.2/files.diffs
+++ b/FreeBSD-2.2/files.diffs
diff --git a/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs b/FreeBSD-2.2/files.newconf.diffs
index 82599f199056..82599f199056 100644
--- a/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs
+++ b/FreeBSD-2.2/files.newconf.diffs
diff --git a/contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs b/FreeBSD-2.2/in_proto.c.diffs
index c2822d3ff9d3..c2822d3ff9d3 100644
--- a/contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs
+++ b/FreeBSD-2.2/in_proto.c.diffs
diff --git a/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs b/FreeBSD-2.2/ip_input.c.diffs
index c2b2b15301ce..c2b2b15301ce 100644
--- a/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs
+++ b/FreeBSD-2.2/ip_input.c.diffs
diff --git a/contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs b/FreeBSD-2.2/ip_output.c.diffs
index ff5ae0a5d66b..ff5ae0a5d66b 100644
--- a/contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs
+++ b/FreeBSD-2.2/ip_output.c.diffs
diff --git a/contrib/ipfilter/FreeBSD-2.2/kinstall b/FreeBSD-2.2/kinstall
index 5a4368eba122..5a4368eba122 100755
--- a/contrib/ipfilter/FreeBSD-2.2/kinstall
+++ b/FreeBSD-2.2/kinstall
diff --git a/contrib/ipfilter/FreeBSD-2.2/minstall b/FreeBSD-2.2/minstall
index 832b68e81a63..832b68e81a63 100755
--- a/contrib/ipfilter/FreeBSD-2.2/minstall
+++ b/FreeBSD-2.2/minstall
diff --git a/contrib/ipfilter/FreeBSD-2.2/unkinstall b/FreeBSD-2.2/unkinstall
index 1955f5c415db..1955f5c415db 100755
--- a/contrib/ipfilter/FreeBSD-2.2/unkinstall
+++ b/FreeBSD-2.2/unkinstall
diff --git a/contrib/ipfilter/FreeBSD-2.2/unminstall b/FreeBSD-2.2/unminstall
index 07aaac08f2ce..07aaac08f2ce 100755
--- a/contrib/ipfilter/FreeBSD-2.2/unminstall
+++ b/FreeBSD-2.2/unminstall
diff --git a/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3 b/FreeBSD-3/INST.FreeBSD-3
index 5c30b57821f2..5c30b57821f2 100644
--- a/contrib/ipfilter/FreeBSD-3/INST.FreeBSD-3
+++ b/FreeBSD-3/INST.FreeBSD-3
diff --git a/contrib/ipfilter/FreeBSD-3/kinstall b/FreeBSD-3/kinstall
index 20f0369d6eaf..20f0369d6eaf 100755
--- a/contrib/ipfilter/FreeBSD-3/kinstall
+++ b/FreeBSD-3/kinstall
diff --git a/contrib/ipfilter/FreeBSD-3/unkinstall b/FreeBSD-3/unkinstall
index 687ebc62a7f7..687ebc62a7f7 100755
--- a/contrib/ipfilter/FreeBSD-3/unkinstall
+++ b/FreeBSD-3/unkinstall
diff --git a/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4 b/FreeBSD-4.0/INST.FreeBSD-4
index 7d1b7a2b8f4c..7d1b7a2b8f4c 100644
--- a/contrib/ipfilter/FreeBSD-4.0/INST.FreeBSD-4
+++ b/FreeBSD-4.0/INST.FreeBSD-4
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch b/FreeBSD-4.0/ipv6-patch
index c232b2c15972..c232b2c15972 100755
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch
+++ b/FreeBSD-4.0/ipv6-patch
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0 b/FreeBSD-4.0/ipv6-patch-4.0
index c232b2c15972..c232b2c15972 100755
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.0
+++ b/FreeBSD-4.0/ipv6-patch-4.0
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1 b/FreeBSD-4.0/ipv6-patch-4.1
index 90dac19eb044..90dac19eb044 100644
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.1
+++ b/FreeBSD-4.0/ipv6-patch-4.1
diff --git a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2 b/FreeBSD-4.0/ipv6-patch-4.2
index 90dac19eb044..90dac19eb044 100644
--- a/contrib/ipfilter/FreeBSD-4.0/ipv6-patch-4.2
+++ b/FreeBSD-4.0/ipv6-patch-4.2
diff --git a/contrib/ipfilter/FreeBSD-4.0/kinstall b/FreeBSD-4.0/kinstall
index ebd6e2e8a075..ebd6e2e8a075 100755
--- a/contrib/ipfilter/FreeBSD-4.0/kinstall
+++ b/FreeBSD-4.0/kinstall
diff --git a/contrib/ipfilter/FreeBSD-4.0/unkinstall b/FreeBSD-4.0/unkinstall
index 4e9caaa9e541..4e9caaa9e541 100755
--- a/contrib/ipfilter/FreeBSD-4.0/unkinstall
+++ b/FreeBSD-4.0/unkinstall
diff --git a/contrib/ipfilter/FreeBSD/conf.c.diffs b/FreeBSD/conf.c.diffs
index afd288040d43..afd288040d43 100644
--- a/contrib/ipfilter/FreeBSD/conf.c.diffs
+++ b/FreeBSD/conf.c.diffs
diff --git a/contrib/ipfilter/FreeBSD/files.diffs b/FreeBSD/files.diffs
index 2f028e337eb0..2f028e337eb0 100644
--- a/contrib/ipfilter/FreeBSD/files.diffs
+++ b/FreeBSD/files.diffs
diff --git a/contrib/ipfilter/FreeBSD/files.newconf.diffs b/FreeBSD/files.newconf.diffs
index 29aea54dc2fa..29aea54dc2fa 100644
--- a/contrib/ipfilter/FreeBSD/files.newconf.diffs
+++ b/FreeBSD/files.newconf.diffs
diff --git a/contrib/ipfilter/FreeBSD/files.oldconf.diffs b/FreeBSD/files.oldconf.diffs
index ed8aff94b39f..ed8aff94b39f 100644
--- a/contrib/ipfilter/FreeBSD/files.oldconf.diffs
+++ b/FreeBSD/files.oldconf.diffs
diff --git a/contrib/ipfilter/FreeBSD/filez.diffs b/FreeBSD/filez.diffs
index 96560063dcd7..96560063dcd7 100644
--- a/contrib/ipfilter/FreeBSD/filez.diffs
+++ b/FreeBSD/filez.diffs
diff --git a/contrib/ipfilter/FreeBSD/in_proto.c.diffs b/FreeBSD/in_proto.c.diffs
index 052dd514ee18..052dd514ee18 100644
--- a/contrib/ipfilter/FreeBSD/in_proto.c.diffs
+++ b/FreeBSD/in_proto.c.diffs
diff --git a/contrib/ipfilter/FreeBSD/ip_input.c.diffs b/FreeBSD/ip_input.c.diffs
index a70be897ea89..a70be897ea89 100644
--- a/contrib/ipfilter/FreeBSD/ip_input.c.diffs
+++ b/FreeBSD/ip_input.c.diffs
diff --git a/contrib/ipfilter/FreeBSD/ip_output.c.diffs b/FreeBSD/ip_output.c.diffs
index f1fe9accea03..f1fe9accea03 100644
--- a/contrib/ipfilter/FreeBSD/ip_output.c.diffs
+++ b/FreeBSD/ip_output.c.diffs
diff --git a/contrib/ipfilter/FreeBSD/kinstall b/FreeBSD/kinstall
index 2b67b9ad995c..2b67b9ad995c 100755
--- a/contrib/ipfilter/FreeBSD/kinstall
+++ b/FreeBSD/kinstall
diff --git a/contrib/ipfilter/FreeBSD/minstall b/FreeBSD/minstall
index 0cfe7c360d9a..0cfe7c360d9a 100755
--- a/contrib/ipfilter/FreeBSD/minstall
+++ b/FreeBSD/minstall
diff --git a/contrib/ipfilter/FreeBSD/unkinstall b/FreeBSD/unkinstall
index 8547fcd90d8b..8547fcd90d8b 100755
--- a/contrib/ipfilter/FreeBSD/unkinstall
+++ b/FreeBSD/unkinstall
diff --git a/contrib/ipfilter/FreeBSD/unminstall b/FreeBSD/unminstall
index a25746cb4f70..a25746cb4f70 100755
--- a/contrib/ipfilter/FreeBSD/unminstall
+++ b/FreeBSD/unminstall
diff --git a/contrib/ipfilter/HISTORY b/HISTORY
index b500c20632ca..b500c20632ca 100644
--- a/contrib/ipfilter/HISTORY
+++ b/HISTORY
diff --git a/contrib/ipfilter/IMPORTANT b/IMPORTANT
index 0ef7a3d390f7..0ef7a3d390f7 100644
--- a/contrib/ipfilter/IMPORTANT
+++ b/IMPORTANT
diff --git a/contrib/ipfilter/INST.FreeBSD-2.2 b/INST.FreeBSD-2.2
index 78f7295e0894..78f7295e0894 100644
--- a/contrib/ipfilter/INST.FreeBSD-2.2
+++ b/INST.FreeBSD-2.2
diff --git a/contrib/ipfilter/INSTALL.BSDOS b/INSTALL.BSDOS
index 17d9602ef8ab..17d9602ef8ab 100644
--- a/contrib/ipfilter/INSTALL.BSDOS
+++ b/INSTALL.BSDOS
diff --git a/contrib/ipfilter/INSTALL.BSDOS3 b/INSTALL.BSDOS3
index 8842b981911c..8842b981911c 100644
--- a/contrib/ipfilter/INSTALL.BSDOS3
+++ b/INSTALL.BSDOS3
diff --git a/contrib/ipfilter/INSTALL.FreeBSD b/INSTALL.FreeBSD
index a4a787ac42be..a4a787ac42be 100644
--- a/contrib/ipfilter/INSTALL.FreeBSD
+++ b/INSTALL.FreeBSD
diff --git a/contrib/ipfilter/INSTALL.IRIX b/INSTALL.IRIX
index b64d4349879b..b64d4349879b 100644
--- a/contrib/ipfilter/INSTALL.IRIX
+++ b/INSTALL.IRIX
diff --git a/contrib/ipfilter/INSTALL.Linux b/INSTALL.Linux
index 1a5d15b59f02..1a5d15b59f02 100644
--- a/contrib/ipfilter/INSTALL.Linux
+++ b/INSTALL.Linux
diff --git a/contrib/ipfilter/INSTALL.NetBSD b/INSTALL.NetBSD
index 012d6d7f8d2d..012d6d7f8d2d 100644
--- a/contrib/ipfilter/INSTALL.NetBSD
+++ b/INSTALL.NetBSD
diff --git a/contrib/ipfilter/INSTALL.Sol2 b/INSTALL.Sol2
index 5ba84b931985..5ba84b931985 100644
--- a/contrib/ipfilter/INSTALL.Sol2
+++ b/INSTALL.Sol2
diff --git a/contrib/ipfilter/INSTALL.SunOS b/INSTALL.SunOS
index 0d4dd8c5e07a..0d4dd8c5e07a 100644
--- a/contrib/ipfilter/INSTALL.SunOS
+++ b/INSTALL.SunOS
diff --git a/contrib/ipfilter/INSTALL.xBSD b/INSTALL.xBSD
index b06ad4b8ab3b..b06ad4b8ab3b 100644
--- a/contrib/ipfilter/INSTALL.xBSD
+++ b/INSTALL.xBSD
diff --git a/contrib/ipfilter/IPF.KANJI b/IPF.KANJI
index 85af5ce9e9aa..85af5ce9e9aa 100644
--- a/contrib/ipfilter/IPF.KANJI
+++ b/IPF.KANJI
diff --git a/contrib/ipfilter/IPFILTER.LICENCE b/IPFILTER.LICENCE
index 41c151ccdedb..41c151ccdedb 100644
--- a/contrib/ipfilter/IPFILTER.LICENCE
+++ b/IPFILTER.LICENCE
diff --git a/contrib/ipfilter/LICENCE b/LICENCE
index f4cc8ee76bfa..f4cc8ee76bfa 100644
--- a/contrib/ipfilter/LICENCE
+++ b/LICENCE
diff --git a/contrib/ipfilter/Makefile b/Makefile
index 1b2f8f5618a5..1b2f8f5618a5 100644
--- a/contrib/ipfilter/Makefile
+++ b/Makefile
diff --git a/contrib/ipfilter/NAT.FreeBSD b/NAT.FreeBSD
index 8a7e95262f7c..8a7e95262f7c 100644
--- a/contrib/ipfilter/NAT.FreeBSD
+++ b/NAT.FreeBSD
diff --git a/contrib/ipfilter/QNX_OCL.txt b/QNX_OCL.txt
index 6aa33eaf6b06..6aa33eaf6b06 100644
--- a/contrib/ipfilter/QNX_OCL.txt
+++ b/QNX_OCL.txt
diff --git a/contrib/ipfilter/README b/README
index 8464af4c64d2..8464af4c64d2 100644
--- a/contrib/ipfilter/README
+++ b/README
diff --git a/contrib/ipfilter/STYLE.TXT b/STYLE.TXT
index 384bcec3d909..384bcec3d909 100644
--- a/contrib/ipfilter/STYLE.TXT
+++ b/STYLE.TXT
diff --git a/contrib/ipfilter/UPGRADE_NOTICE b/UPGRADE_NOTICE
index 8b4476072b27..8b4476072b27 100644
--- a/contrib/ipfilter/UPGRADE_NOTICE
+++ b/UPGRADE_NOTICE
diff --git a/contrib/ipfilter/WhatsNew40.txt b/WhatsNew40.txt
index e5b8294d7be9..e5b8294d7be9 100644
--- a/contrib/ipfilter/WhatsNew40.txt
+++ b/WhatsNew40.txt
diff --git a/contrib/ipfilter/Y2K b/Y2K
index a8350a590070..a8350a590070 100644
--- a/contrib/ipfilter/Y2K
+++ b/Y2K
diff --git a/contrib/ipfilter/bpf-ipf.h b/bpf-ipf.h
index 544455e5ff39..544455e5ff39 100644
--- a/contrib/ipfilter/bpf-ipf.h
+++ b/bpf-ipf.h
diff --git a/contrib/ipfilter/bpf.h b/bpf.h
index 715c79a8d173..715c79a8d173 100644
--- a/contrib/ipfilter/bpf.h
+++ b/bpf.h
diff --git a/contrib/ipfilter/bpf_filter.c b/bpf_filter.c
index a254f650488a..a254f650488a 100644
--- a/contrib/ipfilter/bpf_filter.c
+++ b/bpf_filter.c
diff --git a/contrib/ipfilter/bsdinstall b/bsdinstall
index 7689a2105325..7689a2105325 100755
--- a/contrib/ipfilter/bsdinstall
+++ b/bsdinstall
diff --git a/contrib/ipfilter/buildlinux b/buildlinux
index 7ce043fc6e6a..7ce043fc6e6a 100755
--- a/contrib/ipfilter/buildlinux
+++ b/buildlinux
diff --git a/contrib/ipfilter/buildsunos b/buildsunos
index 5e857e77953c..5e857e77953c 100755
--- a/contrib/ipfilter/buildsunos
+++ b/buildsunos
diff --git a/contrib/ipfilter/common.c b/common.c
index fa21fc97b574..fa21fc97b574 100644
--- a/contrib/ipfilter/common.c
+++ b/common.c
diff --git a/contrib/ipfilter/etc/etc.sed b/etc/etc.sed
index b14fc74851d7..b14fc74851d7 100644
--- a/contrib/ipfilter/etc/etc.sed
+++ b/etc/etc.sed
diff --git a/contrib/ipfilter/etc/protocols b/etc/protocols
index 30c5b7647f17..30c5b7647f17 100644
--- a/contrib/ipfilter/etc/protocols
+++ b/etc/protocols
diff --git a/contrib/ipfilter/etc/services b/etc/services
index d8aa0d5ae223..d8aa0d5ae223 100644
--- a/contrib/ipfilter/etc/services
+++ b/etc/services
diff --git a/contrib/ipfilter/facpri.c b/facpri.c
index 79afdd214729..79afdd214729 100644
--- a/contrib/ipfilter/facpri.c
+++ b/facpri.c
diff --git a/contrib/ipfilter/facpri.h b/facpri.h
index 7b80377d112e..7b80377d112e 100644
--- a/contrib/ipfilter/facpri.h
+++ b/facpri.h
diff --git a/contrib/ipfilter/fil.c b/fil.c
index 6f3a13d57889..6f3a13d57889 100644
--- a/contrib/ipfilter/fil.c
+++ b/fil.c
diff --git a/contrib/ipfilter/fils.c b/fils.c
index e21af892a577..e21af892a577 100644
--- a/contrib/ipfilter/fils.c
+++ b/fils.c
diff --git a/contrib/ipfilter/inet_addr.c b/inet_addr.c
index e940280a280a..e940280a280a 100644
--- a/contrib/ipfilter/inet_addr.c
+++ b/inet_addr.c
diff --git a/contrib/ipfilter/ip_auth.c b/ip_auth.c
index b91c2e6245c0..b91c2e6245c0 100644
--- a/contrib/ipfilter/ip_auth.c
+++ b/ip_auth.c
diff --git a/contrib/ipfilter/ip_auth.h b/ip_auth.h
index a39e7fd823f1..a39e7fd823f1 100644
--- a/contrib/ipfilter/ip_auth.h
+++ b/ip_auth.h
diff --git a/contrib/ipfilter/ip_compat.h b/ip_compat.h
index 6ea3f709a558..6ea3f709a558 100644
--- a/contrib/ipfilter/ip_compat.h
+++ b/ip_compat.h
diff --git a/contrib/ipfilter/ip_fil.c b/ip_fil.c
index f2006e9c805e..f2006e9c805e 100644
--- a/contrib/ipfilter/ip_fil.c
+++ b/ip_fil.c
diff --git a/contrib/ipfilter/ip_fil.h b/ip_fil.h
index 2aacb3f0af78..2aacb3f0af78 100644
--- a/contrib/ipfilter/ip_fil.h
+++ b/ip_fil.h
diff --git a/contrib/ipfilter/ip_fil_freebsd.c b/ip_fil_freebsd.c
index 3b36b93117a8..3b36b93117a8 100644
--- a/contrib/ipfilter/ip_fil_freebsd.c
+++ b/ip_fil_freebsd.c
diff --git a/contrib/ipfilter/ip_frag.c b/ip_frag.c
index 087ca19e72c3..087ca19e72c3 100644
--- a/contrib/ipfilter/ip_frag.c
+++ b/ip_frag.c
diff --git a/contrib/ipfilter/ip_frag.h b/ip_frag.h
index 786a08821086..786a08821086 100644
--- a/contrib/ipfilter/ip_frag.h
+++ b/ip_frag.h
diff --git a/contrib/ipfilter/ip_ftp_pxy.c b/ip_ftp_pxy.c
index 5bdc18a7c1ed..5bdc18a7c1ed 100644
--- a/contrib/ipfilter/ip_ftp_pxy.c
+++ b/ip_ftp_pxy.c
diff --git a/contrib/ipfilter/ip_h323_pxy.c b/ip_h323_pxy.c
index b6e7c7bf34e8..b6e7c7bf34e8 100644
--- a/contrib/ipfilter/ip_h323_pxy.c
+++ b/ip_h323_pxy.c
diff --git a/contrib/ipfilter/ip_htable.c b/ip_htable.c
index 50aa92627b29..50aa92627b29 100644
--- a/contrib/ipfilter/ip_htable.c
+++ b/ip_htable.c
diff --git a/contrib/ipfilter/ip_htable.h b/ip_htable.h
index e13845977d09..e13845977d09 100644
--- a/contrib/ipfilter/ip_htable.h
+++ b/ip_htable.h
diff --git a/contrib/ipfilter/ip_ipsec_pxy.c b/ip_ipsec_pxy.c
index 2159ecb08078..2159ecb08078 100644
--- a/contrib/ipfilter/ip_ipsec_pxy.c
+++ b/ip_ipsec_pxy.c
diff --git a/contrib/ipfilter/ip_irc_pxy.c b/ip_irc_pxy.c
index 45a120f519b6..45a120f519b6 100644
--- a/contrib/ipfilter/ip_irc_pxy.c
+++ b/ip_irc_pxy.c
diff --git a/contrib/ipfilter/ip_lfil.c b/ip_lfil.c
index 196d64e0fedf..196d64e0fedf 100644
--- a/contrib/ipfilter/ip_lfil.c
+++ b/ip_lfil.c
diff --git a/contrib/ipfilter/ip_log.c b/ip_log.c
index 124308197949..124308197949 100644
--- a/contrib/ipfilter/ip_log.c
+++ b/ip_log.c
diff --git a/contrib/ipfilter/ip_lookup.c b/ip_lookup.c
index b8323739e6dd..b8323739e6dd 100644
--- a/contrib/ipfilter/ip_lookup.c
+++ b/ip_lookup.c
diff --git a/contrib/ipfilter/ip_lookup.h b/ip_lookup.h
index e9f8cb8afe4d..e9f8cb8afe4d 100644
--- a/contrib/ipfilter/ip_lookup.h
+++ b/ip_lookup.h
diff --git a/contrib/ipfilter/ip_msnrpc_pxy.c b/ip_msnrpc_pxy.c
index 187a9645a527..187a9645a527 100644
--- a/contrib/ipfilter/ip_msnrpc_pxy.c
+++ b/ip_msnrpc_pxy.c
diff --git a/contrib/ipfilter/ip_nat.c b/ip_nat.c
index 55295028463a..55295028463a 100644
--- a/contrib/ipfilter/ip_nat.c
+++ b/ip_nat.c
diff --git a/contrib/ipfilter/ip_nat.h b/ip_nat.h
index 09cc11989a11..09cc11989a11 100644
--- a/contrib/ipfilter/ip_nat.h
+++ b/ip_nat.h
diff --git a/contrib/ipfilter/ip_netbios_pxy.c b/ip_netbios_pxy.c
index 0ff6d2563891..0ff6d2563891 100644
--- a/contrib/ipfilter/ip_netbios_pxy.c
+++ b/ip_netbios_pxy.c
diff --git a/contrib/ipfilter/ip_pool.c b/ip_pool.c
index b6e111bdd946..b6e111bdd946 100644
--- a/contrib/ipfilter/ip_pool.c
+++ b/ip_pool.c
diff --git a/contrib/ipfilter/ip_pool.h b/ip_pool.h
index 3e3c07355229..3e3c07355229 100644
--- a/contrib/ipfilter/ip_pool.h
+++ b/ip_pool.h
diff --git a/contrib/ipfilter/ip_pptp_pxy.c b/ip_pptp_pxy.c
index 2511a17600d6..2511a17600d6 100644
--- a/contrib/ipfilter/ip_pptp_pxy.c
+++ b/ip_pptp_pxy.c
diff --git a/contrib/ipfilter/ip_proxy.c b/ip_proxy.c
index 18bc4e1fce5a..18bc4e1fce5a 100644
--- a/contrib/ipfilter/ip_proxy.c
+++ b/ip_proxy.c
diff --git a/contrib/ipfilter/ip_proxy.h b/ip_proxy.h
index 8e53c988cc95..8e53c988cc95 100644
--- a/contrib/ipfilter/ip_proxy.h
+++ b/ip_proxy.h
diff --git a/contrib/ipfilter/ip_raudio_pxy.c b/ip_raudio_pxy.c
index 260fcd465856..260fcd465856 100644
--- a/contrib/ipfilter/ip_raudio_pxy.c
+++ b/ip_raudio_pxy.c
diff --git a/contrib/ipfilter/ip_rcmd_pxy.c b/ip_rcmd_pxy.c
index b7904c8b1356..b7904c8b1356 100644
--- a/contrib/ipfilter/ip_rcmd_pxy.c
+++ b/ip_rcmd_pxy.c
diff --git a/contrib/ipfilter/ip_rpcb_pxy.c b/ip_rpcb_pxy.c
index 5d0a1ee43dac..5d0a1ee43dac 100644
--- a/contrib/ipfilter/ip_rpcb_pxy.c
+++ b/ip_rpcb_pxy.c
diff --git a/contrib/ipfilter/ip_scan.c b/ip_scan.c
index 37f6d58ef167..37f6d58ef167 100644
--- a/contrib/ipfilter/ip_scan.c
+++ b/ip_scan.c
diff --git a/contrib/ipfilter/ip_scan.h b/ip_scan.h
index de98f9cd6b79..de98f9cd6b79 100644
--- a/contrib/ipfilter/ip_scan.h
+++ b/ip_scan.h
diff --git a/contrib/ipfilter/ip_sfil.c b/ip_sfil.c
index 9e995d9b85c8..9e995d9b85c8 100644
--- a/contrib/ipfilter/ip_sfil.c
+++ b/ip_sfil.c
diff --git a/contrib/ipfilter/ip_state.c b/ip_state.c
index 4ced16d3460d..4ced16d3460d 100644
--- a/contrib/ipfilter/ip_state.c
+++ b/ip_state.c
diff --git a/contrib/ipfilter/ip_state.h b/ip_state.h
index 2f5f7f11dcc3..2f5f7f11dcc3 100644
--- a/contrib/ipfilter/ip_state.h
+++ b/ip_state.h
diff --git a/contrib/ipfilter/ip_sync.c b/ip_sync.c
index 396bae791196..396bae791196 100644
--- a/contrib/ipfilter/ip_sync.c
+++ b/ip_sync.c
diff --git a/contrib/ipfilter/ip_sync.h b/ip_sync.h
index e319a95dfcdb..e319a95dfcdb 100644
--- a/contrib/ipfilter/ip_sync.h
+++ b/ip_sync.h
diff --git a/contrib/ipfilter/ipf.c b/ipf.c
index cf8528046897..cf8528046897 100644
--- a/contrib/ipfilter/ipf.c
+++ b/ipf.c
diff --git a/contrib/ipfilter/ipf.h b/ipf.h
index 1a2d0f003895..1a2d0f003895 100644
--- a/contrib/ipfilter/ipf.h
+++ b/ipf.h
diff --git a/contrib/ipfilter/ipfs.c b/ipfs.c
index ffbd71bd6488..ffbd71bd6488 100644
--- a/contrib/ipfilter/ipfs.c
+++ b/ipfs.c
diff --git a/contrib/ipfilter/ipft_ef.c b/ipft_ef.c
index c8ae3f2a5934..c8ae3f2a5934 100644
--- a/contrib/ipfilter/ipft_ef.c
+++ b/ipft_ef.c
diff --git a/contrib/ipfilter/ipft_hx.c b/ipft_hx.c
index b26bd93e02aa..b26bd93e02aa 100644
--- a/contrib/ipfilter/ipft_hx.c
+++ b/ipft_hx.c
diff --git a/contrib/ipfilter/ipft_pc.c b/ipft_pc.c
index b6060de2297d..b6060de2297d 100644
--- a/contrib/ipfilter/ipft_pc.c
+++ b/ipft_pc.c
diff --git a/contrib/ipfilter/ipft_sn.c b/ipft_sn.c
index 859bf5ed9df7..859bf5ed9df7 100644
--- a/contrib/ipfilter/ipft_sn.c
+++ b/ipft_sn.c
diff --git a/contrib/ipfilter/ipft_td.c b/ipft_td.c
index 99beab5b6a44..99beab5b6a44 100644
--- a/contrib/ipfilter/ipft_td.c
+++ b/ipft_td.c
diff --git a/contrib/ipfilter/ipft_tx.c b/ipft_tx.c
index 7ea87e334c86..7ea87e334c86 100644
--- a/contrib/ipfilter/ipft_tx.c
+++ b/ipft_tx.c
diff --git a/contrib/ipfilter/ipl.h b/ipl.h
index 7e90820c85d9..7e90820c85d9 100644
--- a/contrib/ipfilter/ipl.h
+++ b/ipl.h
diff --git a/contrib/ipfilter/ipl_ldev.c b/ipl_ldev.c
index a2893257e72e..a2893257e72e 100644
--- a/contrib/ipfilter/ipl_ldev.c
+++ b/ipl_ldev.c
diff --git a/contrib/ipfilter/iplang/.cvsignore b/iplang/.cvsignore
index 68b5b4e4e985..68b5b4e4e985 100644
--- a/contrib/ipfilter/iplang/.cvsignore
+++ b/iplang/.cvsignore
diff --git a/contrib/ipfilter/iplang/BNF b/iplang/BNF
index b5fb8d09ae2d..b5fb8d09ae2d 100644
--- a/contrib/ipfilter/iplang/BNF
+++ b/iplang/BNF
diff --git a/contrib/ipfilter/iplang/Makefile b/iplang/Makefile
index 1d66bb655c5a..1d66bb655c5a 100644
--- a/contrib/ipfilter/iplang/Makefile
+++ b/iplang/Makefile
diff --git a/contrib/ipfilter/iplang/iplang.h b/iplang/iplang.h
index f36a3843c0aa..f36a3843c0aa 100644
--- a/contrib/ipfilter/iplang/iplang.h
+++ b/iplang/iplang.h
diff --git a/contrib/ipfilter/iplang/iplang.tst b/iplang/iplang.tst
index a0a2ad3315ae..a0a2ad3315ae 100644
--- a/contrib/ipfilter/iplang/iplang.tst
+++ b/iplang/iplang.tst
diff --git a/contrib/ipfilter/iplang/iplang_l.l b/iplang/iplang_l.l
index fae30a25ed2d..fae30a25ed2d 100644
--- a/contrib/ipfilter/iplang/iplang_l.l
+++ b/iplang/iplang_l.l
diff --git a/contrib/ipfilter/iplang/iplang_y.y b/iplang/iplang_y.y
index 735ac37a23ff..735ac37a23ff 100644
--- a/contrib/ipfilter/iplang/iplang_y.y
+++ b/iplang/iplang_y.y
diff --git a/contrib/ipfilter/ipmon.c b/ipmon.c
index 2e4b2b546275..2e4b2b546275 100644
--- a/contrib/ipfilter/ipmon.c
+++ b/ipmon.c
diff --git a/contrib/ipfilter/ipmon.h b/ipmon.h
index 5c6f8c5a5f2a..5c6f8c5a5f2a 100644
--- a/contrib/ipfilter/ipmon.h
+++ b/ipmon.h
diff --git a/contrib/ipfilter/ipnat.c b/ipnat.c
index 69e7959260e7..69e7959260e7 100644
--- a/contrib/ipfilter/ipnat.c
+++ b/ipnat.c
diff --git a/contrib/ipfilter/ipsd/Celler/ip_compat.h b/ipsd/Celler/ip_compat.h
index a911fd83c3f3..a911fd83c3f3 100644
--- a/contrib/ipfilter/ipsd/Celler/ip_compat.h
+++ b/ipsd/Celler/ip_compat.h
diff --git a/contrib/ipfilter/ipsd/Makefile b/ipsd/Makefile
index 0f3ce08ba229..0f3ce08ba229 100644
--- a/contrib/ipfilter/ipsd/Makefile
+++ b/ipsd/Makefile
diff --git a/contrib/ipfilter/ipsd/README b/ipsd/README
index eb6b7986cd77..eb6b7986cd77 100644
--- a/contrib/ipfilter/ipsd/README
+++ b/ipsd/README
diff --git a/contrib/ipfilter/ipsd/ip_compat.h b/ipsd/ip_compat.h
index a911fd83c3f3..a911fd83c3f3 100644
--- a/contrib/ipfilter/ipsd/ip_compat.h
+++ b/ipsd/ip_compat.h
diff --git a/contrib/ipfilter/ipsd/ipsd.c b/ipsd/ipsd.c
index 51d0a148902f..51d0a148902f 100644
--- a/contrib/ipfilter/ipsd/ipsd.c
+++ b/ipsd/ipsd.c
diff --git a/contrib/ipfilter/ipsd/ipsd.h b/ipsd/ipsd.h
index 3726b84149b1..3726b84149b1 100644
--- a/contrib/ipfilter/ipsd/ipsd.h
+++ b/ipsd/ipsd.h
diff --git a/contrib/ipfilter/ipsd/ipsd.sed b/ipsd/ipsd.sed
index e69de29bb2d1..e69de29bb2d1 100644
--- a/contrib/ipfilter/ipsd/ipsd.sed
+++ b/ipsd/ipsd.sed
diff --git a/contrib/ipfilter/ipsd/ipsdr.c b/ipsd/ipsdr.c
index af007e45f8aa..af007e45f8aa 100644
--- a/contrib/ipfilter/ipsd/ipsdr.c
+++ b/ipsd/ipsdr.c
diff --git a/contrib/ipfilter/ipsd/linux.h b/ipsd/linux.h
index d9606cbba15d..d9606cbba15d 100644
--- a/contrib/ipfilter/ipsd/linux.h
+++ b/ipsd/linux.h
diff --git a/contrib/ipfilter/ipsd/sbpf.c b/ipsd/sbpf.c
index 457891b78104..457891b78104 100644
--- a/contrib/ipfilter/ipsd/sbpf.c
+++ b/ipsd/sbpf.c
diff --git a/contrib/ipfilter/ipsd/sdlpi.c b/ipsd/sdlpi.c
index baede7c46a06..baede7c46a06 100644
--- a/contrib/ipfilter/ipsd/sdlpi.c
+++ b/ipsd/sdlpi.c
diff --git a/contrib/ipfilter/ipsd/slinux.c b/ipsd/slinux.c
index 6372a607b2c1..6372a607b2c1 100644
--- a/contrib/ipfilter/ipsd/slinux.c
+++ b/ipsd/slinux.c
diff --git a/contrib/ipfilter/ipsd/snit.c b/ipsd/snit.c
index e78c59190e00..e78c59190e00 100644
--- a/contrib/ipfilter/ipsd/snit.c
+++ b/ipsd/snit.c
diff --git a/contrib/ipfilter/ipsend/.OLD/ip_compat.h b/ipsend/.OLD/ip_compat.h
index c38fa59ed3c7..c38fa59ed3c7 100644
--- a/contrib/ipfilter/ipsend/.OLD/ip_compat.h
+++ b/ipsend/.OLD/ip_compat.h
diff --git a/contrib/ipfilter/ipsend/.cvsignore b/ipsend/.cvsignore
index b7aea24eb881..b7aea24eb881 100644
--- a/contrib/ipfilter/ipsend/.cvsignore
+++ b/ipsend/.cvsignore
diff --git a/contrib/ipfilter/ipsend/44arp.c b/ipsend/44arp.c
index 4b08a8b5ce18..4b08a8b5ce18 100644
--- a/contrib/ipfilter/ipsend/44arp.c
+++ b/ipsend/44arp.c
diff --git a/contrib/ipfilter/ipsend/Crashable b/ipsend/Crashable
index c7ffcde38c32..c7ffcde38c32 100644
--- a/contrib/ipfilter/ipsend/Crashable
+++ b/ipsend/Crashable
diff --git a/contrib/ipfilter/ipsend/Makefile b/ipsend/Makefile
index ed3a51e45370..ed3a51e45370 100644
--- a/contrib/ipfilter/ipsend/Makefile
+++ b/ipsend/Makefile
diff --git a/contrib/ipfilter/ipsend/README b/ipsend/README
index 198556d834fb..198556d834fb 100644
--- a/contrib/ipfilter/ipsend/README
+++ b/ipsend/README
diff --git a/contrib/ipfilter/ipsend/arp.c b/ipsend/arp.c
index d5497ef2599e..d5497ef2599e 100644
--- a/contrib/ipfilter/ipsend/arp.c
+++ b/ipsend/arp.c
diff --git a/contrib/ipfilter/ipsend/dlcommon.c b/ipsend/dlcommon.c
index 89941388a618..89941388a618 100644
--- a/contrib/ipfilter/ipsend/dlcommon.c
+++ b/ipsend/dlcommon.c
diff --git a/contrib/ipfilter/ipsend/dltest.h b/ipsend/dltest.h
index 4c32c30eb1bc..4c32c30eb1bc 100644
--- a/contrib/ipfilter/ipsend/dltest.h
+++ b/ipsend/dltest.h
diff --git a/contrib/ipfilter/ipsend/hpux.c b/ipsend/hpux.c
index 42078e3b7f54..42078e3b7f54 100644
--- a/contrib/ipfilter/ipsend/hpux.c
+++ b/ipsend/hpux.c
diff --git a/contrib/ipfilter/ipsend/in_var.h b/ipsend/in_var.h
index 2ebd731a4892..2ebd731a4892 100644
--- a/contrib/ipfilter/ipsend/in_var.h
+++ b/ipsend/in_var.h
diff --git a/contrib/ipfilter/ipsend/ip.c b/ipsend/ip.c
index e29f72253650..e29f72253650 100644
--- a/contrib/ipfilter/ipsend/ip.c
+++ b/ipsend/ip.c
diff --git a/contrib/ipfilter/ipsend/ip_compat.h b/ipsend/ip_compat.h
index c38fa59ed3c7..c38fa59ed3c7 100644
--- a/contrib/ipfilter/ipsend/ip_compat.h
+++ b/ipsend/ip_compat.h
diff --git a/contrib/ipfilter/ipsend/ip_var.h b/ipsend/ip_var.h
index 92eb38a0befc..92eb38a0befc 100644
--- a/contrib/ipfilter/ipsend/ip_var.h
+++ b/ipsend/ip_var.h
diff --git a/contrib/ipfilter/ipsend/ipresend.1 b/ipsend/ipresend.1
index 6014313587b0..6014313587b0 100644
--- a/contrib/ipfilter/ipsend/ipresend.1
+++ b/ipsend/ipresend.1
diff --git a/contrib/ipfilter/ipsend/ipresend.c b/ipsend/ipresend.c
index 7e52fe959f51..7e52fe959f51 100644
--- a/contrib/ipfilter/ipsend/ipresend.c
+++ b/ipsend/ipresend.c
diff --git a/contrib/ipfilter/ipsend/ipsend.1 b/ipsend/ipsend.1
index f2f806658dd3..f2f806658dd3 100644
--- a/contrib/ipfilter/ipsend/ipsend.1
+++ b/ipsend/ipsend.1
diff --git a/contrib/ipfilter/ipsend/ipsend.5 b/ipsend/ipsend.5
index 4c1e66af3f81..4c1e66af3f81 100644
--- a/contrib/ipfilter/ipsend/ipsend.5
+++ b/ipsend/ipsend.5
diff --git a/contrib/ipfilter/ipsend/ipsend.c b/ipsend/ipsend.c
index dcd897ccdda7..dcd897ccdda7 100644
--- a/contrib/ipfilter/ipsend/ipsend.c
+++ b/ipsend/ipsend.c
diff --git a/contrib/ipfilter/ipsend/ipsend.h b/ipsend/ipsend.h
index f5e51a7364c2..f5e51a7364c2 100644
--- a/contrib/ipfilter/ipsend/ipsend.h
+++ b/ipsend/ipsend.h
diff --git a/contrib/ipfilter/ipsend/ipsend.sed b/ipsend/ipsend.sed
index 774c0e24e3df..774c0e24e3df 100644
--- a/contrib/ipfilter/ipsend/ipsend.sed
+++ b/ipsend/ipsend.sed
diff --git a/contrib/ipfilter/ipsend/ipsopt.c b/ipsend/ipsopt.c
index 9326bc63c4a2..9326bc63c4a2 100644
--- a/contrib/ipfilter/ipsend/ipsopt.c
+++ b/ipsend/ipsopt.c
diff --git a/contrib/ipfilter/ipsend/iptest.1 b/ipsend/iptest.1
index ca740946347c..ca740946347c 100644
--- a/contrib/ipfilter/ipsend/iptest.1
+++ b/ipsend/iptest.1
diff --git a/contrib/ipfilter/ipsend/iptest.c b/ipsend/iptest.c
index 000d1cc254e8..000d1cc254e8 100644
--- a/contrib/ipfilter/ipsend/iptest.c
+++ b/ipsend/iptest.c
diff --git a/contrib/ipfilter/ipsend/iptests.c b/ipsend/iptests.c
index 56cc34b9f87d..56cc34b9f87d 100644
--- a/contrib/ipfilter/ipsend/iptests.c
+++ b/ipsend/iptests.c
diff --git a/contrib/ipfilter/ipsend/larp.c b/ipsend/larp.c
index 3d0c89c66a56..3d0c89c66a56 100644
--- a/contrib/ipfilter/ipsend/larp.c
+++ b/ipsend/larp.c
diff --git a/contrib/ipfilter/ipsend/linux.h b/ipsend/linux.h
index ae2e05f58264..ae2e05f58264 100644
--- a/contrib/ipfilter/ipsend/linux.h
+++ b/ipsend/linux.h
diff --git a/contrib/ipfilter/ipsend/lsock.c b/ipsend/lsock.c
index 7163ea7db5fd..7163ea7db5fd 100644
--- a/contrib/ipfilter/ipsend/lsock.c
+++ b/ipsend/lsock.c
diff --git a/contrib/ipfilter/ipsend/resend.c b/ipsend/resend.c
index e7b1ef42cfa5..e7b1ef42cfa5 100644
--- a/contrib/ipfilter/ipsend/resend.c
+++ b/ipsend/resend.c
diff --git a/contrib/ipfilter/ipsend/sbpf.c b/ipsend/sbpf.c
index 374b7ed6ad9b..374b7ed6ad9b 100644
--- a/contrib/ipfilter/ipsend/sbpf.c
+++ b/ipsend/sbpf.c
diff --git a/contrib/ipfilter/ipsend/sdlpi.c b/ipsend/sdlpi.c
index 1ce894659c3a..1ce894659c3a 100644
--- a/contrib/ipfilter/ipsend/sdlpi.c
+++ b/ipsend/sdlpi.c
diff --git a/contrib/ipfilter/ipsend/sirix.c b/ipsend/sirix.c
index 0f634f766a46..0f634f766a46 100644
--- a/contrib/ipfilter/ipsend/sirix.c
+++ b/ipsend/sirix.c
diff --git a/contrib/ipfilter/ipsend/slinux.c b/ipsend/slinux.c
index 7c362b6e46d7..7c362b6e46d7 100644
--- a/contrib/ipfilter/ipsend/slinux.c
+++ b/ipsend/slinux.c
diff --git a/contrib/ipfilter/ipsend/snit.c b/ipsend/snit.c
index bcd07d04003e..bcd07d04003e 100644
--- a/contrib/ipfilter/ipsend/snit.c
+++ b/ipsend/snit.c
diff --git a/contrib/ipfilter/ipsend/sock.c b/ipsend/sock.c
index f4317fcccb16..f4317fcccb16 100644
--- a/contrib/ipfilter/ipsend/sock.c
+++ b/ipsend/sock.c
diff --git a/contrib/ipfilter/ipsend/sockraw.c b/ipsend/sockraw.c
index 0e3fe5928ca1..0e3fe5928ca1 100644
--- a/contrib/ipfilter/ipsend/sockraw.c
+++ b/ipsend/sockraw.c
diff --git a/contrib/ipfilter/ipsend/tcpip.h b/ipsend/tcpip.h
index 44a2de995c28..44a2de995c28 100644
--- a/contrib/ipfilter/ipsend/tcpip.h
+++ b/ipsend/tcpip.h
diff --git a/contrib/ipfilter/ipsend/ultrix.c b/ipsend/ultrix.c
index f41a8a9a7481..f41a8a9a7481 100644
--- a/contrib/ipfilter/ipsend/ultrix.c
+++ b/ipsend/ultrix.c
diff --git a/contrib/ipfilter/ipt.c b/ipt.c
index 5a20f240aa9d..5a20f240aa9d 100644
--- a/contrib/ipfilter/ipt.c
+++ b/ipt.c
diff --git a/contrib/ipfilter/ipt.h b/ipt.h
index 43b9a6d1c68f..43b9a6d1c68f 100644
--- a/contrib/ipfilter/ipt.h
+++ b/ipt.h
diff --git a/contrib/ipfilter/kmem.c b/kmem.c
index 5723ba3806c6..5723ba3806c6 100644
--- a/contrib/ipfilter/kmem.c
+++ b/kmem.c
diff --git a/contrib/ipfilter/kmem.h b/kmem.h
index d2b1171aeb2c..d2b1171aeb2c 100644
--- a/contrib/ipfilter/kmem.h
+++ b/kmem.h
diff --git a/contrib/ipfilter/l4check/Makefile b/l4check/Makefile
index e2bb9f8b3cff..e2bb9f8b3cff 100644
--- a/contrib/ipfilter/l4check/Makefile
+++ b/l4check/Makefile
diff --git a/contrib/ipfilter/l4check/http.check b/l4check/http.check
index 56d93d9281a6..56d93d9281a6 100644
--- a/contrib/ipfilter/l4check/http.check
+++ b/l4check/http.check
diff --git a/contrib/ipfilter/l4check/http.ok b/l4check/http.ok
index 2b5d2c15266d..2b5d2c15266d 100644
--- a/contrib/ipfilter/l4check/http.ok
+++ b/l4check/http.ok
diff --git a/contrib/ipfilter/l4check/l4check.c b/l4check/l4check.c
index a096fffe4477..a096fffe4477 100644
--- a/contrib/ipfilter/l4check/l4check.c
+++ b/l4check/l4check.c
diff --git a/contrib/ipfilter/l4check/l4check.conf b/l4check/l4check.conf
index d000e9fc5b48..d000e9fc5b48 100644
--- a/contrib/ipfilter/l4check/l4check.conf
+++ b/l4check/l4check.conf
diff --git a/contrib/ipfilter/lib/Makefile b/lib/Makefile
index a838063c674c..a838063c674c 100644
--- a/contrib/ipfilter/lib/Makefile
+++ b/lib/Makefile
diff --git a/contrib/ipfilter/lib/addicmp.c b/lib/addicmp.c
index 256739786b17..256739786b17 100644
--- a/contrib/ipfilter/lib/addicmp.c
+++ b/lib/addicmp.c
diff --git a/contrib/ipfilter/lib/addipopt.c b/lib/addipopt.c
index 17fac0dc2c8e..17fac0dc2c8e 100644
--- a/contrib/ipfilter/lib/addipopt.c
+++ b/lib/addipopt.c
diff --git a/contrib/ipfilter/lib/addkeep.c b/lib/addkeep.c
index bbc7759fbc93..bbc7759fbc93 100644
--- a/contrib/ipfilter/lib/addkeep.c
+++ b/lib/addkeep.c
diff --git a/contrib/ipfilter/lib/alist_free.c b/lib/alist_free.c
index 3c1a51880430..3c1a51880430 100644
--- a/contrib/ipfilter/lib/alist_free.c
+++ b/lib/alist_free.c
diff --git a/contrib/ipfilter/lib/alist_new.c b/lib/alist_new.c
index 50a4275e7d54..50a4275e7d54 100644
--- a/contrib/ipfilter/lib/alist_new.c
+++ b/lib/alist_new.c
diff --git a/contrib/ipfilter/lib/bcopywrap.c b/lib/bcopywrap.c
index 83fd04b34634..83fd04b34634 100644
--- a/contrib/ipfilter/lib/bcopywrap.c
+++ b/lib/bcopywrap.c
diff --git a/contrib/ipfilter/lib/binprint.c b/lib/binprint.c
index 4eb38280763c..4eb38280763c 100644
--- a/contrib/ipfilter/lib/binprint.c
+++ b/lib/binprint.c
diff --git a/contrib/ipfilter/lib/buildopts.c b/lib/buildopts.c
index d493f5e8de76..d493f5e8de76 100644
--- a/contrib/ipfilter/lib/buildopts.c
+++ b/lib/buildopts.c
diff --git a/contrib/ipfilter/lib/checkrev.c b/lib/checkrev.c
index 3c40226a98cf..3c40226a98cf 100644
--- a/contrib/ipfilter/lib/checkrev.c
+++ b/lib/checkrev.c
diff --git a/contrib/ipfilter/lib/count4bits.c b/lib/count4bits.c
index 51e60252b3bf..51e60252b3bf 100644
--- a/contrib/ipfilter/lib/count4bits.c
+++ b/lib/count4bits.c
diff --git a/contrib/ipfilter/lib/count6bits.c b/lib/count6bits.c
index be090b7be30d..be090b7be30d 100644
--- a/contrib/ipfilter/lib/count6bits.c
+++ b/lib/count6bits.c
diff --git a/contrib/ipfilter/lib/debug.c b/lib/debug.c
index 144bc0231a06..144bc0231a06 100644
--- a/contrib/ipfilter/lib/debug.c
+++ b/lib/debug.c
diff --git a/contrib/ipfilter/lib/extras.c b/lib/extras.c
index 9087ca69c1ab..9087ca69c1ab 100644
--- a/contrib/ipfilter/lib/extras.c
+++ b/lib/extras.c
diff --git a/contrib/ipfilter/lib/facpri.c b/lib/facpri.c
index 6785e22448f6..6785e22448f6 100644
--- a/contrib/ipfilter/lib/facpri.c
+++ b/lib/facpri.c
diff --git a/contrib/ipfilter/lib/facpri.h b/lib/facpri.h
index b6d5f5afc363..b6d5f5afc363 100644
--- a/contrib/ipfilter/lib/facpri.h
+++ b/lib/facpri.h
diff --git a/contrib/ipfilter/lib/fill6bits.c b/lib/fill6bits.c
index a5f459a28af0..a5f459a28af0 100644
--- a/contrib/ipfilter/lib/fill6bits.c
+++ b/lib/fill6bits.c
diff --git a/contrib/ipfilter/lib/flags.c b/lib/flags.c
index 4baf3bdc277f..4baf3bdc277f 100644
--- a/contrib/ipfilter/lib/flags.c
+++ b/lib/flags.c
diff --git a/contrib/ipfilter/lib/genmask.c b/lib/genmask.c
index 238e5b62afeb..238e5b62afeb 100644
--- a/contrib/ipfilter/lib/genmask.c
+++ b/lib/genmask.c
diff --git a/contrib/ipfilter/lib/gethost.c b/lib/gethost.c
index d97766f1f102..d97766f1f102 100644
--- a/contrib/ipfilter/lib/gethost.c
+++ b/lib/gethost.c
diff --git a/contrib/ipfilter/lib/getifname.c b/lib/getifname.c
index 6163239edb29..6163239edb29 100644
--- a/contrib/ipfilter/lib/getifname.c
+++ b/lib/getifname.c
diff --git a/contrib/ipfilter/lib/getline.c b/lib/getline.c
index 7d06d4367b28..7d06d4367b28 100644
--- a/contrib/ipfilter/lib/getline.c
+++ b/lib/getline.c
diff --git a/contrib/ipfilter/lib/getnattype.c b/lib/getnattype.c
index 04463c22234a..04463c22234a 100644
--- a/contrib/ipfilter/lib/getnattype.c
+++ b/lib/getnattype.c
diff --git a/contrib/ipfilter/lib/getport.c b/lib/getport.c
index 1c5177c56006..1c5177c56006 100644
--- a/contrib/ipfilter/lib/getport.c
+++ b/lib/getport.c
diff --git a/contrib/ipfilter/lib/getportproto.c b/lib/getportproto.c
index 5a247aec6f68..5a247aec6f68 100644
--- a/contrib/ipfilter/lib/getportproto.c
+++ b/lib/getportproto.c
diff --git a/contrib/ipfilter/lib/getproto.c b/lib/getproto.c
index 9714da26a824..9714da26a824 100644
--- a/contrib/ipfilter/lib/getproto.c
+++ b/lib/getproto.c
diff --git a/contrib/ipfilter/lib/getsumd.c b/lib/getsumd.c
index 00974bcf6f8f..00974bcf6f8f 100644
--- a/contrib/ipfilter/lib/getsumd.c
+++ b/lib/getsumd.c
diff --git a/contrib/ipfilter/lib/hexdump.c b/lib/hexdump.c
index 86e731ee4a23..86e731ee4a23 100644
--- a/contrib/ipfilter/lib/hexdump.c
+++ b/lib/hexdump.c
diff --git a/contrib/ipfilter/lib/hostmask.c b/lib/hostmask.c
index 4ee41e16b94f..4ee41e16b94f 100644
--- a/contrib/ipfilter/lib/hostmask.c
+++ b/lib/hostmask.c
diff --git a/contrib/ipfilter/lib/hostname.c b/lib/hostname.c
index b8295d40321b..b8295d40321b 100644
--- a/contrib/ipfilter/lib/hostname.c
+++ b/lib/hostname.c
diff --git a/contrib/ipfilter/lib/hostnum.c b/lib/hostnum.c
index 2ec0529a2981..2ec0529a2981 100644
--- a/contrib/ipfilter/lib/hostnum.c
+++ b/lib/hostnum.c
diff --git a/contrib/ipfilter/lib/icmpcode.c b/lib/icmpcode.c
index 69841e0cc4b7..69841e0cc4b7 100644
--- a/contrib/ipfilter/lib/icmpcode.c
+++ b/lib/icmpcode.c
diff --git a/contrib/ipfilter/lib/inet_addr.c b/lib/inet_addr.c
index 820b7b58a416..820b7b58a416 100644
--- a/contrib/ipfilter/lib/inet_addr.c
+++ b/lib/inet_addr.c
diff --git a/contrib/ipfilter/lib/initparse.c b/lib/initparse.c
index b9f162f55c27..b9f162f55c27 100644
--- a/contrib/ipfilter/lib/initparse.c
+++ b/lib/initparse.c
diff --git a/contrib/ipfilter/lib/ionames.c b/lib/ionames.c
index cc9374d67644..cc9374d67644 100644
--- a/contrib/ipfilter/lib/ionames.c
+++ b/lib/ionames.c
diff --git a/contrib/ipfilter/lib/ipf_dotuning.c b/lib/ipf_dotuning.c
index 8f90fdbe95a9..8f90fdbe95a9 100644
--- a/contrib/ipfilter/lib/ipf_dotuning.c
+++ b/lib/ipf_dotuning.c
diff --git a/contrib/ipfilter/lib/ipft_ef.c b/lib/ipft_ef.c
index 52eb508de6b1..52eb508de6b1 100644
--- a/contrib/ipfilter/lib/ipft_ef.c
+++ b/lib/ipft_ef.c
diff --git a/contrib/ipfilter/lib/ipft_hx.c b/lib/ipft_hx.c
index 4851fff3eae4..4851fff3eae4 100644
--- a/contrib/ipfilter/lib/ipft_hx.c
+++ b/lib/ipft_hx.c
diff --git a/contrib/ipfilter/lib/ipft_pc.c b/lib/ipft_pc.c
index fbfe6b063db5..fbfe6b063db5 100644
--- a/contrib/ipfilter/lib/ipft_pc.c
+++ b/lib/ipft_pc.c
diff --git a/contrib/ipfilter/lib/ipft_sn.c b/lib/ipft_sn.c
index a4c73185cee3..a4c73185cee3 100644
--- a/contrib/ipfilter/lib/ipft_sn.c
+++ b/lib/ipft_sn.c
diff --git a/contrib/ipfilter/lib/ipft_td.c b/lib/ipft_td.c
index 21bb76430e14..21bb76430e14 100644
--- a/contrib/ipfilter/lib/ipft_td.c
+++ b/lib/ipft_td.c
diff --git a/contrib/ipfilter/lib/ipft_tx.c b/lib/ipft_tx.c
index 5dc65b42be2f..5dc65b42be2f 100644
--- a/contrib/ipfilter/lib/ipft_tx.c
+++ b/lib/ipft_tx.c
diff --git a/contrib/ipfilter/lib/ipoptsec.c b/lib/ipoptsec.c
index a59db23616fd..a59db23616fd 100644
--- a/contrib/ipfilter/lib/ipoptsec.c
+++ b/lib/ipoptsec.c
diff --git a/contrib/ipfilter/lib/kmem.c b/lib/kmem.c
index 07830fbe1073..07830fbe1073 100644
--- a/contrib/ipfilter/lib/kmem.c
+++ b/lib/kmem.c
diff --git a/contrib/ipfilter/lib/kmem.h b/lib/kmem.h
index 70f0a7a10886..70f0a7a10886 100644
--- a/contrib/ipfilter/lib/kmem.h
+++ b/lib/kmem.h
diff --git a/contrib/ipfilter/lib/kmemcpywrap.c b/lib/kmemcpywrap.c
index 7a4a161f339b..7a4a161f339b 100644
--- a/contrib/ipfilter/lib/kmemcpywrap.c
+++ b/lib/kmemcpywrap.c
diff --git a/contrib/ipfilter/lib/kvatoname.c b/lib/kvatoname.c
index b0fe69dafb3c..b0fe69dafb3c 100644
--- a/contrib/ipfilter/lib/kvatoname.c
+++ b/lib/kvatoname.c
diff --git a/contrib/ipfilter/lib/load_file.c b/lib/load_file.c
index 9bb3899aebf5..9bb3899aebf5 100644
--- a/contrib/ipfilter/lib/load_file.c
+++ b/lib/load_file.c
diff --git a/contrib/ipfilter/lib/load_hash.c b/lib/load_hash.c
index 84abca03c166..84abca03c166 100644
--- a/contrib/ipfilter/lib/load_hash.c
+++ b/lib/load_hash.c
diff --git a/contrib/ipfilter/lib/load_hashnode.c b/lib/load_hashnode.c
index 8ff907abe9bf..8ff907abe9bf 100644
--- a/contrib/ipfilter/lib/load_hashnode.c
+++ b/lib/load_hashnode.c
diff --git a/contrib/ipfilter/lib/load_http.c b/lib/load_http.c
index 164b8b4945f5..164b8b4945f5 100644
--- a/contrib/ipfilter/lib/load_http.c
+++ b/lib/load_http.c
diff --git a/contrib/ipfilter/lib/load_pool.c b/lib/load_pool.c
index f22b06328b6f..f22b06328b6f 100644
--- a/contrib/ipfilter/lib/load_pool.c
+++ b/lib/load_pool.c
diff --git a/contrib/ipfilter/lib/load_poolnode.c b/lib/load_poolnode.c
index 2afc4d21f3ac..2afc4d21f3ac 100644
--- a/contrib/ipfilter/lib/load_poolnode.c
+++ b/lib/load_poolnode.c
diff --git a/contrib/ipfilter/lib/load_url.c b/lib/load_url.c
index 77091534b0c2..77091534b0c2 100644
--- a/contrib/ipfilter/lib/load_url.c
+++ b/lib/load_url.c
diff --git a/contrib/ipfilter/lib/loglevel.c b/lib/loglevel.c
index 47dd8bac0273..47dd8bac0273 100644
--- a/contrib/ipfilter/lib/loglevel.c
+++ b/lib/loglevel.c
diff --git a/contrib/ipfilter/lib/make_range.c b/lib/make_range.c
index e4335cddf18b..e4335cddf18b 100644
--- a/contrib/ipfilter/lib/make_range.c
+++ b/lib/make_range.c
diff --git a/contrib/ipfilter/lib/mutex_emul.c b/lib/mutex_emul.c
index 1a5815658236..1a5815658236 100644
--- a/contrib/ipfilter/lib/mutex_emul.c
+++ b/lib/mutex_emul.c
diff --git a/contrib/ipfilter/lib/nametokva.c b/lib/nametokva.c
index 89e347467f42..89e347467f42 100644
--- a/contrib/ipfilter/lib/nametokva.c
+++ b/lib/nametokva.c
diff --git a/contrib/ipfilter/lib/nat_setgroupmap.c b/lib/nat_setgroupmap.c
index ccf7864d40cb..ccf7864d40cb 100644
--- a/contrib/ipfilter/lib/nat_setgroupmap.c
+++ b/lib/nat_setgroupmap.c
diff --git a/contrib/ipfilter/lib/natparse.c b/lib/natparse.c
index 9937380f35a7..9937380f35a7 100644
--- a/contrib/ipfilter/lib/natparse.c
+++ b/lib/natparse.c
diff --git a/contrib/ipfilter/lib/ntomask.c b/lib/ntomask.c
index 4a50ef804578..4a50ef804578 100644
--- a/contrib/ipfilter/lib/ntomask.c
+++ b/lib/ntomask.c
diff --git a/contrib/ipfilter/lib/optname.c b/lib/optname.c
index 33e5f17be348..33e5f17be348 100644
--- a/contrib/ipfilter/lib/optname.c
+++ b/lib/optname.c
diff --git a/contrib/ipfilter/lib/optprint.c b/lib/optprint.c
index 8c14fe47e6b6..8c14fe47e6b6 100644
--- a/contrib/ipfilter/lib/optprint.c
+++ b/lib/optprint.c
diff --git a/contrib/ipfilter/lib/optprintv6.c b/lib/optprintv6.c
index 5172b5c1a6b4..5172b5c1a6b4 100644
--- a/contrib/ipfilter/lib/optprintv6.c
+++ b/lib/optprintv6.c
diff --git a/contrib/ipfilter/lib/optvalue.c b/lib/optvalue.c
index 37bfcf9031f4..37bfcf9031f4 100644
--- a/contrib/ipfilter/lib/optvalue.c
+++ b/lib/optvalue.c
diff --git a/contrib/ipfilter/lib/parse.c b/lib/parse.c
index 1a49d16bbd7e..1a49d16bbd7e 100644
--- a/contrib/ipfilter/lib/parse.c
+++ b/lib/parse.c
diff --git a/contrib/ipfilter/lib/portname.c b/lib/portname.c
index d8bf1d91cc5b..d8bf1d91cc5b 100644
--- a/contrib/ipfilter/lib/portname.c
+++ b/lib/portname.c
diff --git a/contrib/ipfilter/lib/portnum.c b/lib/portnum.c
index 4079f464c21f..4079f464c21f 100644
--- a/contrib/ipfilter/lib/portnum.c
+++ b/lib/portnum.c
diff --git a/contrib/ipfilter/lib/ports.c b/lib/ports.c
index 9a44e2c06a2d..9a44e2c06a2d 100644
--- a/contrib/ipfilter/lib/ports.c
+++ b/lib/ports.c
diff --git a/contrib/ipfilter/lib/print_toif.c b/lib/print_toif.c
index 696fcd317279..696fcd317279 100644
--- a/contrib/ipfilter/lib/print_toif.c
+++ b/lib/print_toif.c
diff --git a/contrib/ipfilter/lib/printactivenat.c b/lib/printactivenat.c
index 99f3e586e759..99f3e586e759 100644
--- a/contrib/ipfilter/lib/printactivenat.c
+++ b/lib/printactivenat.c
diff --git a/contrib/ipfilter/lib/printaps.c b/lib/printaps.c
index c0c36d4dbf6b..c0c36d4dbf6b 100644
--- a/contrib/ipfilter/lib/printaps.c
+++ b/lib/printaps.c
diff --git a/contrib/ipfilter/lib/printbuf.c b/lib/printbuf.c
index bc097e025a67..bc097e025a67 100644
--- a/contrib/ipfilter/lib/printbuf.c
+++ b/lib/printbuf.c
diff --git a/contrib/ipfilter/lib/printfr.c b/lib/printfr.c
index 07506945a02c..07506945a02c 100644
--- a/contrib/ipfilter/lib/printfr.c
+++ b/lib/printfr.c
diff --git a/contrib/ipfilter/lib/printfraginfo.c b/lib/printfraginfo.c
index 012df06960cb..012df06960cb 100644
--- a/contrib/ipfilter/lib/printfraginfo.c
+++ b/lib/printfraginfo.c
diff --git a/contrib/ipfilter/lib/printhash.c b/lib/printhash.c
index 8e7948b88d89..8e7948b88d89 100644
--- a/contrib/ipfilter/lib/printhash.c
+++ b/lib/printhash.c
diff --git a/contrib/ipfilter/lib/printhash_live.c b/lib/printhash_live.c
index 1afe63228e48..1afe63228e48 100644
--- a/contrib/ipfilter/lib/printhash_live.c
+++ b/lib/printhash_live.c
diff --git a/contrib/ipfilter/lib/printhashdata.c b/lib/printhashdata.c
index d278c365a69f..d278c365a69f 100644
--- a/contrib/ipfilter/lib/printhashdata.c
+++ b/lib/printhashdata.c
diff --git a/contrib/ipfilter/lib/printhashnode.c b/lib/printhashnode.c
index 9b51af9bf9ac..9b51af9bf9ac 100644
--- a/contrib/ipfilter/lib/printhashnode.c
+++ b/lib/printhashnode.c
diff --git a/contrib/ipfilter/lib/printhostmap.c b/lib/printhostmap.c
index 92996edfc371..92996edfc371 100644
--- a/contrib/ipfilter/lib/printhostmap.c
+++ b/lib/printhostmap.c
diff --git a/contrib/ipfilter/lib/printhostmask.c b/lib/printhostmask.c
index 105fb20bb56e..105fb20bb56e 100644
--- a/contrib/ipfilter/lib/printhostmask.c
+++ b/lib/printhostmask.c
diff --git a/contrib/ipfilter/lib/printifname.c b/lib/printifname.c
index 1bfe27deeb83..1bfe27deeb83 100644
--- a/contrib/ipfilter/lib/printifname.c
+++ b/lib/printifname.c
diff --git a/contrib/ipfilter/lib/printip.c b/lib/printip.c
index fb91208e9f6b..fb91208e9f6b 100644
--- a/contrib/ipfilter/lib/printip.c
+++ b/lib/printip.c
diff --git a/contrib/ipfilter/lib/printlog.c b/lib/printlog.c
index 192c6717e100..192c6717e100 100644
--- a/contrib/ipfilter/lib/printlog.c
+++ b/lib/printlog.c
diff --git a/contrib/ipfilter/lib/printmask.c b/lib/printmask.c
index 27b3e6cbbf6e..27b3e6cbbf6e 100644
--- a/contrib/ipfilter/lib/printmask.c
+++ b/lib/printmask.c
diff --git a/contrib/ipfilter/lib/printnat.c b/lib/printnat.c
index 37666a2a8d58..37666a2a8d58 100644
--- a/contrib/ipfilter/lib/printnat.c
+++ b/lib/printnat.c
diff --git a/contrib/ipfilter/lib/printpacket.c b/lib/printpacket.c
index 6ee36792b419..6ee36792b419 100644
--- a/contrib/ipfilter/lib/printpacket.c
+++ b/lib/printpacket.c
diff --git a/contrib/ipfilter/lib/printpacket6.c b/lib/printpacket6.c
index 16c807de647e..16c807de647e 100644
--- a/contrib/ipfilter/lib/printpacket6.c
+++ b/lib/printpacket6.c
diff --git a/contrib/ipfilter/lib/printpool.c b/lib/printpool.c
index cfb1e785a003..cfb1e785a003 100644
--- a/contrib/ipfilter/lib/printpool.c
+++ b/lib/printpool.c
diff --git a/contrib/ipfilter/lib/printpool_live.c b/lib/printpool_live.c
index e228a3965adb..e228a3965adb 100644
--- a/contrib/ipfilter/lib/printpool_live.c
+++ b/lib/printpool_live.c
diff --git a/contrib/ipfilter/lib/printpooldata.c b/lib/printpooldata.c
index 8d8e962cbbde..8d8e962cbbde 100644
--- a/contrib/ipfilter/lib/printpooldata.c
+++ b/lib/printpooldata.c
diff --git a/contrib/ipfilter/lib/printpoolnode.c b/lib/printpoolnode.c
index a53ee3306512..a53ee3306512 100644
--- a/contrib/ipfilter/lib/printpoolnode.c
+++ b/lib/printpoolnode.c
diff --git a/contrib/ipfilter/lib/printportcmp.c b/lib/printportcmp.c
index a8203874c49f..a8203874c49f 100644
--- a/contrib/ipfilter/lib/printportcmp.c
+++ b/lib/printportcmp.c
diff --git a/contrib/ipfilter/lib/printproto.c b/lib/printproto.c
index e65ec1160826..e65ec1160826 100644
--- a/contrib/ipfilter/lib/printproto.c
+++ b/lib/printproto.c
diff --git a/contrib/ipfilter/lib/printsbuf.c b/lib/printsbuf.c
index 81f5e0b06750..81f5e0b06750 100644
--- a/contrib/ipfilter/lib/printsbuf.c
+++ b/lib/printsbuf.c
diff --git a/contrib/ipfilter/lib/printstate.c b/lib/printstate.c
index fcf42d675b4d..fcf42d675b4d 100644
--- a/contrib/ipfilter/lib/printstate.c
+++ b/lib/printstate.c
diff --git a/contrib/ipfilter/lib/printtqtable.c b/lib/printtqtable.c
index 67adb53b1c34..67adb53b1c34 100644
--- a/contrib/ipfilter/lib/printtqtable.c
+++ b/lib/printtqtable.c
diff --git a/contrib/ipfilter/lib/printtunable.c b/lib/printtunable.c
index dcf9f859355a..dcf9f859355a 100644
--- a/contrib/ipfilter/lib/printtunable.c
+++ b/lib/printtunable.c
diff --git a/contrib/ipfilter/lib/ratoi.c b/lib/ratoi.c
index fb8552dfcc15..fb8552dfcc15 100644
--- a/contrib/ipfilter/lib/ratoi.c
+++ b/lib/ratoi.c
diff --git a/contrib/ipfilter/lib/ratoui.c b/lib/ratoui.c
index 191f87f4d116..191f87f4d116 100644
--- a/contrib/ipfilter/lib/ratoui.c
+++ b/lib/ratoui.c
diff --git a/contrib/ipfilter/lib/remove_hash.c b/lib/remove_hash.c
index 55dab91ed164..55dab91ed164 100644
--- a/contrib/ipfilter/lib/remove_hash.c
+++ b/lib/remove_hash.c
diff --git a/contrib/ipfilter/lib/remove_hashnode.c b/lib/remove_hashnode.c
index d51f8ab53019..d51f8ab53019 100644
--- a/contrib/ipfilter/lib/remove_hashnode.c
+++ b/lib/remove_hashnode.c
diff --git a/contrib/ipfilter/lib/remove_pool.c b/lib/remove_pool.c
index 19ab4c6c11be..19ab4c6c11be 100644
--- a/contrib/ipfilter/lib/remove_pool.c
+++ b/lib/remove_pool.c
diff --git a/contrib/ipfilter/lib/remove_poolnode.c b/lib/remove_poolnode.c
index ad04b23c03aa..ad04b23c03aa 100644
--- a/contrib/ipfilter/lib/remove_poolnode.c
+++ b/lib/remove_poolnode.c
diff --git a/contrib/ipfilter/lib/resetlexer.c b/lib/resetlexer.c
index ab9b82e468a8..ab9b82e468a8 100644
--- a/contrib/ipfilter/lib/resetlexer.c
+++ b/lib/resetlexer.c
diff --git a/contrib/ipfilter/lib/rwlock_emul.c b/lib/rwlock_emul.c
index 1f0c3a815662..1f0c3a815662 100644
--- a/contrib/ipfilter/lib/rwlock_emul.c
+++ b/lib/rwlock_emul.c
diff --git a/contrib/ipfilter/lib/tcp_flags.c b/lib/tcp_flags.c
index 67b7dad9431e..67b7dad9431e 100644
--- a/contrib/ipfilter/lib/tcp_flags.c
+++ b/lib/tcp_flags.c
diff --git a/contrib/ipfilter/lib/tcpflags.c b/lib/tcpflags.c
index bf2c284417cd..bf2c284417cd 100644
--- a/contrib/ipfilter/lib/tcpflags.c
+++ b/lib/tcpflags.c
diff --git a/contrib/ipfilter/lib/tcpoptnames.c b/lib/tcpoptnames.c
index 7c037366e0f2..7c037366e0f2 100644
--- a/contrib/ipfilter/lib/tcpoptnames.c
+++ b/lib/tcpoptnames.c
diff --git a/contrib/ipfilter/lib/to_interface.c b/lib/to_interface.c
index 8f2c16f04377..8f2c16f04377 100644
--- a/contrib/ipfilter/lib/to_interface.c
+++ b/lib/to_interface.c
diff --git a/contrib/ipfilter/lib/v6ionames.c b/lib/v6ionames.c
index 97c20b0a512a..97c20b0a512a 100644
--- a/contrib/ipfilter/lib/v6ionames.c
+++ b/lib/v6ionames.c
diff --git a/contrib/ipfilter/lib/v6optvalue.c b/lib/v6optvalue.c
index 6123fc247046..6123fc247046 100644
--- a/contrib/ipfilter/lib/v6optvalue.c
+++ b/lib/v6optvalue.c
diff --git a/contrib/ipfilter/lib/var.c b/lib/var.c
index 3d90a236818a..3d90a236818a 100644
--- a/contrib/ipfilter/lib/var.c
+++ b/lib/var.c
diff --git a/contrib/ipfilter/lib/verbose.c b/lib/verbose.c
index 4a856b0c0f53..4a856b0c0f53 100644
--- a/contrib/ipfilter/lib/verbose.c
+++ b/lib/verbose.c
diff --git a/contrib/ipfilter/linux.h b/linux.h
index 61fd821c2adb..61fd821c2adb 100644
--- a/contrib/ipfilter/linux.h
+++ b/linux.h
diff --git a/contrib/ipfilter/man/Makefile b/man/Makefile
index 3f12ccbe87b4..3f12ccbe87b4 100644
--- a/contrib/ipfilter/man/Makefile
+++ b/man/Makefile
diff --git a/contrib/ipfilter/man/ipf.1 b/man/ipf.1
index 5ea06fa74c35..5ea06fa74c35 100644
--- a/contrib/ipfilter/man/ipf.1
+++ b/man/ipf.1
diff --git a/contrib/ipfilter/man/ipf.4 b/man/ipf.4
index e2e5b5b10fbd..e2e5b5b10fbd 100644
--- a/contrib/ipfilter/man/ipf.4
+++ b/man/ipf.4
diff --git a/contrib/ipfilter/man/ipf.5 b/man/ipf.5
index 3fd9e94abd99..3fd9e94abd99 100644
--- a/contrib/ipfilter/man/ipf.5
+++ b/man/ipf.5
diff --git a/contrib/ipfilter/man/ipf.8 b/man/ipf.8
index a438415ea7b7..a438415ea7b7 100644
--- a/contrib/ipfilter/man/ipf.8
+++ b/man/ipf.8
diff --git a/contrib/ipfilter/man/ipfilter.4 b/man/ipfilter.4
index b2d2f2a77245..b2d2f2a77245 100644
--- a/contrib/ipfilter/man/ipfilter.4
+++ b/man/ipfilter.4
diff --git a/contrib/ipfilter/man/ipfilter.4.mandoc b/man/ipfilter.4.mandoc
index 72534a759761..72534a759761 100644
--- a/contrib/ipfilter/man/ipfilter.4.mandoc
+++ b/man/ipfilter.4.mandoc
diff --git a/contrib/ipfilter/man/ipfilter.5 b/man/ipfilter.5
index 0bba0f4bad02..0bba0f4bad02 100644
--- a/contrib/ipfilter/man/ipfilter.5
+++ b/man/ipfilter.5
diff --git a/contrib/ipfilter/man/ipfs.8 b/man/ipfs.8
index d5bf460c2963..d5bf460c2963 100644
--- a/contrib/ipfilter/man/ipfs.8
+++ b/man/ipfs.8
diff --git a/contrib/ipfilter/man/ipfstat.8 b/man/ipfstat.8
index 95cf6f37ff1f..95cf6f37ff1f 100644
--- a/contrib/ipfilter/man/ipfstat.8
+++ b/man/ipfstat.8
diff --git a/contrib/ipfilter/man/ipftest.1 b/man/ipftest.1
index 5153687ed1a5..5153687ed1a5 100644
--- a/contrib/ipfilter/man/ipftest.1
+++ b/man/ipftest.1
diff --git a/contrib/ipfilter/man/ipl.4 b/man/ipl.4
index d8106cc24d64..d8106cc24d64 100644
--- a/contrib/ipfilter/man/ipl.4
+++ b/man/ipl.4
diff --git a/contrib/ipfilter/man/ipmon.5 b/man/ipmon.5
index 2e3eebd06ba2..2e3eebd06ba2 100644
--- a/contrib/ipfilter/man/ipmon.5
+++ b/man/ipmon.5
diff --git a/contrib/ipfilter/man/ipmon.8 b/man/ipmon.8
index 905a9c875404..905a9c875404 100644
--- a/contrib/ipfilter/man/ipmon.8
+++ b/man/ipmon.8
diff --git a/contrib/ipfilter/man/ipnat.1 b/man/ipnat.1
index f24141546171..f24141546171 100644
--- a/contrib/ipfilter/man/ipnat.1
+++ b/man/ipnat.1
diff --git a/contrib/ipfilter/man/ipnat.4 b/man/ipnat.4
index 54f55d3de810..54f55d3de810 100644
--- a/contrib/ipfilter/man/ipnat.4
+++ b/man/ipnat.4
diff --git a/contrib/ipfilter/man/ipnat.5 b/man/ipnat.5
index 2d76a4665064..2d76a4665064 100644
--- a/contrib/ipfilter/man/ipnat.5
+++ b/man/ipnat.5
diff --git a/contrib/ipfilter/man/ipnat.8 b/man/ipnat.8
index 683e8f15d9e9..683e8f15d9e9 100644
--- a/contrib/ipfilter/man/ipnat.8
+++ b/man/ipnat.8
diff --git a/contrib/ipfilter/man/ippool.5 b/man/ippool.5
index aeff3c8b3ae5..aeff3c8b3ae5 100644
--- a/contrib/ipfilter/man/ippool.5
+++ b/man/ippool.5
diff --git a/contrib/ipfilter/man/ippool.8 b/man/ippool.8
index e27cb92c2c91..e27cb92c2c91 100644
--- a/contrib/ipfilter/man/ippool.8
+++ b/man/ippool.8
diff --git a/contrib/ipfilter/man/ipscan.5 b/man/ipscan.5
index cc12ca38d4d3..cc12ca38d4d3 100644
--- a/contrib/ipfilter/man/ipscan.5
+++ b/man/ipscan.5
diff --git a/contrib/ipfilter/man/ipscan.8 b/man/ipscan.8
index 958c45610736..958c45610736 100644
--- a/contrib/ipfilter/man/ipscan.8
+++ b/man/ipscan.8
diff --git a/contrib/ipfilter/man/man.sed b/man/man.sed
index 0be8dab0dc7b..0be8dab0dc7b 100644
--- a/contrib/ipfilter/man/man.sed
+++ b/man/man.sed
diff --git a/contrib/ipfilter/man/mkfilters.1 b/man/mkfilters.1
index b5fd9dc59f36..b5fd9dc59f36 100644
--- a/contrib/ipfilter/man/mkfilters.1
+++ b/man/mkfilters.1
diff --git a/contrib/ipfilter/md5.c b/md5.c
index c46a95764705..c46a95764705 100644
--- a/contrib/ipfilter/md5.c
+++ b/md5.c
diff --git a/contrib/ipfilter/md5.h b/md5.h
index e67f5b1d05cd..e67f5b1d05cd 100644
--- a/contrib/ipfilter/md5.h
+++ b/md5.h
diff --git a/contrib/ipfilter/misc.c b/misc.c
index e39b98fd76f3..e39b98fd76f3 100644
--- a/contrib/ipfilter/misc.c
+++ b/misc.c
diff --git a/contrib/ipfilter/mkfilters b/mkfilters
index f0e6ff465940..f0e6ff465940 100644
--- a/contrib/ipfilter/mkfilters
+++ b/mkfilters
diff --git a/contrib/ipfilter/ml_ipl.c b/ml_ipl.c
index 4db9a9b06722..4db9a9b06722 100644
--- a/contrib/ipfilter/ml_ipl.c
+++ b/ml_ipl.c
diff --git a/contrib/ipfilter/mlf_ipl.c b/mlf_ipl.c
index b39a14d0d877..b39a14d0d877 100644
--- a/contrib/ipfilter/mlf_ipl.c
+++ b/mlf_ipl.c
diff --git a/contrib/ipfilter/mlf_rule.c b/mlf_rule.c
index c540ebde5faa..c540ebde5faa 100644
--- a/contrib/ipfilter/mlf_rule.c
+++ b/mlf_rule.c
diff --git a/contrib/ipfilter/mlfk_ipl.c b/mlfk_ipl.c
index 0f50feab0f59..0f50feab0f59 100644
--- a/contrib/ipfilter/mlfk_ipl.c
+++ b/mlfk_ipl.c
diff --git a/contrib/ipfilter/mlfk_rule.c b/mlfk_rule.c
index c17507613d87..c17507613d87 100644
--- a/contrib/ipfilter/mlfk_rule.c
+++ b/mlfk_rule.c
diff --git a/contrib/ipfilter/mlh_rule.c b/mlh_rule.c
index e71c7be1c0b7..e71c7be1c0b7 100644
--- a/contrib/ipfilter/mlh_rule.c
+++ b/mlh_rule.c
diff --git a/contrib/ipfilter/mli_ipl.c b/mli_ipl.c
index 235a5af21f17..235a5af21f17 100644
--- a/contrib/ipfilter/mli_ipl.c
+++ b/mli_ipl.c
diff --git a/contrib/ipfilter/mln_ipl.c b/mln_ipl.c
index b170940e8921..b170940e8921 100644
--- a/contrib/ipfilter/mln_ipl.c
+++ b/mln_ipl.c
diff --git a/contrib/ipfilter/mls_ipl.c b/mls_ipl.c
index 5a70ab9d35a1..5a70ab9d35a1 100644
--- a/contrib/ipfilter/mls_ipl.c
+++ b/mls_ipl.c
diff --git a/contrib/ipfilter/natparse.c b/natparse.c
index 72462340b1a5..72462340b1a5 100644
--- a/contrib/ipfilter/natparse.c
+++ b/natparse.c
diff --git a/contrib/ipfilter/net/.cvsignore b/net/.cvsignore
index 19f86f493ab1..19f86f493ab1 100644
--- a/contrib/ipfilter/net/.cvsignore
+++ b/net/.cvsignore
diff --git a/contrib/ipfilter/opt.c b/opt.c
index 825a5e346dd0..825a5e346dd0 100644
--- a/contrib/ipfilter/opt.c
+++ b/opt.c
diff --git a/contrib/ipfilter/opt_inet6.h b/opt_inet6.h
index 43e7657e1ae3..43e7657e1ae3 100644
--- a/contrib/ipfilter/opt_inet6.h
+++ b/opt_inet6.h
diff --git a/contrib/ipfilter/opts.h b/opts.h
index 655f9f09ef43..655f9f09ef43 100644
--- a/contrib/ipfilter/opts.h
+++ b/opts.h
diff --git a/contrib/ipfilter/parse.c b/parse.c
index 0d8a617d4aa3..0d8a617d4aa3 100644
--- a/contrib/ipfilter/parse.c
+++ b/parse.c
diff --git a/contrib/ipfilter/pcap-ipf.h b/pcap-ipf.h
index 2ad5b01b22d5..2ad5b01b22d5 100644
--- a/contrib/ipfilter/pcap-ipf.h
+++ b/pcap-ipf.h
diff --git a/contrib/ipfilter/pcap.h b/pcap.h
index aa2479811a89..aa2479811a89 100644
--- a/contrib/ipfilter/pcap.h
+++ b/pcap.h
diff --git a/contrib/ipfilter/perl/Ipfanaly.pl b/perl/Ipfanaly.pl
index 0fa7c17ef7fb..0fa7c17ef7fb 100644
--- a/contrib/ipfilter/perl/Ipfanaly.pl
+++ b/perl/Ipfanaly.pl
diff --git a/contrib/ipfilter/perl/Isbgraph b/perl/Isbgraph
index c68b672322f0..c68b672322f0 100644
--- a/contrib/ipfilter/perl/Isbgraph
+++ b/perl/Isbgraph
diff --git a/contrib/ipfilter/perl/LICENSE b/perl/LICENSE
index 4ae42df58d9c..4ae42df58d9c 100644
--- a/contrib/ipfilter/perl/LICENSE
+++ b/perl/LICENSE
diff --git a/contrib/ipfilter/perl/Services b/perl/Services
index 401fff00dd03..401fff00dd03 100644
--- a/contrib/ipfilter/perl/Services
+++ b/perl/Services
diff --git a/contrib/ipfilter/perl/ipf-mrtg.pl b/perl/ipf-mrtg.pl
index cce30ab09c5b..cce30ab09c5b 100644
--- a/contrib/ipfilter/perl/ipf-mrtg.pl
+++ b/perl/ipf-mrtg.pl
diff --git a/contrib/ipfilter/perl/ipfmeta.pl b/perl/ipfmeta.pl
index 1a7bb3f1a0e7..1a7bb3f1a0e7 100644
--- a/contrib/ipfilter/perl/ipfmeta.pl
+++ b/perl/ipfmeta.pl
diff --git a/contrib/ipfilter/perl/logfilter.pl b/perl/logfilter.pl
index 6ebe401ab4ee..6ebe401ab4ee 100644
--- a/contrib/ipfilter/perl/logfilter.pl
+++ b/perl/logfilter.pl
diff --git a/contrib/ipfilter/perl/plog b/perl/plog
index 208c6ea8f131..208c6ea8f131 100644
--- a/contrib/ipfilter/perl/plog
+++ b/perl/plog
diff --git a/contrib/ipfilter/printnat.c b/printnat.c
index 5a12b32165bd..5a12b32165bd 100644
--- a/contrib/ipfilter/printnat.c
+++ b/printnat.c
diff --git a/contrib/ipfilter/printstate.c b/printstate.c
index 624493b4686c..624493b4686c 100644
--- a/contrib/ipfilter/printstate.c
+++ b/printstate.c
diff --git a/contrib/ipfilter/radix.c b/radix.c
index f9fc20cc3e18..f9fc20cc3e18 100644
--- a/contrib/ipfilter/radix.c
+++ b/radix.c
diff --git a/contrib/ipfilter/radix_ipf.h b/radix_ipf.h
index f9b0a3077de9..f9b0a3077de9 100644
--- a/contrib/ipfilter/radix_ipf.h
+++ b/radix_ipf.h
diff --git a/contrib/ipfilter/relay.c b/relay.c
index 6a67433c61a9..6a67433c61a9 100644
--- a/contrib/ipfilter/relay.c
+++ b/relay.c
diff --git a/contrib/ipfilter/rules/.cvsignore b/rules/.cvsignore
index 3e757656cf36..3e757656cf36 100644
--- a/contrib/ipfilter/rules/.cvsignore
+++ b/rules/.cvsignore
diff --git a/contrib/ipfilter/rules/BASIC.NAT b/rules/BASIC.NAT
index 213e33815c19..213e33815c19 100644
--- a/contrib/ipfilter/rules/BASIC.NAT
+++ b/rules/BASIC.NAT
diff --git a/contrib/ipfilter/rules/BASIC_1.FW b/rules/BASIC_1.FW
index d2bd60a31889..d2bd60a31889 100644
--- a/contrib/ipfilter/rules/BASIC_1.FW
+++ b/rules/BASIC_1.FW
diff --git a/contrib/ipfilter/rules/BASIC_2.FW b/rules/BASIC_2.FW
index 46564f0ee412..46564f0ee412 100644
--- a/contrib/ipfilter/rules/BASIC_2.FW
+++ b/rules/BASIC_2.FW
diff --git a/contrib/ipfilter/rules/example.1 b/rules/example.1
index ff93f492cafe..ff93f492cafe 100644
--- a/contrib/ipfilter/rules/example.1
+++ b/rules/example.1
diff --git a/contrib/ipfilter/rules/example.10 b/rules/example.10
index 560d1e670f61..560d1e670f61 100644
--- a/contrib/ipfilter/rules/example.10
+++ b/rules/example.10
diff --git a/contrib/ipfilter/rules/example.11 b/rules/example.11
index c6b4e7ff0d73..c6b4e7ff0d73 100644
--- a/contrib/ipfilter/rules/example.11
+++ b/rules/example.11
diff --git a/contrib/ipfilter/rules/example.12 b/rules/example.12
index c0ba1d3cdda1..c0ba1d3cdda1 100644
--- a/contrib/ipfilter/rules/example.12
+++ b/rules/example.12
diff --git a/contrib/ipfilter/rules/example.13 b/rules/example.13
index 854f07f1694f..854f07f1694f 100644
--- a/contrib/ipfilter/rules/example.13
+++ b/rules/example.13
diff --git a/contrib/ipfilter/rules/example.2 b/rules/example.2
index 4f81725eeb0c..4f81725eeb0c 100644
--- a/contrib/ipfilter/rules/example.2
+++ b/rules/example.2
diff --git a/contrib/ipfilter/rules/example.3 b/rules/example.3
index cd31f73e7c2b..cd31f73e7c2b 100644
--- a/contrib/ipfilter/rules/example.3
+++ b/rules/example.3
diff --git a/contrib/ipfilter/rules/example.4 b/rules/example.4
index 7918ec2fbd99..7918ec2fbd99 100644
--- a/contrib/ipfilter/rules/example.4
+++ b/rules/example.4
diff --git a/contrib/ipfilter/rules/example.5 b/rules/example.5
index 6d688b5eab80..6d688b5eab80 100644
--- a/contrib/ipfilter/rules/example.5
+++ b/rules/example.5
diff --git a/contrib/ipfilter/rules/example.6 b/rules/example.6
index d40f0f3d2a18..d40f0f3d2a18 100644
--- a/contrib/ipfilter/rules/example.6
+++ b/rules/example.6
diff --git a/contrib/ipfilter/rules/example.7 b/rules/example.7
index 062de9811935..062de9811935 100644
--- a/contrib/ipfilter/rules/example.7
+++ b/rules/example.7
diff --git a/contrib/ipfilter/rules/example.8 b/rules/example.8
index baa02581256e..baa02581256e 100644
--- a/contrib/ipfilter/rules/example.8
+++ b/rules/example.8
diff --git a/contrib/ipfilter/rules/example.9 b/rules/example.9
index daff2031db8e..daff2031db8e 100644
--- a/contrib/ipfilter/rules/example.9
+++ b/rules/example.9
diff --git a/contrib/ipfilter/rules/example.sr b/rules/example.sr
index c4c1994030ba..c4c1994030ba 100644
--- a/contrib/ipfilter/rules/example.sr
+++ b/rules/example.sr
diff --git a/contrib/ipfilter/rules/firewall b/rules/firewall
index 681a81da20b6..681a81da20b6 100644
--- a/contrib/ipfilter/rules/firewall
+++ b/rules/firewall
diff --git a/contrib/ipfilter/rules/ftp-proxy b/rules/ftp-proxy
index ad2f7171e85a..ad2f7171e85a 100644
--- a/contrib/ipfilter/rules/ftp-proxy
+++ b/rules/ftp-proxy
diff --git a/contrib/ipfilter/rules/ftppxy b/rules/ftppxy
index 2c42c527fa1e..2c42c527fa1e 100755
--- a/contrib/ipfilter/rules/ftppxy
+++ b/rules/ftppxy
diff --git a/contrib/ipfilter/rules/ip_rules b/rules/ip_rules
index 9850f16b9306..9850f16b9306 100644
--- a/contrib/ipfilter/rules/ip_rules
+++ b/rules/ip_rules
diff --git a/contrib/ipfilter/rules/ipmon.conf b/rules/ipmon.conf
index 47b01463575c..47b01463575c 100644
--- a/contrib/ipfilter/rules/ipmon.conf
+++ b/rules/ipmon.conf
diff --git a/contrib/ipfilter/rules/nat-setup b/rules/nat-setup
index b10e8f113e0c..b10e8f113e0c 100644
--- a/contrib/ipfilter/rules/nat-setup
+++ b/rules/nat-setup
diff --git a/contrib/ipfilter/rules/nat.eg b/rules/nat.eg
index 9c26754a57fa..9c26754a57fa 100644
--- a/contrib/ipfilter/rules/nat.eg
+++ b/rules/nat.eg
diff --git a/contrib/ipfilter/rules/pool.conf b/rules/pool.conf
index 285398ddf3b1..285398ddf3b1 100644
--- a/contrib/ipfilter/rules/pool.conf
+++ b/rules/pool.conf
diff --git a/contrib/ipfilter/rules/rules.sed b/rules/rules.sed
index 050d9b6ab710..050d9b6ab710 100644
--- a/contrib/ipfilter/rules/rules.sed
+++ b/rules/rules.sed
diff --git a/contrib/ipfilter/rules/server b/rules/server
index f2fb2041faf0..f2fb2041faf0 100644
--- a/contrib/ipfilter/rules/server
+++ b/rules/server
diff --git a/contrib/ipfilter/rules/tcpstate b/rules/tcpstate
index 339a25f963fc..339a25f963fc 100644
--- a/contrib/ipfilter/rules/tcpstate
+++ b/rules/tcpstate
diff --git a/contrib/ipfilter/samples/.cvsignore b/samples/.cvsignore
index 4d38251c2f4f..4d38251c2f4f 100644
--- a/contrib/ipfilter/samples/.cvsignore
+++ b/samples/.cvsignore
diff --git a/contrib/ipfilter/samples/Makefile b/samples/Makefile
index 47ab4a26d5c0..47ab4a26d5c0 100644
--- a/contrib/ipfilter/samples/Makefile
+++ b/samples/Makefile
diff --git a/contrib/ipfilter/samples/ipfilter-pb.gif b/samples/ipfilter-pb.gif
index afaefa866541..afaefa866541 100644
--- a/contrib/ipfilter/samples/ipfilter-pb.gif
+++ b/samples/ipfilter-pb.gif
Binary files differ
diff --git a/contrib/ipfilter/samples/proxy.c b/samples/proxy.c
index f2063ecde813..f2063ecde813 100644
--- a/contrib/ipfilter/samples/proxy.c
+++ b/samples/proxy.c
diff --git a/contrib/ipfilter/samples/relay.c b/samples/relay.c
index 6b96fc42f613..6b96fc42f613 100644
--- a/contrib/ipfilter/samples/relay.c
+++ b/samples/relay.c
diff --git a/contrib/ipfilter/samples/userauth.c b/samples/userauth.c
index dbfeac60bfce..dbfeac60bfce 100644
--- a/contrib/ipfilter/samples/userauth.c
+++ b/samples/userauth.c
diff --git a/contrib/ipfilter/snoop.h b/snoop.h
index 8fa6f7e4a34a..8fa6f7e4a34a 100644
--- a/contrib/ipfilter/snoop.h
+++ b/snoop.h
diff --git a/contrib/ipfilter/solaris.c b/solaris.c
index aa139d3b042a..aa139d3b042a 100644
--- a/contrib/ipfilter/solaris.c
+++ b/solaris.c
diff --git a/contrib/ipfilter/test/.cvsignore b/test/.cvsignore
index 5825abcde9c7..5825abcde9c7 100644
--- a/contrib/ipfilter/test/.cvsignore
+++ b/test/.cvsignore
diff --git a/contrib/ipfilter/test/Makefile b/test/Makefile
index b0462f3f388d..b0462f3f388d 100644
--- a/contrib/ipfilter/test/Makefile
+++ b/test/Makefile
diff --git a/contrib/ipfilter/test/README.TXT b/test/README.TXT
index 0b621458ca3d..0b621458ca3d 100644
--- a/contrib/ipfilter/test/README.TXT
+++ b/test/README.TXT
diff --git a/contrib/ipfilter/test/bpftest b/test/bpftest
index b24c0f16ae49..b24c0f16ae49 100644
--- a/contrib/ipfilter/test/bpftest
+++ b/test/bpftest
diff --git a/contrib/ipfilter/test/dotest b/test/dotest
index 29891091da59..29891091da59 100644
--- a/contrib/ipfilter/test/dotest
+++ b/test/dotest
diff --git a/contrib/ipfilter/test/dotest6 b/test/dotest6
index d6db564ebee2..d6db564ebee2 100755
--- a/contrib/ipfilter/test/dotest6
+++ b/test/dotest6
diff --git a/contrib/ipfilter/test/expected/1 b/test/expected/1
index 93b733336d39..93b733336d39 100644
--- a/contrib/ipfilter/test/expected/1
+++ b/test/expected/1
diff --git a/contrib/ipfilter/test/expected/10 b/test/expected/10
index bc0d83ec88f2..bc0d83ec88f2 100644
--- a/contrib/ipfilter/test/expected/10
+++ b/test/expected/10
diff --git a/contrib/ipfilter/test/expected/11 b/test/expected/11
index eb00875e01a9..eb00875e01a9 100644
--- a/contrib/ipfilter/test/expected/11
+++ b/test/expected/11
diff --git a/contrib/ipfilter/test/expected/12 b/test/expected/12
index f94cf768273a..f94cf768273a 100644
--- a/contrib/ipfilter/test/expected/12
+++ b/test/expected/12
diff --git a/contrib/ipfilter/test/expected/14 b/test/expected/14
index d06d92b3e02a..d06d92b3e02a 100644
--- a/contrib/ipfilter/test/expected/14
+++ b/test/expected/14
diff --git a/contrib/ipfilter/test/expected/2 b/test/expected/2
index 03b71cdb9ea9..03b71cdb9ea9 100644
--- a/contrib/ipfilter/test/expected/2
+++ b/test/expected/2
diff --git a/contrib/ipfilter/test/expected/3 b/test/expected/3
index d06d92b3e02a..d06d92b3e02a 100644
--- a/contrib/ipfilter/test/expected/3
+++ b/test/expected/3
diff --git a/contrib/ipfilter/test/expected/4 b/test/expected/4
index d06d92b3e02a..d06d92b3e02a 100644
--- a/contrib/ipfilter/test/expected/4
+++ b/test/expected/4
diff --git a/contrib/ipfilter/test/expected/5 b/test/expected/5
index bc805805f136..bc805805f136 100644
--- a/contrib/ipfilter/test/expected/5
+++ b/test/expected/5
diff --git a/contrib/ipfilter/test/expected/6 b/test/expected/6
index bc805805f136..bc805805f136 100644
--- a/contrib/ipfilter/test/expected/6
+++ b/test/expected/6
diff --git a/contrib/ipfilter/test/expected/7 b/test/expected/7
index c53d6eaa0cb9..c53d6eaa0cb9 100644
--- a/contrib/ipfilter/test/expected/7
+++ b/test/expected/7
diff --git a/contrib/ipfilter/test/expected/8 b/test/expected/8
index 398058a5ec52..398058a5ec52 100644
--- a/contrib/ipfilter/test/expected/8
+++ b/test/expected/8
diff --git a/contrib/ipfilter/test/expected/9 b/test/expected/9
index a4572e6e94e0..a4572e6e94e0 100644
--- a/contrib/ipfilter/test/expected/9
+++ b/test/expected/9
diff --git a/contrib/ipfilter/test/expected/Makefile b/test/expected/Makefile
index bb91b8b60c4f..bb91b8b60c4f 100644
--- a/contrib/ipfilter/test/expected/Makefile
+++ b/test/expected/Makefile
diff --git a/contrib/ipfilter/test/expected/bpf-f1 b/test/expected/bpf-f1
index 85ce84c9f693..85ce84c9f693 100644
--- a/contrib/ipfilter/test/expected/bpf-f1
+++ b/test/expected/bpf-f1
diff --git a/contrib/ipfilter/test/expected/bpf1 b/test/expected/bpf1
index 76381a748f60..76381a748f60 100644
--- a/contrib/ipfilter/test/expected/bpf1
+++ b/test/expected/bpf1
diff --git a/contrib/ipfilter/test/expected/expected.sed b/test/expected/expected.sed
index e69de29bb2d1..e69de29bb2d1 100644
--- a/contrib/ipfilter/test/expected/expected.sed
+++ b/test/expected/expected.sed
diff --git a/contrib/ipfilter/test/expected/f1 b/test/expected/f1
index 86d9592073e2..86d9592073e2 100644
--- a/contrib/ipfilter/test/expected/f1
+++ b/test/expected/f1
diff --git a/contrib/ipfilter/test/expected/f10 b/test/expected/f10
index da6c312f6ee3..da6c312f6ee3 100644
--- a/contrib/ipfilter/test/expected/f10
+++ b/test/expected/f10
diff --git a/contrib/ipfilter/test/expected/f11 b/test/expected/f11
index c1eb060a7126..c1eb060a7126 100644
--- a/contrib/ipfilter/test/expected/f11
+++ b/test/expected/f11
diff --git a/contrib/ipfilter/test/expected/f12 b/test/expected/f12
index 094d8c01d486..094d8c01d486 100644
--- a/contrib/ipfilter/test/expected/f12
+++ b/test/expected/f12
diff --git a/contrib/ipfilter/test/expected/f13 b/test/expected/f13
index 99c05651cea6..99c05651cea6 100644
--- a/contrib/ipfilter/test/expected/f13
+++ b/test/expected/f13
diff --git a/contrib/ipfilter/test/expected/f14 b/test/expected/f14
index 1c6ed5cb6613..1c6ed5cb6613 100644
--- a/contrib/ipfilter/test/expected/f14
+++ b/test/expected/f14
diff --git a/contrib/ipfilter/test/expected/f15 b/test/expected/f15
index 9b31258e5717..9b31258e5717 100644
--- a/contrib/ipfilter/test/expected/f15
+++ b/test/expected/f15
diff --git a/contrib/ipfilter/test/expected/f16 b/test/expected/f16
index b6cb3fae0818..b6cb3fae0818 100644
--- a/contrib/ipfilter/test/expected/f16
+++ b/test/expected/f16
diff --git a/contrib/ipfilter/test/expected/f17 b/test/expected/f17
index c586e5b59a2c..c586e5b59a2c 100644
--- a/contrib/ipfilter/test/expected/f17
+++ b/test/expected/f17
diff --git a/contrib/ipfilter/test/expected/f18 b/test/expected/f18
index 801abd369426..801abd369426 100644
--- a/contrib/ipfilter/test/expected/f18
+++ b/test/expected/f18
diff --git a/contrib/ipfilter/test/expected/f19 b/test/expected/f19
index 5ee2e9d692a1..5ee2e9d692a1 100644
--- a/contrib/ipfilter/test/expected/f19
+++ b/test/expected/f19
diff --git a/contrib/ipfilter/test/expected/f2 b/test/expected/f2
index 7093a41026bc..7093a41026bc 100644
--- a/contrib/ipfilter/test/expected/f2
+++ b/test/expected/f2
diff --git a/contrib/ipfilter/test/expected/f20 b/test/expected/f20
index 86308a0f1a41..86308a0f1a41 100644
--- a/contrib/ipfilter/test/expected/f20
+++ b/test/expected/f20
diff --git a/contrib/ipfilter/test/expected/f24 b/test/expected/f24
index 801abd369426..801abd369426 100644
--- a/contrib/ipfilter/test/expected/f24
+++ b/test/expected/f24
diff --git a/contrib/ipfilter/test/expected/f3 b/test/expected/f3
index 5df3ac4491e6..5df3ac4491e6 100644
--- a/contrib/ipfilter/test/expected/f3
+++ b/test/expected/f3
diff --git a/contrib/ipfilter/test/expected/f4 b/test/expected/f4
index 5df3ac4491e6..5df3ac4491e6 100644
--- a/contrib/ipfilter/test/expected/f4
+++ b/test/expected/f4
diff --git a/contrib/ipfilter/test/expected/f5 b/test/expected/f5
index 36c7d404ef61..36c7d404ef61 100644
--- a/contrib/ipfilter/test/expected/f5
+++ b/test/expected/f5
diff --git a/contrib/ipfilter/test/expected/f6 b/test/expected/f6
index 36c7d404ef61..36c7d404ef61 100644
--- a/contrib/ipfilter/test/expected/f6
+++ b/test/expected/f6
diff --git a/contrib/ipfilter/test/expected/f7 b/test/expected/f7
index 7a4daedd93e8..7a4daedd93e8 100644
--- a/contrib/ipfilter/test/expected/f7
+++ b/test/expected/f7
diff --git a/contrib/ipfilter/test/expected/f8 b/test/expected/f8
index ad42ff2cc7c4..ad42ff2cc7c4 100644
--- a/contrib/ipfilter/test/expected/f8
+++ b/test/expected/f8
diff --git a/contrib/ipfilter/test/expected/f9 b/test/expected/f9
index cc5be688cd2d..cc5be688cd2d 100644
--- a/contrib/ipfilter/test/expected/f9
+++ b/test/expected/f9
diff --git a/contrib/ipfilter/test/expected/i1 b/test/expected/i1
index 74d0f309b616..74d0f309b616 100644
--- a/contrib/ipfilter/test/expected/i1
+++ b/test/expected/i1
diff --git a/contrib/ipfilter/test/expected/i10 b/test/expected/i10
index 9e0a5d5ab8ba..9e0a5d5ab8ba 100644
--- a/contrib/ipfilter/test/expected/i10
+++ b/test/expected/i10
diff --git a/contrib/ipfilter/test/expected/i11 b/test/expected/i11
index 154f31e810bb..154f31e810bb 100644
--- a/contrib/ipfilter/test/expected/i11
+++ b/test/expected/i11
diff --git a/contrib/ipfilter/test/expected/i12 b/test/expected/i12
index dadf597fc3df..dadf597fc3df 100644
--- a/contrib/ipfilter/test/expected/i12
+++ b/test/expected/i12
diff --git a/contrib/ipfilter/test/expected/i13 b/test/expected/i13
index 5c8d94532b9c..5c8d94532b9c 100644
--- a/contrib/ipfilter/test/expected/i13
+++ b/test/expected/i13
diff --git a/contrib/ipfilter/test/expected/i14 b/test/expected/i14
index 08ba19ad5588..08ba19ad5588 100644
--- a/contrib/ipfilter/test/expected/i14
+++ b/test/expected/i14
diff --git a/contrib/ipfilter/test/expected/i15 b/test/expected/i15
index 49746598df02..49746598df02 100644
--- a/contrib/ipfilter/test/expected/i15
+++ b/test/expected/i15
diff --git a/contrib/ipfilter/test/expected/i16 b/test/expected/i16
index c5b3cf3f6738..c5b3cf3f6738 100644
--- a/contrib/ipfilter/test/expected/i16
+++ b/test/expected/i16
diff --git a/contrib/ipfilter/test/expected/i17 b/test/expected/i17
index bcc4d2d544a5..bcc4d2d544a5 100644
--- a/contrib/ipfilter/test/expected/i17
+++ b/test/expected/i17
diff --git a/contrib/ipfilter/test/expected/i18 b/test/expected/i18
index 88fca4744c46..88fca4744c46 100644
--- a/contrib/ipfilter/test/expected/i18
+++ b/test/expected/i18
diff --git a/contrib/ipfilter/test/expected/i19 b/test/expected/i19
index 4ca19b5138fa..4ca19b5138fa 100644
--- a/contrib/ipfilter/test/expected/i19
+++ b/test/expected/i19
diff --git a/contrib/ipfilter/test/expected/i19.dist b/test/expected/i19.dist
index 5d9c26cfe15a..5d9c26cfe15a 100644
--- a/contrib/ipfilter/test/expected/i19.dist
+++ b/test/expected/i19.dist
diff --git a/contrib/ipfilter/test/expected/i2 b/test/expected/i2
index 5ff18f4f924c..5ff18f4f924c 100644
--- a/contrib/ipfilter/test/expected/i2
+++ b/test/expected/i2
diff --git a/contrib/ipfilter/test/expected/i20 b/test/expected/i20
index 77eabdb55f0b..77eabdb55f0b 100644
--- a/contrib/ipfilter/test/expected/i20
+++ b/test/expected/i20
diff --git a/contrib/ipfilter/test/expected/i21 b/test/expected/i21
index d4d28daa4a58..d4d28daa4a58 100644
--- a/contrib/ipfilter/test/expected/i21
+++ b/test/expected/i21
diff --git a/contrib/ipfilter/test/expected/i3 b/test/expected/i3
index 6150c7e55bd1..6150c7e55bd1 100644
--- a/contrib/ipfilter/test/expected/i3
+++ b/test/expected/i3
diff --git a/contrib/ipfilter/test/expected/i4 b/test/expected/i4
index 49924555a27e..49924555a27e 100644
--- a/contrib/ipfilter/test/expected/i4
+++ b/test/expected/i4
diff --git a/contrib/ipfilter/test/expected/i5 b/test/expected/i5
index edf986558f26..edf986558f26 100644
--- a/contrib/ipfilter/test/expected/i5
+++ b/test/expected/i5
diff --git a/contrib/ipfilter/test/expected/i6 b/test/expected/i6
index e4b14c328cbf..e4b14c328cbf 100644
--- a/contrib/ipfilter/test/expected/i6
+++ b/test/expected/i6
diff --git a/contrib/ipfilter/test/expected/i7 b/test/expected/i7
index 309cd28691b1..309cd28691b1 100644
--- a/contrib/ipfilter/test/expected/i7
+++ b/test/expected/i7
diff --git a/contrib/ipfilter/test/expected/i8 b/test/expected/i8
index f033e6b8d891..f033e6b8d891 100644
--- a/contrib/ipfilter/test/expected/i8
+++ b/test/expected/i8
diff --git a/contrib/ipfilter/test/expected/i9 b/test/expected/i9
index b128f99d57ac..b128f99d57ac 100644
--- a/contrib/ipfilter/test/expected/i9
+++ b/test/expected/i9
diff --git a/contrib/ipfilter/test/expected/in1 b/test/expected/in1
index 03436b65a4dd..03436b65a4dd 100644
--- a/contrib/ipfilter/test/expected/in1
+++ b/test/expected/in1
diff --git a/contrib/ipfilter/test/expected/in2 b/test/expected/in2
index f1239b122137..f1239b122137 100644
--- a/contrib/ipfilter/test/expected/in2
+++ b/test/expected/in2
diff --git a/contrib/ipfilter/test/expected/in3 b/test/expected/in3
index b8a85bf9f380..b8a85bf9f380 100644
--- a/contrib/ipfilter/test/expected/in3
+++ b/test/expected/in3
diff --git a/contrib/ipfilter/test/expected/in4 b/test/expected/in4
index ac8dce1bac8e..ac8dce1bac8e 100644
--- a/contrib/ipfilter/test/expected/in4
+++ b/test/expected/in4
diff --git a/contrib/ipfilter/test/expected/in5 b/test/expected/in5
index e77de714a90d..e77de714a90d 100644
--- a/contrib/ipfilter/test/expected/in5
+++ b/test/expected/in5
diff --git a/contrib/ipfilter/test/expected/in6 b/test/expected/in6
index 05426e7a8dc2..05426e7a8dc2 100644
--- a/contrib/ipfilter/test/expected/in6
+++ b/test/expected/in6
diff --git a/contrib/ipfilter/test/expected/ip1 b/test/expected/ip1
index b04fa9d1ad62..b04fa9d1ad62 100644
--- a/contrib/ipfilter/test/expected/ip1
+++ b/test/expected/ip1
diff --git a/contrib/ipfilter/test/expected/ip2 b/test/expected/ip2
index 9b0ed2babae6..9b0ed2babae6 100644
--- a/contrib/ipfilter/test/expected/ip2
+++ b/test/expected/ip2
diff --git a/contrib/ipfilter/test/expected/ipv6.1 b/test/expected/ipv6.1
index 9fd54371f14b..9fd54371f14b 100644
--- a/contrib/ipfilter/test/expected/ipv6.1
+++ b/test/expected/ipv6.1
diff --git a/contrib/ipfilter/test/expected/ipv6.2 b/test/expected/ipv6.2
index ba1581b489c6..ba1581b489c6 100644
--- a/contrib/ipfilter/test/expected/ipv6.2
+++ b/test/expected/ipv6.2
diff --git a/contrib/ipfilter/test/expected/ipv6.3 b/test/expected/ipv6.3
index 58cddec82dd5..58cddec82dd5 100644
--- a/contrib/ipfilter/test/expected/ipv6.3
+++ b/test/expected/ipv6.3
diff --git a/contrib/ipfilter/test/expected/ipv6.5 b/test/expected/ipv6.5
index 3133a7f09e7f..3133a7f09e7f 100644
--- a/contrib/ipfilter/test/expected/ipv6.5
+++ b/test/expected/ipv6.5
diff --git a/contrib/ipfilter/test/expected/ipv6.6 b/test/expected/ipv6.6
index abc0e87c6917..abc0e87c6917 100644
--- a/contrib/ipfilter/test/expected/ipv6.6
+++ b/test/expected/ipv6.6
diff --git a/contrib/ipfilter/test/expected/l1 b/test/expected/l1
index ba0de69b9239..ba0de69b9239 100644
--- a/contrib/ipfilter/test/expected/l1
+++ b/test/expected/l1
diff --git a/contrib/ipfilter/test/expected/l1.b b/test/expected/l1.b
index c060086d8df4..c060086d8df4 100644
--- a/contrib/ipfilter/test/expected/l1.b
+++ b/test/expected/l1.b
diff --git a/contrib/ipfilter/test/expected/n1 b/test/expected/n1
index 537f9bb65503..537f9bb65503 100644
--- a/contrib/ipfilter/test/expected/n1
+++ b/test/expected/n1
diff --git a/contrib/ipfilter/test/expected/n10 b/test/expected/n10
index ae541d158571..ae541d158571 100644
--- a/contrib/ipfilter/test/expected/n10
+++ b/test/expected/n10
diff --git a/contrib/ipfilter/test/expected/n11 b/test/expected/n11
index 5257a64a1f08..5257a64a1f08 100644
--- a/contrib/ipfilter/test/expected/n11
+++ b/test/expected/n11
diff --git a/contrib/ipfilter/test/expected/n12 b/test/expected/n12
index 0d5cefbf7e77..0d5cefbf7e77 100644
--- a/contrib/ipfilter/test/expected/n12
+++ b/test/expected/n12
diff --git a/contrib/ipfilter/test/expected/n13 b/test/expected/n13
index bfe201886528..bfe201886528 100644
--- a/contrib/ipfilter/test/expected/n13
+++ b/test/expected/n13
diff --git a/contrib/ipfilter/test/expected/n14 b/test/expected/n14
index 46693001a444..46693001a444 100644
--- a/contrib/ipfilter/test/expected/n14
+++ b/test/expected/n14
diff --git a/contrib/ipfilter/test/expected/n16 b/test/expected/n16
index da617d9d3600..da617d9d3600 100644
--- a/contrib/ipfilter/test/expected/n16
+++ b/test/expected/n16
diff --git a/contrib/ipfilter/test/expected/n2 b/test/expected/n2
index 827272e91031..827272e91031 100644
--- a/contrib/ipfilter/test/expected/n2
+++ b/test/expected/n2
diff --git a/contrib/ipfilter/test/expected/n3 b/test/expected/n3
index 0e019aefb2ba..0e019aefb2ba 100644
--- a/contrib/ipfilter/test/expected/n3
+++ b/test/expected/n3
diff --git a/contrib/ipfilter/test/expected/n4 b/test/expected/n4
index 863217c1db79..863217c1db79 100644
--- a/contrib/ipfilter/test/expected/n4
+++ b/test/expected/n4
diff --git a/contrib/ipfilter/test/expected/n5 b/test/expected/n5
index 0e578b64bcfc..0e578b64bcfc 100644
--- a/contrib/ipfilter/test/expected/n5
+++ b/test/expected/n5
diff --git a/contrib/ipfilter/test/expected/n6 b/test/expected/n6
index cbdad9f1388e..cbdad9f1388e 100644
--- a/contrib/ipfilter/test/expected/n6
+++ b/test/expected/n6
diff --git a/contrib/ipfilter/test/expected/n7 b/test/expected/n7
index eb23534d0b30..eb23534d0b30 100644
--- a/contrib/ipfilter/test/expected/n7
+++ b/test/expected/n7
diff --git a/contrib/ipfilter/test/expected/n8 b/test/expected/n8
index d3e061da974a..d3e061da974a 100644
--- a/contrib/ipfilter/test/expected/n8
+++ b/test/expected/n8
diff --git a/contrib/ipfilter/test/expected/n9 b/test/expected/n9
index 917105f74ed4..917105f74ed4 100644
--- a/contrib/ipfilter/test/expected/n9
+++ b/test/expected/n9
diff --git a/contrib/ipfilter/test/expected/ni1 b/test/expected/ni1
index d4e2de2db8a5..d4e2de2db8a5 100644
--- a/contrib/ipfilter/test/expected/ni1
+++ b/test/expected/ni1
diff --git a/contrib/ipfilter/test/expected/ni10 b/test/expected/ni10
index 3ee63fb8ddd0..3ee63fb8ddd0 100644
--- a/contrib/ipfilter/test/expected/ni10
+++ b/test/expected/ni10
diff --git a/contrib/ipfilter/test/expected/ni11 b/test/expected/ni11
index 88d6406e6ee7..88d6406e6ee7 100644
--- a/contrib/ipfilter/test/expected/ni11
+++ b/test/expected/ni11
diff --git a/contrib/ipfilter/test/expected/ni12 b/test/expected/ni12
index 7d24a493fd32..7d24a493fd32 100644
--- a/contrib/ipfilter/test/expected/ni12
+++ b/test/expected/ni12
diff --git a/contrib/ipfilter/test/expected/ni13 b/test/expected/ni13
index 897bef3e9b2c..897bef3e9b2c 100644
--- a/contrib/ipfilter/test/expected/ni13
+++ b/test/expected/ni13
diff --git a/contrib/ipfilter/test/expected/ni14 b/test/expected/ni14
index 5ad5a1b40409..5ad5a1b40409 100644
--- a/contrib/ipfilter/test/expected/ni14
+++ b/test/expected/ni14
diff --git a/contrib/ipfilter/test/expected/ni15 b/test/expected/ni15
index 3820d560d1b7..3820d560d1b7 100644
--- a/contrib/ipfilter/test/expected/ni15
+++ b/test/expected/ni15
diff --git a/contrib/ipfilter/test/expected/ni16 b/test/expected/ni16
index 2c34f5c7094d..2c34f5c7094d 100644
--- a/contrib/ipfilter/test/expected/ni16
+++ b/test/expected/ni16
diff --git a/contrib/ipfilter/test/expected/ni19 b/test/expected/ni19
index fa40771a0f13..fa40771a0f13 100644
--- a/contrib/ipfilter/test/expected/ni19
+++ b/test/expected/ni19
diff --git a/contrib/ipfilter/test/expected/ni2 b/test/expected/ni2
index e2a7eb89ffaf..e2a7eb89ffaf 100644
--- a/contrib/ipfilter/test/expected/ni2
+++ b/test/expected/ni2
diff --git a/contrib/ipfilter/test/expected/ni20 b/test/expected/ni20
index 6001a5af9eb8..6001a5af9eb8 100644
--- a/contrib/ipfilter/test/expected/ni20
+++ b/test/expected/ni20
diff --git a/contrib/ipfilter/test/expected/ni21 b/test/expected/ni21
index 349ae2391cc0..349ae2391cc0 100644
--- a/contrib/ipfilter/test/expected/ni21
+++ b/test/expected/ni21
diff --git a/contrib/ipfilter/test/expected/ni23 b/test/expected/ni23
index 24909b07f059..24909b07f059 100644
--- a/contrib/ipfilter/test/expected/ni23
+++ b/test/expected/ni23
diff --git a/contrib/ipfilter/test/expected/ni3 b/test/expected/ni3
index 107d5d939342..107d5d939342 100644
--- a/contrib/ipfilter/test/expected/ni3
+++ b/test/expected/ni3
diff --git a/contrib/ipfilter/test/expected/ni4 b/test/expected/ni4
index c9f7504d7ac1..c9f7504d7ac1 100644
--- a/contrib/ipfilter/test/expected/ni4
+++ b/test/expected/ni4
diff --git a/contrib/ipfilter/test/expected/ni5 b/test/expected/ni5
index e713cf285101..e713cf285101 100644
--- a/contrib/ipfilter/test/expected/ni5
+++ b/test/expected/ni5
diff --git a/contrib/ipfilter/test/expected/ni6 b/test/expected/ni6
index 0da034a781b3..0da034a781b3 100644
--- a/contrib/ipfilter/test/expected/ni6
+++ b/test/expected/ni6
diff --git a/contrib/ipfilter/test/expected/ni7 b/test/expected/ni7
index 38c39ab71e23..38c39ab71e23 100644
--- a/contrib/ipfilter/test/expected/ni7
+++ b/test/expected/ni7
diff --git a/contrib/ipfilter/test/expected/ni8 b/test/expected/ni8
index 689ccaa87ead..689ccaa87ead 100644
--- a/contrib/ipfilter/test/expected/ni8
+++ b/test/expected/ni8
diff --git a/contrib/ipfilter/test/expected/ni9 b/test/expected/ni9
index 1eb6fbcca8c2..1eb6fbcca8c2 100644
--- a/contrib/ipfilter/test/expected/ni9
+++ b/test/expected/ni9
diff --git a/contrib/ipfilter/test/expected/p1 b/test/expected/p1
index 9f02804439e8..9f02804439e8 100644
--- a/contrib/ipfilter/test/expected/p1
+++ b/test/expected/p1
diff --git a/contrib/ipfilter/test/expected/p2 b/test/expected/p2
index 67a7c3ea26f3..67a7c3ea26f3 100644
--- a/contrib/ipfilter/test/expected/p2
+++ b/test/expected/p2
diff --git a/contrib/ipfilter/test/expected/p3 b/test/expected/p3
index 94fde9e701af..94fde9e701af 100644
--- a/contrib/ipfilter/test/expected/p3
+++ b/test/expected/p3
diff --git a/contrib/ipfilter/test/expected/p5 b/test/expected/p5
index d8ea95c066a9..d8ea95c066a9 100644
--- a/contrib/ipfilter/test/expected/p5
+++ b/test/expected/p5
diff --git a/contrib/ipfilter/test/hextest b/test/hextest
index b7b0b2c75e42..b7b0b2c75e42 100644
--- a/contrib/ipfilter/test/hextest
+++ b/test/hextest
diff --git a/contrib/ipfilter/test/input/1 b/test/input/1
index 7c3ae8a3a3db..7c3ae8a3a3db 100644
--- a/contrib/ipfilter/test/input/1
+++ b/test/input/1
diff --git a/contrib/ipfilter/test/input/10 b/test/input/10
index 254cee7316ff..254cee7316ff 100644
--- a/contrib/ipfilter/test/input/10
+++ b/test/input/10
diff --git a/contrib/ipfilter/test/input/11 b/test/input/11
index 4eda58eac04e..4eda58eac04e 100644
--- a/contrib/ipfilter/test/input/11
+++ b/test/input/11
diff --git a/contrib/ipfilter/test/input/12 b/test/input/12
index 5d9c1de3590d..5d9c1de3590d 100644
--- a/contrib/ipfilter/test/input/12
+++ b/test/input/12
diff --git a/contrib/ipfilter/test/input/13 b/test/input/13
index 56ec16d99b83..56ec16d99b83 100644
--- a/contrib/ipfilter/test/input/13
+++ b/test/input/13
diff --git a/contrib/ipfilter/test/input/14 b/test/input/14
index 16a806ffec7b..16a806ffec7b 100644
--- a/contrib/ipfilter/test/input/14
+++ b/test/input/14
diff --git a/contrib/ipfilter/test/input/2 b/test/input/2
index d168af0c716a..d168af0c716a 100644
--- a/contrib/ipfilter/test/input/2
+++ b/test/input/2
diff --git a/contrib/ipfilter/test/input/3 b/test/input/3
index 16a806ffec7b..16a806ffec7b 100644
--- a/contrib/ipfilter/test/input/3
+++ b/test/input/3
diff --git a/contrib/ipfilter/test/input/4 b/test/input/4
index 2956d1b15454..2956d1b15454 100644
--- a/contrib/ipfilter/test/input/4
+++ b/test/input/4
diff --git a/contrib/ipfilter/test/input/5 b/test/input/5
index 41600c10763b..41600c10763b 100644
--- a/contrib/ipfilter/test/input/5
+++ b/test/input/5
diff --git a/contrib/ipfilter/test/input/6 b/test/input/6
index 21f0be3336c5..21f0be3336c5 100644
--- a/contrib/ipfilter/test/input/6
+++ b/test/input/6
diff --git a/contrib/ipfilter/test/input/7 b/test/input/7
index 2721af2fb71e..2721af2fb71e 100644
--- a/contrib/ipfilter/test/input/7
+++ b/test/input/7
diff --git a/contrib/ipfilter/test/input/8 b/test/input/8
index cace511fbeb8..cace511fbeb8 100644
--- a/contrib/ipfilter/test/input/8
+++ b/test/input/8
diff --git a/contrib/ipfilter/test/input/9 b/test/input/9
index 33f3be392a7d..33f3be392a7d 100644
--- a/contrib/ipfilter/test/input/9
+++ b/test/input/9
diff --git a/contrib/ipfilter/test/input/f1 b/test/input/f1
index 7c3ae8a3a3db..7c3ae8a3a3db 100644
--- a/contrib/ipfilter/test/input/f1
+++ b/test/input/f1
diff --git a/contrib/ipfilter/test/input/f10 b/test/input/f10
index 254cee7316ff..254cee7316ff 100644
--- a/contrib/ipfilter/test/input/f10
+++ b/test/input/f10
diff --git a/contrib/ipfilter/test/input/f11 b/test/input/f11
index d558150045c2..d558150045c2 100644
--- a/contrib/ipfilter/test/input/f11
+++ b/test/input/f11
diff --git a/contrib/ipfilter/test/input/f12 b/test/input/f12
index 52edde110442..52edde110442 100644
--- a/contrib/ipfilter/test/input/f12
+++ b/test/input/f12
diff --git a/contrib/ipfilter/test/input/f13 b/test/input/f13
index 77e537e2b638..77e537e2b638 100644
--- a/contrib/ipfilter/test/input/f13
+++ b/test/input/f13
diff --git a/contrib/ipfilter/test/input/f14 b/test/input/f14
index 16a806ffec7b..16a806ffec7b 100644
--- a/contrib/ipfilter/test/input/f14
+++ b/test/input/f14
diff --git a/contrib/ipfilter/test/input/f15 b/test/input/f15
index db547cb4f326..db547cb4f326 100644
--- a/contrib/ipfilter/test/input/f15
+++ b/test/input/f15
diff --git a/contrib/ipfilter/test/input/f16 b/test/input/f16
index a17f41f756ec..a17f41f756ec 100644
--- a/contrib/ipfilter/test/input/f16
+++ b/test/input/f16
diff --git a/contrib/ipfilter/test/input/f17 b/test/input/f17
index a0d44d7db58d..a0d44d7db58d 100644
--- a/contrib/ipfilter/test/input/f17
+++ b/test/input/f17
diff --git a/contrib/ipfilter/test/input/f18 b/test/input/f18
index 9ecbb7f59a23..9ecbb7f59a23 100644
--- a/contrib/ipfilter/test/input/f18
+++ b/test/input/f18
diff --git a/contrib/ipfilter/test/input/f19 b/test/input/f19
index 6cab988e400b..6cab988e400b 100644
--- a/contrib/ipfilter/test/input/f19
+++ b/test/input/f19
diff --git a/contrib/ipfilter/test/input/f2 b/test/input/f2
index f4e9d23f1cf6..f4e9d23f1cf6 100644
--- a/contrib/ipfilter/test/input/f2
+++ b/test/input/f2
diff --git a/contrib/ipfilter/test/input/f20 b/test/input/f20
index 605ba7c236f0..605ba7c236f0 100644
--- a/contrib/ipfilter/test/input/f20
+++ b/test/input/f20
diff --git a/contrib/ipfilter/test/input/f24 b/test/input/f24
index 1d066822561f..1d066822561f 100644
--- a/contrib/ipfilter/test/input/f24
+++ b/test/input/f24
diff --git a/contrib/ipfilter/test/input/f3 b/test/input/f3
index 16a806ffec7b..16a806ffec7b 100644
--- a/contrib/ipfilter/test/input/f3
+++ b/test/input/f3
diff --git a/contrib/ipfilter/test/input/f4 b/test/input/f4
index 2956d1b15454..2956d1b15454 100644
--- a/contrib/ipfilter/test/input/f4
+++ b/test/input/f4
diff --git a/contrib/ipfilter/test/input/f5 b/test/input/f5
index 41600c10763b..41600c10763b 100644
--- a/contrib/ipfilter/test/input/f5
+++ b/test/input/f5
diff --git a/contrib/ipfilter/test/input/f6 b/test/input/f6
index 21f0be3336c5..21f0be3336c5 100644
--- a/contrib/ipfilter/test/input/f6
+++ b/test/input/f6
diff --git a/contrib/ipfilter/test/input/f7 b/test/input/f7
index dbc9e33e80ac..dbc9e33e80ac 100644
--- a/contrib/ipfilter/test/input/f7
+++ b/test/input/f7
diff --git a/contrib/ipfilter/test/input/f8 b/test/input/f8
index cace511fbeb8..cace511fbeb8 100644
--- a/contrib/ipfilter/test/input/f8
+++ b/test/input/f8
diff --git a/contrib/ipfilter/test/input/f9 b/test/input/f9
index e64e299fc0e5..e64e299fc0e5 100644
--- a/contrib/ipfilter/test/input/f9
+++ b/test/input/f9
diff --git a/contrib/ipfilter/test/input/input.sed b/test/input/input.sed
index e69de29bb2d1..e69de29bb2d1 100644
--- a/contrib/ipfilter/test/input/input.sed
+++ b/test/input/input.sed
diff --git a/contrib/ipfilter/test/input/ip2.data b/test/input/ip2.data
index ef34eb5e1314..ef34eb5e1314 100644
--- a/contrib/ipfilter/test/input/ip2.data
+++ b/test/input/ip2.data
diff --git a/contrib/ipfilter/test/input/ipf6-1 b/test/input/ipf6-1
index 8cc2d175dc24..8cc2d175dc24 100644
--- a/contrib/ipfilter/test/input/ipf6-1
+++ b/test/input/ipf6-1
diff --git a/contrib/ipfilter/test/input/ipv6.1 b/test/input/ipv6.1
index 3f0fd308102f..3f0fd308102f 100644
--- a/contrib/ipfilter/test/input/ipv6.1
+++ b/test/input/ipv6.1
diff --git a/contrib/ipfilter/test/input/ipv6.2 b/test/input/ipv6.2
index 8cc2d175dc24..8cc2d175dc24 100644
--- a/contrib/ipfilter/test/input/ipv6.2
+++ b/test/input/ipv6.2
diff --git a/contrib/ipfilter/test/input/ipv6.3 b/test/input/ipv6.3
index e8ad9f2f22d3..e8ad9f2f22d3 100644
--- a/contrib/ipfilter/test/input/ipv6.3
+++ b/test/input/ipv6.3
diff --git a/contrib/ipfilter/test/input/ipv6.5 b/test/input/ipv6.5
index e46407ca110f..e46407ca110f 100644
--- a/contrib/ipfilter/test/input/ipv6.5
+++ b/test/input/ipv6.5
diff --git a/contrib/ipfilter/test/input/ipv6.6 b/test/input/ipv6.6
index 82efeac624da..82efeac624da 100644
--- a/contrib/ipfilter/test/input/ipv6.6
+++ b/test/input/ipv6.6
diff --git a/contrib/ipfilter/test/input/l1 b/test/input/l1
index a59dbe3ce6b5..a59dbe3ce6b5 100644
--- a/contrib/ipfilter/test/input/l1
+++ b/test/input/l1
diff --git a/contrib/ipfilter/test/input/n1 b/test/input/n1
index 04b24ef01198..04b24ef01198 100644
--- a/contrib/ipfilter/test/input/n1
+++ b/test/input/n1
diff --git a/contrib/ipfilter/test/input/n10 b/test/input/n10
index 321ed0bf9443..321ed0bf9443 100644
--- a/contrib/ipfilter/test/input/n10
+++ b/test/input/n10
diff --git a/contrib/ipfilter/test/input/n11 b/test/input/n11
index 8712674489ea..8712674489ea 100644
--- a/contrib/ipfilter/test/input/n11
+++ b/test/input/n11
diff --git a/contrib/ipfilter/test/input/n12 b/test/input/n12
index fb4d76de4755..fb4d76de4755 100644
--- a/contrib/ipfilter/test/input/n12
+++ b/test/input/n12
diff --git a/contrib/ipfilter/test/input/n13 b/test/input/n13
index ac7bbbda24a8..ac7bbbda24a8 100644
--- a/contrib/ipfilter/test/input/n13
+++ b/test/input/n13
diff --git a/contrib/ipfilter/test/input/n14 b/test/input/n14
index 969eb1c21466..969eb1c21466 100644
--- a/contrib/ipfilter/test/input/n14
+++ b/test/input/n14
diff --git a/contrib/ipfilter/test/input/n16 b/test/input/n16
index 2e77e40d7671..2e77e40d7671 100644
--- a/contrib/ipfilter/test/input/n16
+++ b/test/input/n16
diff --git a/contrib/ipfilter/test/input/n2 b/test/input/n2
index 476f16ed1283..476f16ed1283 100644
--- a/contrib/ipfilter/test/input/n2
+++ b/test/input/n2
diff --git a/contrib/ipfilter/test/input/n3 b/test/input/n3
index deca3178daee..deca3178daee 100644
--- a/contrib/ipfilter/test/input/n3
+++ b/test/input/n3
diff --git a/contrib/ipfilter/test/input/n4 b/test/input/n4
index 1218ef9e9103..1218ef9e9103 100644
--- a/contrib/ipfilter/test/input/n4
+++ b/test/input/n4
diff --git a/contrib/ipfilter/test/input/n5 b/test/input/n5
index 579210b3a369..579210b3a369 100644
--- a/contrib/ipfilter/test/input/n5
+++ b/test/input/n5
diff --git a/contrib/ipfilter/test/input/n6 b/test/input/n6
index 8a0c924b36a0..8a0c924b36a0 100644
--- a/contrib/ipfilter/test/input/n6
+++ b/test/input/n6
diff --git a/contrib/ipfilter/test/input/n7 b/test/input/n7
index 79af9010825d..79af9010825d 100644
--- a/contrib/ipfilter/test/input/n7
+++ b/test/input/n7
diff --git a/contrib/ipfilter/test/input/n8 b/test/input/n8
index 1f5b2130ba28..1f5b2130ba28 100644
--- a/contrib/ipfilter/test/input/n8
+++ b/test/input/n8
diff --git a/contrib/ipfilter/test/input/n9 b/test/input/n9
index c4aada8f2c70..c4aada8f2c70 100644
--- a/contrib/ipfilter/test/input/n9
+++ b/test/input/n9
diff --git a/contrib/ipfilter/test/input/ni1 b/test/input/ni1
index fb6b0b63e5f9..fb6b0b63e5f9 100644
--- a/contrib/ipfilter/test/input/ni1
+++ b/test/input/ni1
diff --git a/contrib/ipfilter/test/input/ni10 b/test/input/ni10
index 48ac22570283..48ac22570283 100644
--- a/contrib/ipfilter/test/input/ni10
+++ b/test/input/ni10
diff --git a/contrib/ipfilter/test/input/ni11 b/test/input/ni11
index 788e6036c407..788e6036c407 100644
--- a/contrib/ipfilter/test/input/ni11
+++ b/test/input/ni11
diff --git a/contrib/ipfilter/test/input/ni12 b/test/input/ni12
index 788e6036c407..788e6036c407 100644
--- a/contrib/ipfilter/test/input/ni12
+++ b/test/input/ni12
diff --git a/contrib/ipfilter/test/input/ni13 b/test/input/ni13
index 77569eead702..77569eead702 100644
--- a/contrib/ipfilter/test/input/ni13
+++ b/test/input/ni13
diff --git a/contrib/ipfilter/test/input/ni14 b/test/input/ni14
index 681132120e23..681132120e23 100644
--- a/contrib/ipfilter/test/input/ni14
+++ b/test/input/ni14
diff --git a/contrib/ipfilter/test/input/ni15 b/test/input/ni15
index fb445bb93c6f..fb445bb93c6f 100644
--- a/contrib/ipfilter/test/input/ni15
+++ b/test/input/ni15
diff --git a/contrib/ipfilter/test/input/ni16 b/test/input/ni16
index 24bfcfc3835f..24bfcfc3835f 100644
--- a/contrib/ipfilter/test/input/ni16
+++ b/test/input/ni16
diff --git a/contrib/ipfilter/test/input/ni17 b/test/input/ni17
index f9dec945524d..f9dec945524d 100644
--- a/contrib/ipfilter/test/input/ni17
+++ b/test/input/ni17
diff --git a/contrib/ipfilter/test/input/ni19 b/test/input/ni19
index d95e68afc7b1..d95e68afc7b1 100644
--- a/contrib/ipfilter/test/input/ni19
+++ b/test/input/ni19
diff --git a/contrib/ipfilter/test/input/ni2 b/test/input/ni2
index 30458212bb03..30458212bb03 100644
--- a/contrib/ipfilter/test/input/ni2
+++ b/test/input/ni2
diff --git a/contrib/ipfilter/test/input/ni20 b/test/input/ni20
index 4c2b87e4de34..4c2b87e4de34 100644
--- a/contrib/ipfilter/test/input/ni20
+++ b/test/input/ni20
diff --git a/contrib/ipfilter/test/input/ni21 b/test/input/ni21
index daf741e59439..daf741e59439 100644
--- a/contrib/ipfilter/test/input/ni21
+++ b/test/input/ni21
diff --git a/contrib/ipfilter/test/input/ni23 b/test/input/ni23
index 938b7b86cf2d..938b7b86cf2d 100644
--- a/contrib/ipfilter/test/input/ni23
+++ b/test/input/ni23
diff --git a/contrib/ipfilter/test/input/ni3 b/test/input/ni3
index 66b22a6d4293..66b22a6d4293 100644
--- a/contrib/ipfilter/test/input/ni3
+++ b/test/input/ni3
diff --git a/contrib/ipfilter/test/input/ni4 b/test/input/ni4
index ad5575f95317..ad5575f95317 100644
--- a/contrib/ipfilter/test/input/ni4
+++ b/test/input/ni4
diff --git a/contrib/ipfilter/test/input/ni5 b/test/input/ni5
index c45be54266ff..c45be54266ff 100644
--- a/contrib/ipfilter/test/input/ni5
+++ b/test/input/ni5
diff --git a/contrib/ipfilter/test/input/ni6 b/test/input/ni6
index 70e80c0ce1d7..70e80c0ce1d7 100644
--- a/contrib/ipfilter/test/input/ni6
+++ b/test/input/ni6
diff --git a/contrib/ipfilter/test/input/ni7 b/test/input/ni7
index 30f247d39ca9..30f247d39ca9 100644
--- a/contrib/ipfilter/test/input/ni7
+++ b/test/input/ni7
diff --git a/contrib/ipfilter/test/input/ni8 b/test/input/ni8
index 788e6036c407..788e6036c407 100644
--- a/contrib/ipfilter/test/input/ni8
+++ b/test/input/ni8
diff --git a/contrib/ipfilter/test/input/ni9 b/test/input/ni9
index 788e6036c407..788e6036c407 100644
--- a/contrib/ipfilter/test/input/ni9
+++ b/test/input/ni9
diff --git a/contrib/ipfilter/test/input/p1 b/test/input/p1
index f6753fac4264..f6753fac4264 100644
--- a/contrib/ipfilter/test/input/p1
+++ b/test/input/p1
diff --git a/contrib/ipfilter/test/input/p2 b/test/input/p2
index f6753fac4264..f6753fac4264 100644
--- a/contrib/ipfilter/test/input/p2
+++ b/test/input/p2
diff --git a/contrib/ipfilter/test/input/p3 b/test/input/p3
index 4a6666b7ec3a..4a6666b7ec3a 100644
--- a/contrib/ipfilter/test/input/p3
+++ b/test/input/p3
diff --git a/contrib/ipfilter/test/input/p5 b/test/input/p5
index f6753fac4264..f6753fac4264 100644
--- a/contrib/ipfilter/test/input/p5
+++ b/test/input/p5
diff --git a/contrib/ipfilter/test/intest b/test/intest
index e94ca0894e57..e94ca0894e57 100755
--- a/contrib/ipfilter/test/intest
+++ b/test/intest
diff --git a/contrib/ipfilter/test/iptest b/test/iptest
index bb3ab5ea86fc..bb3ab5ea86fc 100644
--- a/contrib/ipfilter/test/iptest
+++ b/test/iptest
diff --git a/contrib/ipfilter/test/itest b/test/itest
index 8fefc634bfb9..8fefc634bfb9 100644
--- a/contrib/ipfilter/test/itest
+++ b/test/itest
diff --git a/contrib/ipfilter/test/logtest b/test/logtest
index 089f9150f479..089f9150f479 100755
--- a/contrib/ipfilter/test/logtest
+++ b/test/logtest
diff --git a/contrib/ipfilter/test/mhtest b/test/mhtest
index a4d48d693476..a4d48d693476 100755
--- a/contrib/ipfilter/test/mhtest
+++ b/test/mhtest
diff --git a/contrib/ipfilter/test/mtest b/test/mtest
index 2a3ed38b34f7..2a3ed38b34f7 100755
--- a/contrib/ipfilter/test/mtest
+++ b/test/mtest
diff --git a/contrib/ipfilter/test/natipftest b/test/natipftest
index 5776b4202c95..5776b4202c95 100755
--- a/contrib/ipfilter/test/natipftest
+++ b/test/natipftest
diff --git a/contrib/ipfilter/test/nattest b/test/nattest
index fece276a6a76..fece276a6a76 100755
--- a/contrib/ipfilter/test/nattest
+++ b/test/nattest
diff --git a/contrib/ipfilter/test/ptest b/test/ptest
index 7deccd3354f4..7deccd3354f4 100644
--- a/contrib/ipfilter/test/ptest
+++ b/test/ptest
diff --git a/contrib/ipfilter/test/regress/1 b/test/regress/1
index 6a2ede9e31c0..6a2ede9e31c0 100644
--- a/contrib/ipfilter/test/regress/1
+++ b/test/regress/1
diff --git a/contrib/ipfilter/test/regress/10 b/test/regress/10
index 355298308e72..355298308e72 100644
--- a/contrib/ipfilter/test/regress/10
+++ b/test/regress/10
diff --git a/contrib/ipfilter/test/regress/11 b/test/regress/11
index 0bf0a2a7322d..0bf0a2a7322d 100644
--- a/contrib/ipfilter/test/regress/11
+++ b/test/regress/11
diff --git a/contrib/ipfilter/test/regress/12 b/test/regress/12
index c29f839aa502..c29f839aa502 100644
--- a/contrib/ipfilter/test/regress/12
+++ b/test/regress/12
diff --git a/contrib/ipfilter/test/regress/13 b/test/regress/13
index f123e4781c86..f123e4781c86 100644
--- a/contrib/ipfilter/test/regress/13
+++ b/test/regress/13
diff --git a/contrib/ipfilter/test/regress/14 b/test/regress/14
index aa54af8df11d..aa54af8df11d 100644
--- a/contrib/ipfilter/test/regress/14
+++ b/test/regress/14
diff --git a/contrib/ipfilter/test/regress/2 b/test/regress/2
index e2f02a46e283..e2f02a46e283 100644
--- a/contrib/ipfilter/test/regress/2
+++ b/test/regress/2
diff --git a/contrib/ipfilter/test/regress/3 b/test/regress/3
index ee80729cfc9b..ee80729cfc9b 100644
--- a/contrib/ipfilter/test/regress/3
+++ b/test/regress/3
diff --git a/contrib/ipfilter/test/regress/4 b/test/regress/4
index bc8af2f0cae2..bc8af2f0cae2 100644
--- a/contrib/ipfilter/test/regress/4
+++ b/test/regress/4
diff --git a/contrib/ipfilter/test/regress/5 b/test/regress/5
index 998eabd4b10b..998eabd4b10b 100644
--- a/contrib/ipfilter/test/regress/5
+++ b/test/regress/5
diff --git a/contrib/ipfilter/test/regress/6 b/test/regress/6
index 291f09adcdbc..291f09adcdbc 100644
--- a/contrib/ipfilter/test/regress/6
+++ b/test/regress/6
diff --git a/contrib/ipfilter/test/regress/7 b/test/regress/7
index 6848a688a374..6848a688a374 100644
--- a/contrib/ipfilter/test/regress/7
+++ b/test/regress/7
diff --git a/contrib/ipfilter/test/regress/8 b/test/regress/8
index 0f28fd261148..0f28fd261148 100644
--- a/contrib/ipfilter/test/regress/8
+++ b/test/regress/8
diff --git a/contrib/ipfilter/test/regress/9 b/test/regress/9
index 17bc96737877..17bc96737877 100644
--- a/contrib/ipfilter/test/regress/9
+++ b/test/regress/9
diff --git a/contrib/ipfilter/test/regress/bpf-f1 b/test/regress/bpf-f1
index 2c8028311a7e..2c8028311a7e 100644
--- a/contrib/ipfilter/test/regress/bpf-f1
+++ b/test/regress/bpf-f1
diff --git a/contrib/ipfilter/test/regress/bpf1 b/test/regress/bpf1
index 5d83b77ed3ce..5d83b77ed3ce 100644
--- a/contrib/ipfilter/test/regress/bpf1
+++ b/test/regress/bpf1
diff --git a/contrib/ipfilter/test/regress/f1 b/test/regress/f1
index 6a2ede9e31c0..6a2ede9e31c0 100644
--- a/contrib/ipfilter/test/regress/f1
+++ b/test/regress/f1
diff --git a/contrib/ipfilter/test/regress/f10 b/test/regress/f10
index 355298308e72..355298308e72 100644
--- a/contrib/ipfilter/test/regress/f10
+++ b/test/regress/f10
diff --git a/contrib/ipfilter/test/regress/f11 b/test/regress/f11
index a71e528c2215..a71e528c2215 100644
--- a/contrib/ipfilter/test/regress/f11
+++ b/test/regress/f11
diff --git a/contrib/ipfilter/test/regress/f12 b/test/regress/f12
index c29f839aa502..c29f839aa502 100644
--- a/contrib/ipfilter/test/regress/f12
+++ b/test/regress/f12
diff --git a/contrib/ipfilter/test/regress/f13 b/test/regress/f13
index 8106419f3e08..8106419f3e08 100644
--- a/contrib/ipfilter/test/regress/f13
+++ b/test/regress/f13
diff --git a/contrib/ipfilter/test/regress/f14 b/test/regress/f14
index 06ab51995ea2..06ab51995ea2 100644
--- a/contrib/ipfilter/test/regress/f14
+++ b/test/regress/f14
diff --git a/contrib/ipfilter/test/regress/f15 b/test/regress/f15
index 16185e1f3685..16185e1f3685 100644
--- a/contrib/ipfilter/test/regress/f15
+++ b/test/regress/f15
diff --git a/contrib/ipfilter/test/regress/f16 b/test/regress/f16
index 920ad8c958d2..920ad8c958d2 100644
--- a/contrib/ipfilter/test/regress/f16
+++ b/test/regress/f16
diff --git a/contrib/ipfilter/test/regress/f17 b/test/regress/f17
index 9a75ae3c1b54..9a75ae3c1b54 100644
--- a/contrib/ipfilter/test/regress/f17
+++ b/test/regress/f17
diff --git a/contrib/ipfilter/test/regress/f18 b/test/regress/f18
index acba2b33a813..acba2b33a813 100644
--- a/contrib/ipfilter/test/regress/f18
+++ b/test/regress/f18
diff --git a/contrib/ipfilter/test/regress/f19 b/test/regress/f19
index d7770b8a43e8..d7770b8a43e8 100644
--- a/contrib/ipfilter/test/regress/f19
+++ b/test/regress/f19
diff --git a/contrib/ipfilter/test/regress/f2 b/test/regress/f2
index e2f02a46e283..e2f02a46e283 100644
--- a/contrib/ipfilter/test/regress/f2
+++ b/test/regress/f2
diff --git a/contrib/ipfilter/test/regress/f20 b/test/regress/f20
index 279523e4a9f5..279523e4a9f5 100644
--- a/contrib/ipfilter/test/regress/f20
+++ b/test/regress/f20
diff --git a/contrib/ipfilter/test/regress/f24 b/test/regress/f24
index 5cb3bab6b8a1..5cb3bab6b8a1 100644
--- a/contrib/ipfilter/test/regress/f24
+++ b/test/regress/f24
diff --git a/contrib/ipfilter/test/regress/f3 b/test/regress/f3
index ee80729cfc9b..ee80729cfc9b 100644
--- a/contrib/ipfilter/test/regress/f3
+++ b/test/regress/f3
diff --git a/contrib/ipfilter/test/regress/f4 b/test/regress/f4
index bc8af2f0cae2..bc8af2f0cae2 100644
--- a/contrib/ipfilter/test/regress/f4
+++ b/test/regress/f4
diff --git a/contrib/ipfilter/test/regress/f5 b/test/regress/f5
index 998eabd4b10b..998eabd4b10b 100644
--- a/contrib/ipfilter/test/regress/f5
+++ b/test/regress/f5
diff --git a/contrib/ipfilter/test/regress/f6 b/test/regress/f6
index 291f09adcdbc..291f09adcdbc 100644
--- a/contrib/ipfilter/test/regress/f6
+++ b/test/regress/f6
diff --git a/contrib/ipfilter/test/regress/f7 b/test/regress/f7
index be1b969c8ec2..be1b969c8ec2 100644
--- a/contrib/ipfilter/test/regress/f7
+++ b/test/regress/f7
diff --git a/contrib/ipfilter/test/regress/f8 b/test/regress/f8
index 0f28fd261148..0f28fd261148 100644
--- a/contrib/ipfilter/test/regress/f8
+++ b/test/regress/f8
diff --git a/contrib/ipfilter/test/regress/f9 b/test/regress/f9
index 17bc96737877..17bc96737877 100644
--- a/contrib/ipfilter/test/regress/f9
+++ b/test/regress/f9
diff --git a/contrib/ipfilter/test/regress/i1 b/test/regress/i1
index 0fd2c6e0c39a..0fd2c6e0c39a 100644
--- a/contrib/ipfilter/test/regress/i1
+++ b/test/regress/i1
diff --git a/contrib/ipfilter/test/regress/i10 b/test/regress/i10
index 640ac84ad2af..640ac84ad2af 100644
--- a/contrib/ipfilter/test/regress/i10
+++ b/test/regress/i10
diff --git a/contrib/ipfilter/test/regress/i11 b/test/regress/i11
index cb7d68389993..cb7d68389993 100644
--- a/contrib/ipfilter/test/regress/i11
+++ b/test/regress/i11
diff --git a/contrib/ipfilter/test/regress/i12 b/test/regress/i12
index 5342702353e4..5342702353e4 100644
--- a/contrib/ipfilter/test/regress/i12
+++ b/test/regress/i12
diff --git a/contrib/ipfilter/test/regress/i13 b/test/regress/i13
index 3ba343d1669b..3ba343d1669b 100644
--- a/contrib/ipfilter/test/regress/i13
+++ b/test/regress/i13
diff --git a/contrib/ipfilter/test/regress/i14 b/test/regress/i14
index 2cd26130640a..2cd26130640a 100644
--- a/contrib/ipfilter/test/regress/i14
+++ b/test/regress/i14
diff --git a/contrib/ipfilter/test/regress/i15 b/test/regress/i15
index 0e6b0d12cd59..0e6b0d12cd59 100644
--- a/contrib/ipfilter/test/regress/i15
+++ b/test/regress/i15
diff --git a/contrib/ipfilter/test/regress/i16 b/test/regress/i16
index 5c9144a99257..5c9144a99257 100644
--- a/contrib/ipfilter/test/regress/i16
+++ b/test/regress/i16
diff --git a/contrib/ipfilter/test/regress/i17 b/test/regress/i17
index e399248222a6..e399248222a6 100644
--- a/contrib/ipfilter/test/regress/i17
+++ b/test/regress/i17
diff --git a/contrib/ipfilter/test/regress/i18 b/test/regress/i18
index 03ce713b4a54..03ce713b4a54 100644
--- a/contrib/ipfilter/test/regress/i18
+++ b/test/regress/i18
diff --git a/contrib/ipfilter/test/regress/i19 b/test/regress/i19
index a09fd56c5104..a09fd56c5104 100644
--- a/contrib/ipfilter/test/regress/i19
+++ b/test/regress/i19
diff --git a/contrib/ipfilter/test/regress/i2 b/test/regress/i2
index 50f610750bc2..50f610750bc2 100644
--- a/contrib/ipfilter/test/regress/i2
+++ b/test/regress/i2
diff --git a/contrib/ipfilter/test/regress/i20 b/test/regress/i20
index 99039eeaf04c..99039eeaf04c 100644
--- a/contrib/ipfilter/test/regress/i20
+++ b/test/regress/i20
diff --git a/contrib/ipfilter/test/regress/i21 b/test/regress/i21
index 9d583ab0894f..9d583ab0894f 100644
--- a/contrib/ipfilter/test/regress/i21
+++ b/test/regress/i21
diff --git a/contrib/ipfilter/test/regress/i3 b/test/regress/i3
index 390fc3c60e42..390fc3c60e42 100644
--- a/contrib/ipfilter/test/regress/i3
+++ b/test/regress/i3
diff --git a/contrib/ipfilter/test/regress/i4 b/test/regress/i4
index 8551f7644915..8551f7644915 100644
--- a/contrib/ipfilter/test/regress/i4
+++ b/test/regress/i4
diff --git a/contrib/ipfilter/test/regress/i5 b/test/regress/i5
index 788f971ae18f..788f971ae18f 100644
--- a/contrib/ipfilter/test/regress/i5
+++ b/test/regress/i5
diff --git a/contrib/ipfilter/test/regress/i6 b/test/regress/i6
index 0b371bd3e761..0b371bd3e761 100644
--- a/contrib/ipfilter/test/regress/i6
+++ b/test/regress/i6
diff --git a/contrib/ipfilter/test/regress/i7 b/test/regress/i7
index 1a82940c6c86..1a82940c6c86 100644
--- a/contrib/ipfilter/test/regress/i7
+++ b/test/regress/i7
diff --git a/contrib/ipfilter/test/regress/i8 b/test/regress/i8
index c30f8bdbd90e..c30f8bdbd90e 100644
--- a/contrib/ipfilter/test/regress/i8
+++ b/test/regress/i8
diff --git a/contrib/ipfilter/test/regress/i9 b/test/regress/i9
index 441cfa9a16b6..441cfa9a16b6 100644
--- a/contrib/ipfilter/test/regress/i9
+++ b/test/regress/i9
diff --git a/contrib/ipfilter/test/regress/in1 b/test/regress/in1
index d5d0cf4c3d19..d5d0cf4c3d19 100644
--- a/contrib/ipfilter/test/regress/in1
+++ b/test/regress/in1
diff --git a/contrib/ipfilter/test/regress/in2 b/test/regress/in2
index 83a2ca5acc3c..83a2ca5acc3c 100644
--- a/contrib/ipfilter/test/regress/in2
+++ b/test/regress/in2
diff --git a/contrib/ipfilter/test/regress/in3 b/test/regress/in3
index d8016b69e916..d8016b69e916 100644
--- a/contrib/ipfilter/test/regress/in3
+++ b/test/regress/in3
diff --git a/contrib/ipfilter/test/regress/in4 b/test/regress/in4
index 46bbd81012dc..46bbd81012dc 100644
--- a/contrib/ipfilter/test/regress/in4
+++ b/test/regress/in4
diff --git a/contrib/ipfilter/test/regress/in5 b/test/regress/in5
index 766c3e3df104..766c3e3df104 100644
--- a/contrib/ipfilter/test/regress/in5
+++ b/test/regress/in5
diff --git a/contrib/ipfilter/test/regress/in6 b/test/regress/in6
index 70e71ddeb16b..70e71ddeb16b 100644
--- a/contrib/ipfilter/test/regress/in6
+++ b/test/regress/in6
diff --git a/contrib/ipfilter/test/regress/ip1 b/test/regress/ip1
index c31ba251bf2e..c31ba251bf2e 100644
--- a/contrib/ipfilter/test/regress/ip1
+++ b/test/regress/ip1
diff --git a/contrib/ipfilter/test/regress/ip2 b/test/regress/ip2
index 76f31b60f9d4..76f31b60f9d4 100644
--- a/contrib/ipfilter/test/regress/ip2
+++ b/test/regress/ip2
diff --git a/contrib/ipfilter/test/regress/ipf6-1 b/test/regress/ipf6-1
index 814dfd6cd664..814dfd6cd664 100644
--- a/contrib/ipfilter/test/regress/ipf6-1
+++ b/test/regress/ipf6-1
diff --git a/contrib/ipfilter/test/regress/ipv6.1 b/test/regress/ipv6.1
index fc532b677c7f..fc532b677c7f 100644
--- a/contrib/ipfilter/test/regress/ipv6.1
+++ b/test/regress/ipv6.1
diff --git a/contrib/ipfilter/test/regress/ipv6.2 b/test/regress/ipv6.2
index 814dfd6cd664..814dfd6cd664 100644
--- a/contrib/ipfilter/test/regress/ipv6.2
+++ b/test/regress/ipv6.2
diff --git a/contrib/ipfilter/test/regress/ipv6.3 b/test/regress/ipv6.3
index 6dc9e937a995..6dc9e937a995 100644
--- a/contrib/ipfilter/test/regress/ipv6.3
+++ b/test/regress/ipv6.3
diff --git a/contrib/ipfilter/test/regress/ipv6.5 b/test/regress/ipv6.5
index ba8cabb501e0..ba8cabb501e0 100644
--- a/contrib/ipfilter/test/regress/ipv6.5
+++ b/test/regress/ipv6.5
diff --git a/contrib/ipfilter/test/regress/ipv6.6 b/test/regress/ipv6.6
index f1f904b4eb61..f1f904b4eb61 100644
--- a/contrib/ipfilter/test/regress/ipv6.6
+++ b/test/regress/ipv6.6
diff --git a/contrib/ipfilter/test/regress/l1 b/test/regress/l1
index 88cca58039f9..88cca58039f9 100644
--- a/contrib/ipfilter/test/regress/l1
+++ b/test/regress/l1
diff --git a/contrib/ipfilter/test/regress/n1 b/test/regress/n1
index 9bcf29be7ccf..9bcf29be7ccf 100644
--- a/contrib/ipfilter/test/regress/n1
+++ b/test/regress/n1
diff --git a/contrib/ipfilter/test/regress/n10 b/test/regress/n10
index 0f4819217f7a..0f4819217f7a 100644
--- a/contrib/ipfilter/test/regress/n10
+++ b/test/regress/n10
diff --git a/contrib/ipfilter/test/regress/n11 b/test/regress/n11
index 8cdf7fcf4627..8cdf7fcf4627 100644
--- a/contrib/ipfilter/test/regress/n11
+++ b/test/regress/n11
diff --git a/contrib/ipfilter/test/regress/n12 b/test/regress/n12
index 225675b241da..225675b241da 100644
--- a/contrib/ipfilter/test/regress/n12
+++ b/test/regress/n12
diff --git a/contrib/ipfilter/test/regress/n13 b/test/regress/n13
index 804793004050..804793004050 100644
--- a/contrib/ipfilter/test/regress/n13
+++ b/test/regress/n13
diff --git a/contrib/ipfilter/test/regress/n14 b/test/regress/n14
index 6f5d571d606e..6f5d571d606e 100644
--- a/contrib/ipfilter/test/regress/n14
+++ b/test/regress/n14
diff --git a/contrib/ipfilter/test/regress/n16 b/test/regress/n16
index ff8958cad869..ff8958cad869 100644
--- a/contrib/ipfilter/test/regress/n16
+++ b/test/regress/n16
diff --git a/contrib/ipfilter/test/regress/n2 b/test/regress/n2
index dbce5aa5254a..dbce5aa5254a 100644
--- a/contrib/ipfilter/test/regress/n2
+++ b/test/regress/n2
diff --git a/contrib/ipfilter/test/regress/n3 b/test/regress/n3
index 82c83dd6acc5..82c83dd6acc5 100644
--- a/contrib/ipfilter/test/regress/n3
+++ b/test/regress/n3
diff --git a/contrib/ipfilter/test/regress/n4 b/test/regress/n4
index e7c03145e677..e7c03145e677 100644
--- a/contrib/ipfilter/test/regress/n4
+++ b/test/regress/n4
diff --git a/contrib/ipfilter/test/regress/n5 b/test/regress/n5
index e55cea02a82a..e55cea02a82a 100644
--- a/contrib/ipfilter/test/regress/n5
+++ b/test/regress/n5
diff --git a/contrib/ipfilter/test/regress/n6 b/test/regress/n6
index 79f11a40d88a..79f11a40d88a 100644
--- a/contrib/ipfilter/test/regress/n6
+++ b/test/regress/n6
diff --git a/contrib/ipfilter/test/regress/n7 b/test/regress/n7
index be995c2fe030..be995c2fe030 100644
--- a/contrib/ipfilter/test/regress/n7
+++ b/test/regress/n7
diff --git a/contrib/ipfilter/test/regress/n8 b/test/regress/n8
index bf0e94f73544..bf0e94f73544 100644
--- a/contrib/ipfilter/test/regress/n8
+++ b/test/regress/n8
diff --git a/contrib/ipfilter/test/regress/n9 b/test/regress/n9
index 81a7ccd8c815..81a7ccd8c815 100644
--- a/contrib/ipfilter/test/regress/n9
+++ b/test/regress/n9
diff --git a/contrib/ipfilter/test/regress/ni1.ipf b/test/regress/ni1.ipf
index c7e5797185dc..c7e5797185dc 100644
--- a/contrib/ipfilter/test/regress/ni1.ipf
+++ b/test/regress/ni1.ipf
diff --git a/contrib/ipfilter/test/regress/ni1.nat b/test/regress/ni1.nat
index f38e435bcf7a..f38e435bcf7a 100644
--- a/contrib/ipfilter/test/regress/ni1.nat
+++ b/test/regress/ni1.nat
diff --git a/contrib/ipfilter/test/regress/ni10.ipf b/test/regress/ni10.ipf
index 4151b6e666eb..4151b6e666eb 100644
--- a/contrib/ipfilter/test/regress/ni10.ipf
+++ b/test/regress/ni10.ipf
diff --git a/contrib/ipfilter/test/regress/ni10.nat b/test/regress/ni10.nat
index 2a04ef7948d0..2a04ef7948d0 100644
--- a/contrib/ipfilter/test/regress/ni10.nat
+++ b/test/regress/ni10.nat
diff --git a/contrib/ipfilter/test/regress/ni11.ipf b/test/regress/ni11.ipf
index 4151b6e666eb..4151b6e666eb 100644
--- a/contrib/ipfilter/test/regress/ni11.ipf
+++ b/test/regress/ni11.ipf
diff --git a/contrib/ipfilter/test/regress/ni11.nat b/test/regress/ni11.nat
index 1d0018cb34fa..1d0018cb34fa 100644
--- a/contrib/ipfilter/test/regress/ni11.nat
+++ b/test/regress/ni11.nat
diff --git a/contrib/ipfilter/test/regress/ni12.ipf b/test/regress/ni12.ipf
index 4151b6e666eb..4151b6e666eb 100644
--- a/contrib/ipfilter/test/regress/ni12.ipf
+++ b/test/regress/ni12.ipf
diff --git a/contrib/ipfilter/test/regress/ni12.nat b/test/regress/ni12.nat
index 8c36bc8701a5..8c36bc8701a5 100644
--- a/contrib/ipfilter/test/regress/ni12.nat
+++ b/test/regress/ni12.nat
diff --git a/contrib/ipfilter/test/regress/ni13.ipf b/test/regress/ni13.ipf
index 04b6d137e504..04b6d137e504 100644
--- a/contrib/ipfilter/test/regress/ni13.ipf
+++ b/test/regress/ni13.ipf
diff --git a/contrib/ipfilter/test/regress/ni13.nat b/test/regress/ni13.nat
index 7a879d8cd85a..7a879d8cd85a 100644
--- a/contrib/ipfilter/test/regress/ni13.nat
+++ b/test/regress/ni13.nat
diff --git a/contrib/ipfilter/test/regress/ni14.ipf b/test/regress/ni14.ipf
index 04b6d137e504..04b6d137e504 100644
--- a/contrib/ipfilter/test/regress/ni14.ipf
+++ b/test/regress/ni14.ipf
diff --git a/contrib/ipfilter/test/regress/ni14.nat b/test/regress/ni14.nat
index c546e99029de..c546e99029de 100644
--- a/contrib/ipfilter/test/regress/ni14.nat
+++ b/test/regress/ni14.nat
diff --git a/contrib/ipfilter/test/regress/ni15.ipf b/test/regress/ni15.ipf
index 1b9a013f5299..1b9a013f5299 100644
--- a/contrib/ipfilter/test/regress/ni15.ipf
+++ b/test/regress/ni15.ipf
diff --git a/contrib/ipfilter/test/regress/ni15.nat b/test/regress/ni15.nat
index 420c7b722673..420c7b722673 100644
--- a/contrib/ipfilter/test/regress/ni15.nat
+++ b/test/regress/ni15.nat
diff --git a/contrib/ipfilter/test/regress/ni16.ipf b/test/regress/ni16.ipf
index 1b9a013f5299..1b9a013f5299 100644
--- a/contrib/ipfilter/test/regress/ni16.ipf
+++ b/test/regress/ni16.ipf
diff --git a/contrib/ipfilter/test/regress/ni16.nat b/test/regress/ni16.nat
index 5fad3cdb20b0..5fad3cdb20b0 100644
--- a/contrib/ipfilter/test/regress/ni16.nat
+++ b/test/regress/ni16.nat
diff --git a/contrib/ipfilter/test/regress/ni17.nat b/test/regress/ni17.nat
index 3da63383a7b8..3da63383a7b8 100644
--- a/contrib/ipfilter/test/regress/ni17.nat
+++ b/test/regress/ni17.nat
diff --git a/contrib/ipfilter/test/regress/ni19.ipf b/test/regress/ni19.ipf
index c6fcec1c32f3..c6fcec1c32f3 100644
--- a/contrib/ipfilter/test/regress/ni19.ipf
+++ b/test/regress/ni19.ipf
diff --git a/contrib/ipfilter/test/regress/ni19.nat b/test/regress/ni19.nat
index 56b81a9e0cb9..56b81a9e0cb9 100644
--- a/contrib/ipfilter/test/regress/ni19.nat
+++ b/test/regress/ni19.nat
diff --git a/contrib/ipfilter/test/regress/ni2.ipf b/test/regress/ni2.ipf
index 5956cf9f929c..5956cf9f929c 100644
--- a/contrib/ipfilter/test/regress/ni2.ipf
+++ b/test/regress/ni2.ipf
diff --git a/contrib/ipfilter/test/regress/ni2.nat b/test/regress/ni2.nat
index 4ad73c2ed4b8..4ad73c2ed4b8 100644
--- a/contrib/ipfilter/test/regress/ni2.nat
+++ b/test/regress/ni2.nat
diff --git a/contrib/ipfilter/test/regress/ni20.ipf b/test/regress/ni20.ipf
index c6f6d8444c41..c6f6d8444c41 100644
--- a/contrib/ipfilter/test/regress/ni20.ipf
+++ b/test/regress/ni20.ipf
diff --git a/contrib/ipfilter/test/regress/ni20.nat b/test/regress/ni20.nat
index f2dd0a7e729d..f2dd0a7e729d 100644
--- a/contrib/ipfilter/test/regress/ni20.nat
+++ b/test/regress/ni20.nat
diff --git a/contrib/ipfilter/test/regress/ni21.ipf b/test/regress/ni21.ipf
index 6d6ed081787f..6d6ed081787f 100644
--- a/contrib/ipfilter/test/regress/ni21.ipf
+++ b/test/regress/ni21.ipf
diff --git a/contrib/ipfilter/test/regress/ni21.nat b/test/regress/ni21.nat
index 6b2d46a9fb99..6b2d46a9fb99 100644
--- a/contrib/ipfilter/test/regress/ni21.nat
+++ b/test/regress/ni21.nat
diff --git a/contrib/ipfilter/test/regress/ni23.ipf b/test/regress/ni23.ipf
index 49ebcf708766..49ebcf708766 100644
--- a/contrib/ipfilter/test/regress/ni23.ipf
+++ b/test/regress/ni23.ipf
diff --git a/contrib/ipfilter/test/regress/ni23.nat b/test/regress/ni23.nat
index 094d377c00dc..094d377c00dc 100644
--- a/contrib/ipfilter/test/regress/ni23.nat
+++ b/test/regress/ni23.nat
diff --git a/contrib/ipfilter/test/regress/ni3.ipf b/test/regress/ni3.ipf
index c7e5797185dc..c7e5797185dc 100644
--- a/contrib/ipfilter/test/regress/ni3.ipf
+++ b/test/regress/ni3.ipf
diff --git a/contrib/ipfilter/test/regress/ni3.nat b/test/regress/ni3.nat
index 4306f4b45d3d..4306f4b45d3d 100644
--- a/contrib/ipfilter/test/regress/ni3.nat
+++ b/test/regress/ni3.nat
diff --git a/contrib/ipfilter/test/regress/ni4.ipf b/test/regress/ni4.ipf
index c7e5797185dc..c7e5797185dc 100644
--- a/contrib/ipfilter/test/regress/ni4.ipf
+++ b/test/regress/ni4.ipf
diff --git a/contrib/ipfilter/test/regress/ni4.nat b/test/regress/ni4.nat
index 6eefdc2a988f..6eefdc2a988f 100644
--- a/contrib/ipfilter/test/regress/ni4.nat
+++ b/test/regress/ni4.nat
diff --git a/contrib/ipfilter/test/regress/ni5.ipf b/test/regress/ni5.ipf
index 8f11424f4c33..8f11424f4c33 100644
--- a/contrib/ipfilter/test/regress/ni5.ipf
+++ b/test/regress/ni5.ipf
diff --git a/contrib/ipfilter/test/regress/ni5.nat b/test/regress/ni5.nat
index 8e80d2248f19..8e80d2248f19 100644
--- a/contrib/ipfilter/test/regress/ni5.nat
+++ b/test/regress/ni5.nat
diff --git a/contrib/ipfilter/test/regress/ni6.ipf b/test/regress/ni6.ipf
index f5b83b29ff3a..f5b83b29ff3a 100644
--- a/contrib/ipfilter/test/regress/ni6.ipf
+++ b/test/regress/ni6.ipf
diff --git a/contrib/ipfilter/test/regress/ni6.nat b/test/regress/ni6.nat
index 00d57d07cb2c..00d57d07cb2c 100644
--- a/contrib/ipfilter/test/regress/ni6.nat
+++ b/test/regress/ni6.nat
diff --git a/contrib/ipfilter/test/regress/ni7.ipf b/test/regress/ni7.ipf
index 4151b6e666eb..4151b6e666eb 100644
--- a/contrib/ipfilter/test/regress/ni7.ipf
+++ b/test/regress/ni7.ipf
diff --git a/contrib/ipfilter/test/regress/ni7.nat b/test/regress/ni7.nat
index 2a04ef7948d0..2a04ef7948d0 100644
--- a/contrib/ipfilter/test/regress/ni7.nat
+++ b/test/regress/ni7.nat
diff --git a/contrib/ipfilter/test/regress/ni8.ipf b/test/regress/ni8.ipf
index 66662419934e..66662419934e 100644
--- a/contrib/ipfilter/test/regress/ni8.ipf
+++ b/test/regress/ni8.ipf
diff --git a/contrib/ipfilter/test/regress/ni8.nat b/test/regress/ni8.nat
index 1d0018cb34fa..1d0018cb34fa 100644
--- a/contrib/ipfilter/test/regress/ni8.nat
+++ b/test/regress/ni8.nat
diff --git a/contrib/ipfilter/test/regress/ni9.ipf b/test/regress/ni9.ipf
index 66662419934e..66662419934e 100644
--- a/contrib/ipfilter/test/regress/ni9.ipf
+++ b/test/regress/ni9.ipf
diff --git a/contrib/ipfilter/test/regress/ni9.nat b/test/regress/ni9.nat
index 8c36bc8701a5..8c36bc8701a5 100644
--- a/contrib/ipfilter/test/regress/ni9.nat
+++ b/test/regress/ni9.nat
diff --git a/contrib/ipfilter/test/regress/p1.ipf b/test/regress/p1.ipf
index acaf639ac1fb..acaf639ac1fb 100644
--- a/contrib/ipfilter/test/regress/p1.ipf
+++ b/test/regress/p1.ipf
diff --git a/contrib/ipfilter/test/regress/p1.pool b/test/regress/p1.pool
index 14ae3a3d40dd..14ae3a3d40dd 100644
--- a/contrib/ipfilter/test/regress/p1.pool
+++ b/test/regress/p1.pool
diff --git a/contrib/ipfilter/test/regress/p2.ipf b/test/regress/p2.ipf
index 4cfb388e82d6..4cfb388e82d6 100644
--- a/contrib/ipfilter/test/regress/p2.ipf
+++ b/test/regress/p2.ipf
diff --git a/contrib/ipfilter/test/regress/p3.ipf b/test/regress/p3.ipf
index aad7cb358b5c..aad7cb358b5c 100644
--- a/contrib/ipfilter/test/regress/p3.ipf
+++ b/test/regress/p3.ipf
diff --git a/contrib/ipfilter/test/regress/p3.pool b/test/regress/p3.pool
index 3fadd59d3e1c..3fadd59d3e1c 100644
--- a/contrib/ipfilter/test/regress/p3.pool
+++ b/test/regress/p3.pool
diff --git a/contrib/ipfilter/test/regress/p5.ipf b/test/regress/p5.ipf
index ada9f56f0f72..ada9f56f0f72 100644
--- a/contrib/ipfilter/test/regress/p5.ipf
+++ b/test/regress/p5.ipf
diff --git a/contrib/ipfilter/test/regress/p5.pool b/test/regress/p5.pool
index 9a8eaa3003d7..9a8eaa3003d7 100644
--- a/contrib/ipfilter/test/regress/p5.pool
+++ b/test/regress/p5.pool
diff --git a/contrib/ipfilter/test/regress/regress.sed b/test/regress/regress.sed
index e69de29bb2d1..e69de29bb2d1 100644
--- a/contrib/ipfilter/test/regress/regress.sed
+++ b/test/regress/regress.sed
diff --git a/contrib/ipfilter/test/test.format b/test/test.format
index dfc3f35b619a..dfc3f35b619a 100644
--- a/contrib/ipfilter/test/test.format
+++ b/test/test.format
diff --git a/contrib/ipfilter/test/test.sed b/test/test.sed
index 3ce0cb16415e..3ce0cb16415e 100644
--- a/contrib/ipfilter/test/test.sed
+++ b/test/test.sed
diff --git a/contrib/ipfilter/test/vfycksum.pl b/test/vfycksum.pl
index b3a20be0cf24..b3a20be0cf24 100755
--- a/contrib/ipfilter/test/vfycksum.pl
+++ b/test/vfycksum.pl
diff --git a/contrib/ipfilter/todo b/todo
index 5b2c05905214..5b2c05905214 100644
--- a/contrib/ipfilter/todo
+++ b/todo
diff --git a/contrib/ipfilter/tools/BNF.ipf b/tools/BNF.ipf
index 0e8433291d1c..0e8433291d1c 100644
--- a/contrib/ipfilter/tools/BNF.ipf
+++ b/tools/BNF.ipf
diff --git a/contrib/ipfilter/tools/BNF.ipnat b/tools/BNF.ipnat
index 69ed8a205504..69ed8a205504 100644
--- a/contrib/ipfilter/tools/BNF.ipnat
+++ b/tools/BNF.ipnat
diff --git a/contrib/ipfilter/tools/Makefile b/tools/Makefile
index 43ec1a897b83..43ec1a897b83 100644
--- a/contrib/ipfilter/tools/Makefile
+++ b/tools/Makefile
diff --git a/contrib/ipfilter/tools/ipf.c b/tools/ipf.c
index 063ecf08e68d..063ecf08e68d 100644
--- a/contrib/ipfilter/tools/ipf.c
+++ b/tools/ipf.c
diff --git a/contrib/ipfilter/tools/ipf_y.y b/tools/ipf_y.y
index 4156250d0fa1..4156250d0fa1 100644
--- a/contrib/ipfilter/tools/ipf_y.y
+++ b/tools/ipf_y.y
diff --git a/contrib/ipfilter/tools/ipfcomp.c b/tools/ipfcomp.c
index aa25c774e958..aa25c774e958 100644
--- a/contrib/ipfilter/tools/ipfcomp.c
+++ b/tools/ipfcomp.c
diff --git a/contrib/ipfilter/tools/ipfs.c b/tools/ipfs.c
index 3acb5d45e21f..3acb5d45e21f 100644
--- a/contrib/ipfilter/tools/ipfs.c
+++ b/tools/ipfs.c
diff --git a/contrib/ipfilter/tools/ipfstat.c b/tools/ipfstat.c
index e28fe4c347e8..e28fe4c347e8 100644
--- a/contrib/ipfilter/tools/ipfstat.c
+++ b/tools/ipfstat.c
diff --git a/contrib/ipfilter/tools/ipftest.c b/tools/ipftest.c
index 8343b2c3b27c..8343b2c3b27c 100644
--- a/contrib/ipfilter/tools/ipftest.c
+++ b/tools/ipftest.c
diff --git a/contrib/ipfilter/tools/ipmon.c b/tools/ipmon.c
index f07396dbbcb0..f07396dbbcb0 100644
--- a/contrib/ipfilter/tools/ipmon.c
+++ b/tools/ipmon.c
diff --git a/contrib/ipfilter/tools/ipmon_y.y b/tools/ipmon_y.y
index bc3ec6ddfa31..bc3ec6ddfa31 100644
--- a/contrib/ipfilter/tools/ipmon_y.y
+++ b/tools/ipmon_y.y
diff --git a/contrib/ipfilter/tools/ipnat.c b/tools/ipnat.c
index 038df6d069c9..038df6d069c9 100644
--- a/contrib/ipfilter/tools/ipnat.c
+++ b/tools/ipnat.c
diff --git a/contrib/ipfilter/tools/ipnat_y.y b/tools/ipnat_y.y
index 6208c989774b..6208c989774b 100644
--- a/contrib/ipfilter/tools/ipnat_y.y
+++ b/tools/ipnat_y.y
diff --git a/contrib/ipfilter/tools/ippool.c b/tools/ippool.c
index cbdfd69fff38..cbdfd69fff38 100644
--- a/contrib/ipfilter/tools/ippool.c
+++ b/tools/ippool.c
diff --git a/contrib/ipfilter/tools/ippool_y.y b/tools/ippool_y.y
index 4aa51081090f..4aa51081090f 100644
--- a/contrib/ipfilter/tools/ippool_y.y
+++ b/tools/ippool_y.y
diff --git a/contrib/ipfilter/tools/ipscan_y.y b/tools/ipscan_y.y
index 5d7e7e66bcd9..5d7e7e66bcd9 100644
--- a/contrib/ipfilter/tools/ipscan_y.y
+++ b/tools/ipscan_y.y
diff --git a/contrib/ipfilter/tools/ipsyncm.c b/tools/ipsyncm.c
index fc79abb9a11f..fc79abb9a11f 100644
--- a/contrib/ipfilter/tools/ipsyncm.c
+++ b/tools/ipsyncm.c
diff --git a/contrib/ipfilter/tools/ipsyncs.c b/tools/ipsyncs.c
index 3a8270fc4b2f..3a8270fc4b2f 100644
--- a/contrib/ipfilter/tools/ipsyncs.c
+++ b/tools/ipsyncs.c
diff --git a/contrib/ipfilter/tools/lex_var.h b/tools/lex_var.h
index a6f9cf6a78e5..a6f9cf6a78e5 100644
--- a/contrib/ipfilter/tools/lex_var.h
+++ b/tools/lex_var.h
diff --git a/contrib/ipfilter/tools/lexer.c b/tools/lexer.c
index 1ad00c4c06f7..1ad00c4c06f7 100644
--- a/contrib/ipfilter/tools/lexer.c
+++ b/tools/lexer.c
diff --git a/contrib/ipfilter/tools/lexer.h b/tools/lexer.h
index b838d41571c9..b838d41571c9 100644
--- a/contrib/ipfilter/tools/lexer.h
+++ b/tools/lexer.h