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)

794 files changed, 0 insertions, 0 deletions

diff --git a/contrib/ipfilter/.cvsignore b/.cvsignore
index 616828f..616828f 100644
--- a/contrib/ipfilter/.cvsignore
+++ b/.cvsignore
diff --git a/contrib/ipfilter/BNF b/BNF
index 404cc28..404cc28 100644
--- a/contrib/ipfilter/BNF
+++ b/BNF
diff --git a/contrib/ipfilter/BSD/.cvsignore b/BSD/.cvsignore
index c149a00..c149a00 100644
--- a/contrib/ipfilter/BSD/.cvsignore
+++ b/BSD/.cvsignore
diff --git a/contrib/ipfilter/BSD/Makefile b/BSD/Makefile
index fe8a4d4..fe8a4d4 100644
--- a/contrib/ipfilter/BSD/Makefile
+++ b/BSD/Makefile
diff --git a/contrib/ipfilter/BSD/Makefile.ipsend b/BSD/Makefile.ipsend
index a83de1c..a83de1c 100644
--- a/contrib/ipfilter/BSD/Makefile.ipsend
+++ b/BSD/Makefile.ipsend
diff --git a/contrib/ipfilter/BSD/ipfadm-rcd b/BSD/ipfadm-rcd
index 41f62b0..41f62b0 100755
--- a/contrib/ipfilter/BSD/ipfadm-rcd
+++ b/BSD/ipfadm-rcd
diff --git a/contrib/ipfilter/BSD/kupgrade b/BSD/kupgrade
index 04b257d..04b257d 100644
--- a/contrib/ipfilter/BSD/kupgrade
+++ b/BSD/kupgrade
diff --git a/contrib/ipfilter/BSD/make-devices b/BSD/make-devices
index d512e1c..d512e1c 100755
--- a/contrib/ipfilter/BSD/make-devices
+++ b/BSD/make-devices
diff --git a/contrib/ipfilter/BugReport b/BugReport
index 6994831..6994831 100644
--- a/contrib/ipfilter/BugReport
+++ b/BugReport
diff --git a/contrib/ipfilter/COMPILE.2.5 b/COMPILE.2.5
index ae550f8..ae550f8 100644
--- a/contrib/ipfilter/COMPILE.2.5
+++ b/COMPILE.2.5
diff --git a/contrib/ipfilter/COMPILE.Solaris2 b/COMPILE.Solaris2
index 45442c5..45442c5 100644
--- a/contrib/ipfilter/COMPILE.Solaris2
+++ b/COMPILE.Solaris2
diff --git a/contrib/ipfilter/FAQ.FreeBSD b/FAQ.FreeBSD
index 3b069c9..3b069c9 100644
--- a/contrib/ipfilter/FAQ.FreeBSD
+++ b/FAQ.FreeBSD
diff --git a/contrib/ipfilter/FWTK/FWTK.sed b/FWTK/FWTK.sed
index e69de29..e69de29 100644
--- a/contrib/ipfilter/FWTK/FWTK.sed
+++ b/FWTK/FWTK.sed
diff --git a/contrib/ipfilter/FWTK/Index b/FWTK/Index
index f5d7043..f5d7043 100644
--- a/contrib/ipfilter/FWTK/Index
+++ b/FWTK/Index
diff --git a/contrib/ipfilter/FWTK/README b/FWTK/README
index 3ed0e2f..3ed0e2f 100644
--- a/contrib/ipfilter/FWTK/README
+++ b/FWTK/README
diff --git a/contrib/ipfilter/FWTK/README.ipfilter b/FWTK/README.ipfilter
index fd461cc..fd461cc 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 be61342..be61342 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 2e71938..2e71938 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 a6c21fa..a6c21fa 100644
--- a/contrib/ipfilter/FWTK/fwtk_transparent.diff
+++ b/FWTK/fwtk_transparent.diff
diff --git a/contrib/ipfilter/FWTK/fwtkp b/FWTK/fwtkp
index aba869d..aba869d 100644
--- a/contrib/ipfilter/FWTK/fwtkp
+++ b/FWTK/fwtkp
diff --git a/contrib/ipfilter/FWTK/tproxy.diff b/FWTK/tproxy.diff
index 234404b..234404b 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 2ada3fa..2ada3fa 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 82599f1..82599f1 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 c2822d3..c2822d3 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 c2b2b15..c2b2b15 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 ff5ae0a..ff5ae0a 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 5a4368e..5a4368e 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 832b68e..832b68e 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 1955f5c..1955f5c 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 07aaac0..07aaac0 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 5c30b57..5c30b57 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 20f0369..20f0369 100755
--- a/contrib/ipfilter/FreeBSD-3/kinstall
+++ b/FreeBSD-3/kinstall
diff --git a/contrib/ipfilter/FreeBSD-3/unkinstall b/FreeBSD-3/unkinstall
index 687ebc6..687ebc6 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 7d1b7a2..7d1b7a2 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 c232b2c..c232b2c 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 c232b2c..c232b2c 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 90dac19..90dac19 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 90dac19..90dac19 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 ebd6e2e..ebd6e2e 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 4e9caaa..4e9caaa 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 afd2880..afd2880 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 2f028e3..2f028e3 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 29aea54..29aea54 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 ed8aff9..ed8aff9 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 9656006..9656006 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 052dd51..052dd51 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 a70be89..a70be89 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 f1fe9ac..f1fe9ac 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 2b67b9a..2b67b9a 100755
--- a/contrib/ipfilter/FreeBSD/kinstall
+++ b/FreeBSD/kinstall
diff --git a/contrib/ipfilter/FreeBSD/minstall b/FreeBSD/minstall
index 0cfe7c3..0cfe7c3 100755
--- a/contrib/ipfilter/FreeBSD/minstall
+++ b/FreeBSD/minstall
diff --git a/contrib/ipfilter/FreeBSD/unkinstall b/FreeBSD/unkinstall
index 8547fcd..8547fcd 100755
--- a/contrib/ipfilter/FreeBSD/unkinstall
+++ b/FreeBSD/unkinstall
diff --git a/contrib/ipfilter/FreeBSD/unminstall b/FreeBSD/unminstall
index a25746c..a25746c 100755
--- a/contrib/ipfilter/FreeBSD/unminstall
+++ b/FreeBSD/unminstall
diff --git a/contrib/ipfilter/HISTORY b/HISTORY
index b500c20..b500c20 100644
--- a/contrib/ipfilter/HISTORY
+++ b/HISTORY
diff --git a/contrib/ipfilter/IMPORTANT b/IMPORTANT
index 0ef7a3d..0ef7a3d 100644
--- a/contrib/ipfilter/IMPORTANT
+++ b/IMPORTANT
diff --git a/contrib/ipfilter/INST.FreeBSD-2.2 b/INST.FreeBSD-2.2
index 78f7295..78f7295 100644
--- a/contrib/ipfilter/INST.FreeBSD-2.2
+++ b/INST.FreeBSD-2.2
diff --git a/contrib/ipfilter/INSTALL.BSDOS b/INSTALL.BSDOS
index 17d9602..17d9602 100644
--- a/contrib/ipfilter/INSTALL.BSDOS
+++ b/INSTALL.BSDOS
diff --git a/contrib/ipfilter/INSTALL.BSDOS3 b/INSTALL.BSDOS3
index 8842b98..8842b98 100644
--- a/contrib/ipfilter/INSTALL.BSDOS3
+++ b/INSTALL.BSDOS3
diff --git a/contrib/ipfilter/INSTALL.FreeBSD b/INSTALL.FreeBSD
index a4a787a..a4a787a 100644
--- a/contrib/ipfilter/INSTALL.FreeBSD
+++ b/INSTALL.FreeBSD
diff --git a/contrib/ipfilter/INSTALL.IRIX b/INSTALL.IRIX
index b64d434..b64d434 100644
--- a/contrib/ipfilter/INSTALL.IRIX
+++ b/INSTALL.IRIX
diff --git a/contrib/ipfilter/INSTALL.Linux b/INSTALL.Linux
index 1a5d15b..1a5d15b 100644
--- a/contrib/ipfilter/INSTALL.Linux
+++ b/INSTALL.Linux
diff --git a/contrib/ipfilter/INSTALL.NetBSD b/INSTALL.NetBSD
index 012d6d7..012d6d7 100644
--- a/contrib/ipfilter/INSTALL.NetBSD
+++ b/INSTALL.NetBSD
diff --git a/contrib/ipfilter/INSTALL.Sol2 b/INSTALL.Sol2
index 5ba84b9..5ba84b9 100644
--- a/contrib/ipfilter/INSTALL.Sol2
+++ b/INSTALL.Sol2
diff --git a/contrib/ipfilter/INSTALL.SunOS b/INSTALL.SunOS
index 0d4dd8c..0d4dd8c 100644
--- a/contrib/ipfilter/INSTALL.SunOS
+++ b/INSTALL.SunOS
diff --git a/contrib/ipfilter/INSTALL.xBSD b/INSTALL.xBSD
index b06ad4b..b06ad4b 100644
--- a/contrib/ipfilter/INSTALL.xBSD
+++ b/INSTALL.xBSD
diff --git a/contrib/ipfilter/IPF.KANJI b/IPF.KANJI
index 85af5ce..85af5ce 100644
--- a/contrib/ipfilter/IPF.KANJI
+++ b/IPF.KANJI
diff --git a/contrib/ipfilter/IPFILTER.LICENCE b/IPFILTER.LICENCE
index 41c151c..41c151c 100644
--- a/contrib/ipfilter/IPFILTER.LICENCE
+++ b/IPFILTER.LICENCE
diff --git a/contrib/ipfilter/LICENCE b/LICENCE
index f4cc8ee..f4cc8ee 100644
--- a/contrib/ipfilter/LICENCE
+++ b/LICENCE
diff --git a/contrib/ipfilter/Makefile b/Makefile
index 1b2f8f5..1b2f8f5 100644
--- a/contrib/ipfilter/Makefile
+++ b/Makefile
diff --git a/contrib/ipfilter/NAT.FreeBSD b/NAT.FreeBSD
index 8a7e952..8a7e952 100644
--- a/contrib/ipfilter/NAT.FreeBSD
+++ b/NAT.FreeBSD
diff --git a/contrib/ipfilter/QNX_OCL.txt b/QNX_OCL.txt
index 6aa33ea..6aa33ea 100644
--- a/contrib/ipfilter/QNX_OCL.txt
+++ b/QNX_OCL.txt
diff --git a/contrib/ipfilter/README b/README
index 8464af4..8464af4 100644
--- a/contrib/ipfilter/README
+++ b/README
diff --git a/contrib/ipfilter/STYLE.TXT b/STYLE.TXT
index 384bcec..384bcec 100644
--- a/contrib/ipfilter/STYLE.TXT
+++ b/STYLE.TXT
diff --git a/contrib/ipfilter/UPGRADE_NOTICE b/UPGRADE_NOTICE
index 8b44760..8b44760 100644
--- a/contrib/ipfilter/UPGRADE_NOTICE
+++ b/UPGRADE_NOTICE
diff --git a/contrib/ipfilter/WhatsNew40.txt b/WhatsNew40.txt
index e5b8294..e5b8294 100644
--- a/contrib/ipfilter/WhatsNew40.txt
+++ b/WhatsNew40.txt
diff --git a/contrib/ipfilter/Y2K b/Y2K
index a8350a5..a8350a5 100644
--- a/contrib/ipfilter/Y2K
+++ b/Y2K
diff --git a/contrib/ipfilter/bpf-ipf.h b/bpf-ipf.h
index 544455e..544455e 100644
--- a/contrib/ipfilter/bpf-ipf.h
+++ b/bpf-ipf.h
diff --git a/contrib/ipfilter/bpf.h b/bpf.h
index 715c79a..715c79a 100644
--- a/contrib/ipfilter/bpf.h
+++ b/bpf.h
diff --git a/contrib/ipfilter/bpf_filter.c b/bpf_filter.c
index a254f65..a254f65 100644
--- a/contrib/ipfilter/bpf_filter.c
+++ b/bpf_filter.c
diff --git a/contrib/ipfilter/bsdinstall b/bsdinstall
index 7689a21..7689a21 100755
--- a/contrib/ipfilter/bsdinstall
+++ b/bsdinstall
diff --git a/contrib/ipfilter/buildlinux b/buildlinux
index 7ce043f..7ce043f 100755
--- a/contrib/ipfilter/buildlinux
+++ b/buildlinux
diff --git a/contrib/ipfilter/buildsunos b/buildsunos
index 5e857e7..5e857e7 100755
--- a/contrib/ipfilter/buildsunos
+++ b/buildsunos
diff --git a/contrib/ipfilter/common.c b/common.c
index fa21fc9..fa21fc9 100644
--- a/contrib/ipfilter/common.c
+++ b/common.c
diff --git a/contrib/ipfilter/etc/etc.sed b/etc/etc.sed
index b14fc74..b14fc74 100644
--- a/contrib/ipfilter/etc/etc.sed
+++ b/etc/etc.sed
diff --git a/contrib/ipfilter/etc/protocols b/etc/protocols
index 30c5b76..30c5b76 100644
--- a/contrib/ipfilter/etc/protocols
+++ b/etc/protocols
diff --git a/contrib/ipfilter/etc/services b/etc/services
index d8aa0d5..d8aa0d5 100644
--- a/contrib/ipfilter/etc/services
+++ b/etc/services
diff --git a/contrib/ipfilter/facpri.c b/facpri.c
index 79afdd2..79afdd2 100644
--- a/contrib/ipfilter/facpri.c
+++ b/facpri.c
diff --git a/contrib/ipfilter/facpri.h b/facpri.h
index 7b80377..7b80377 100644
--- a/contrib/ipfilter/facpri.h
+++ b/facpri.h
diff --git a/contrib/ipfilter/fil.c b/fil.c
index 6f3a13d..6f3a13d 100644
--- a/contrib/ipfilter/fil.c
+++ b/fil.c
diff --git a/contrib/ipfilter/fils.c b/fils.c
index e21af89..e21af89 100644
--- a/contrib/ipfilter/fils.c
+++ b/fils.c
diff --git a/contrib/ipfilter/inet_addr.c b/inet_addr.c
index e940280..e940280 100644
--- a/contrib/ipfilter/inet_addr.c
+++ b/inet_addr.c
diff --git a/contrib/ipfilter/ip_auth.c b/ip_auth.c
index b91c2e6..b91c2e6 100644
--- a/contrib/ipfilter/ip_auth.c
+++ b/ip_auth.c
diff --git a/contrib/ipfilter/ip_auth.h b/ip_auth.h
index a39e7fd..a39e7fd 100644
--- a/contrib/ipfilter/ip_auth.h
+++ b/ip_auth.h
diff --git a/contrib/ipfilter/ip_compat.h b/ip_compat.h
index 6ea3f70..6ea3f70 100644
--- a/contrib/ipfilter/ip_compat.h
+++ b/ip_compat.h
diff --git a/contrib/ipfilter/ip_fil.c b/ip_fil.c
index f2006e9..f2006e9 100644
--- a/contrib/ipfilter/ip_fil.c
+++ b/ip_fil.c
diff --git a/contrib/ipfilter/ip_fil.h b/ip_fil.h
index 2aacb3f..2aacb3f 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 3b36b93..3b36b93 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 087ca19..087ca19 100644
--- a/contrib/ipfilter/ip_frag.c
+++ b/ip_frag.c
diff --git a/contrib/ipfilter/ip_frag.h b/ip_frag.h
index 786a088..786a088 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 5bdc18a..5bdc18a 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 b6e7c7b..b6e7c7b 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 50aa926..50aa926 100644
--- a/contrib/ipfilter/ip_htable.c
+++ b/ip_htable.c
diff --git a/contrib/ipfilter/ip_htable.h b/ip_htable.h
index e138459..e138459 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 2159ecb..2159ecb 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 45a120f..45a120f 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 196d64e..196d64e 100644
--- a/contrib/ipfilter/ip_lfil.c
+++ b/ip_lfil.c
diff --git a/contrib/ipfilter/ip_log.c b/ip_log.c
index 1243081..1243081 100644
--- a/contrib/ipfilter/ip_log.c
+++ b/ip_log.c
diff --git a/contrib/ipfilter/ip_lookup.c b/ip_lookup.c
index b832373..b832373 100644
--- a/contrib/ipfilter/ip_lookup.c
+++ b/ip_lookup.c
diff --git a/contrib/ipfilter/ip_lookup.h b/ip_lookup.h
index e9f8cb8..e9f8cb8 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 187a964..187a964 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 5529502..5529502 100644
--- a/contrib/ipfilter/ip_nat.c
+++ b/ip_nat.c
diff --git a/contrib/ipfilter/ip_nat.h b/ip_nat.h
index 09cc119..09cc119 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 0ff6d25..0ff6d25 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 b6e111b..b6e111b 100644
--- a/contrib/ipfilter/ip_pool.c
+++ b/ip_pool.c
diff --git a/contrib/ipfilter/ip_pool.h b/ip_pool.h
index 3e3c073..3e3c073 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 2511a17..2511a17 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 18bc4e1..18bc4e1 100644
--- a/contrib/ipfilter/ip_proxy.c
+++ b/ip_proxy.c
diff --git a/contrib/ipfilter/ip_proxy.h b/ip_proxy.h
index 8e53c98..8e53c98 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 260fcd4..260fcd4 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 b7904c8..b7904c8 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 5d0a1ee..5d0a1ee 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 37f6d58..37f6d58 100644
--- a/contrib/ipfilter/ip_scan.c
+++ b/ip_scan.c
diff --git a/contrib/ipfilter/ip_scan.h b/ip_scan.h
index de98f9c..de98f9c 100644
--- a/contrib/ipfilter/ip_scan.h
+++ b/ip_scan.h
diff --git a/contrib/ipfilter/ip_sfil.c b/ip_sfil.c
index 9e995d9..9e995d9 100644
--- a/contrib/ipfilter/ip_sfil.c
+++ b/ip_sfil.c
diff --git a/contrib/ipfilter/ip_state.c b/ip_state.c
index 4ced16d..4ced16d 100644
--- a/contrib/ipfilter/ip_state.c
+++ b/ip_state.c
diff --git a/contrib/ipfilter/ip_state.h b/ip_state.h
index 2f5f7f1..2f5f7f1 100644
--- a/contrib/ipfilter/ip_state.h
+++ b/ip_state.h
diff --git a/contrib/ipfilter/ip_sync.c b/ip_sync.c
index 396bae7..396bae7 100644
--- a/contrib/ipfilter/ip_sync.c
+++ b/ip_sync.c
diff --git a/contrib/ipfilter/ip_sync.h b/ip_sync.h
index e319a95..e319a95 100644
--- a/contrib/ipfilter/ip_sync.h
+++ b/ip_sync.h
diff --git a/contrib/ipfilter/ipf.c b/ipf.c
index cf85280..cf85280 100644
--- a/contrib/ipfilter/ipf.c
+++ b/ipf.c
diff --git a/contrib/ipfilter/ipf.h b/ipf.h
index 1a2d0f0..1a2d0f0 100644
--- a/contrib/ipfilter/ipf.h
+++ b/ipf.h
diff --git a/contrib/ipfilter/ipfs.c b/ipfs.c
index ffbd71b..ffbd71b 100644
--- a/contrib/ipfilter/ipfs.c
+++ b/ipfs.c
diff --git a/contrib/ipfilter/ipft_ef.c b/ipft_ef.c
index c8ae3f2..c8ae3f2 100644
--- a/contrib/ipfilter/ipft_ef.c
+++ b/ipft_ef.c
diff --git a/contrib/ipfilter/ipft_hx.c b/ipft_hx.c
index b26bd93..b26bd93 100644
--- a/contrib/ipfilter/ipft_hx.c
+++ b/ipft_hx.c
diff --git a/contrib/ipfilter/ipft_pc.c b/ipft_pc.c
index b6060de..b6060de 100644
--- a/contrib/ipfilter/ipft_pc.c
+++ b/ipft_pc.c
diff --git a/contrib/ipfilter/ipft_sn.c b/ipft_sn.c
index 859bf5e..859bf5e 100644
--- a/contrib/ipfilter/ipft_sn.c
+++ b/ipft_sn.c
diff --git a/contrib/ipfilter/ipft_td.c b/ipft_td.c
index 99beab5..99beab5 100644
--- a/contrib/ipfilter/ipft_td.c
+++ b/ipft_td.c
diff --git a/contrib/ipfilter/ipft_tx.c b/ipft_tx.c
index 7ea87e3..7ea87e3 100644
--- a/contrib/ipfilter/ipft_tx.c
+++ b/ipft_tx.c
diff --git a/contrib/ipfilter/ipl.h b/ipl.h
index 7e90820..7e90820 100644
--- a/contrib/ipfilter/ipl.h
+++ b/ipl.h
diff --git a/contrib/ipfilter/ipl_ldev.c b/ipl_ldev.c
index a289325..a289325 100644
--- a/contrib/ipfilter/ipl_ldev.c
+++ b/ipl_ldev.c
diff --git a/contrib/ipfilter/iplang/.cvsignore b/iplang/.cvsignore
index 68b5b4e..68b5b4e 100644
--- a/contrib/ipfilter/iplang/.cvsignore
+++ b/iplang/.cvsignore
diff --git a/contrib/ipfilter/iplang/BNF b/iplang/BNF
index b5fb8d0..b5fb8d0 100644
--- a/contrib/ipfilter/iplang/BNF
+++ b/iplang/BNF
diff --git a/contrib/ipfilter/iplang/Makefile b/iplang/Makefile
index 1d66bb6..1d66bb6 100644
--- a/contrib/ipfilter/iplang/Makefile
+++ b/iplang/Makefile
diff --git a/contrib/ipfilter/iplang/iplang.h b/iplang/iplang.h
index f36a384..f36a384 100644
--- a/contrib/ipfilter/iplang/iplang.h
+++ b/iplang/iplang.h
diff --git a/contrib/ipfilter/iplang/iplang.tst b/iplang/iplang.tst
index a0a2ad3..a0a2ad3 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 fae30a2..fae30a2 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 735ac37..735ac37 100644
--- a/contrib/ipfilter/iplang/iplang_y.y
+++ b/iplang/iplang_y.y
diff --git a/contrib/ipfilter/ipmon.c b/ipmon.c
index 2e4b2b5..2e4b2b5 100644
--- a/contrib/ipfilter/ipmon.c
+++ b/ipmon.c
diff --git a/contrib/ipfilter/ipmon.h b/ipmon.h
index 5c6f8c5..5c6f8c5 100644
--- a/contrib/ipfilter/ipmon.h
+++ b/ipmon.h
diff --git a/contrib/ipfilter/ipnat.c b/ipnat.c
index 69e7959..69e7959 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 a911fd8..a911fd8 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 0f3ce08..0f3ce08 100644
--- a/contrib/ipfilter/ipsd/Makefile
+++ b/ipsd/Makefile
diff --git a/contrib/ipfilter/ipsd/README b/ipsd/README
index eb6b798..eb6b798 100644
--- a/contrib/ipfilter/ipsd/README
+++ b/ipsd/README
diff --git a/contrib/ipfilter/ipsd/ip_compat.h b/ipsd/ip_compat.h
index a911fd8..a911fd8 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 51d0a14..51d0a14 100644
--- a/contrib/ipfilter/ipsd/ipsd.c
+++ b/ipsd/ipsd.c
diff --git a/contrib/ipfilter/ipsd/ipsd.h b/ipsd/ipsd.h
index 3726b84..3726b84 100644
--- a/contrib/ipfilter/ipsd/ipsd.h
+++ b/ipsd/ipsd.h
diff --git a/contrib/ipfilter/ipsd/ipsd.sed b/ipsd/ipsd.sed
index e69de29..e69de29 100644
--- a/contrib/ipfilter/ipsd/ipsd.sed
+++ b/ipsd/ipsd.sed
diff --git a/contrib/ipfilter/ipsd/ipsdr.c b/ipsd/ipsdr.c
index af007e4..af007e4 100644
--- a/contrib/ipfilter/ipsd/ipsdr.c
+++ b/ipsd/ipsdr.c
diff --git a/contrib/ipfilter/ipsd/linux.h b/ipsd/linux.h
index d9606cb..d9606cb 100644
--- a/contrib/ipfilter/ipsd/linux.h
+++ b/ipsd/linux.h
diff --git a/contrib/ipfilter/ipsd/sbpf.c b/ipsd/sbpf.c
index 457891b..457891b 100644
--- a/contrib/ipfilter/ipsd/sbpf.c
+++ b/ipsd/sbpf.c
diff --git a/contrib/ipfilter/ipsd/sdlpi.c b/ipsd/sdlpi.c
index baede7c..baede7c 100644
--- a/contrib/ipfilter/ipsd/sdlpi.c
+++ b/ipsd/sdlpi.c
diff --git a/contrib/ipfilter/ipsd/slinux.c b/ipsd/slinux.c
index 6372a60..6372a60 100644
--- a/contrib/ipfilter/ipsd/slinux.c
+++ b/ipsd/slinux.c
diff --git a/contrib/ipfilter/ipsd/snit.c b/ipsd/snit.c
index e78c591..e78c591 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 c38fa59..c38fa59 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 b7aea24..b7aea24 100644
--- a/contrib/ipfilter/ipsend/.cvsignore
+++ b/ipsend/.cvsignore
diff --git a/contrib/ipfilter/ipsend/44arp.c b/ipsend/44arp.c
index 4b08a8b..4b08a8b 100644
--- a/contrib/ipfilter/ipsend/44arp.c
+++ b/ipsend/44arp.c
diff --git a/contrib/ipfilter/ipsend/Crashable b/ipsend/Crashable
index c7ffcde..c7ffcde 100644
--- a/contrib/ipfilter/ipsend/Crashable
+++ b/ipsend/Crashable
diff --git a/contrib/ipfilter/ipsend/Makefile b/ipsend/Makefile
index ed3a51e..ed3a51e 100644
--- a/contrib/ipfilter/ipsend/Makefile
+++ b/ipsend/Makefile
diff --git a/contrib/ipfilter/ipsend/README b/ipsend/README
index 198556d..198556d 100644
--- a/contrib/ipfilter/ipsend/README
+++ b/ipsend/README
diff --git a/contrib/ipfilter/ipsend/arp.c b/ipsend/arp.c
index d5497ef..d5497ef 100644
--- a/contrib/ipfilter/ipsend/arp.c
+++ b/ipsend/arp.c
diff --git a/contrib/ipfilter/ipsend/dlcommon.c b/ipsend/dlcommon.c
index 8994138..8994138 100644
--- a/contrib/ipfilter/ipsend/dlcommon.c
+++ b/ipsend/dlcommon.c
diff --git a/contrib/ipfilter/ipsend/dltest.h b/ipsend/dltest.h
index 4c32c30..4c32c30 100644
--- a/contrib/ipfilter/ipsend/dltest.h
+++ b/ipsend/dltest.h
diff --git a/contrib/ipfilter/ipsend/hpux.c b/ipsend/hpux.c
index 42078e3..42078e3 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 2ebd731..2ebd731 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 e29f722..e29f722 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 c38fa59..c38fa59 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 92eb38a..92eb38a 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 6014313..6014313 100644
--- a/contrib/ipfilter/ipsend/ipresend.1
+++ b/ipsend/ipresend.1
diff --git a/contrib/ipfilter/ipsend/ipresend.c b/ipsend/ipresend.c
index 7e52fe9..7e52fe9 100644
--- a/contrib/ipfilter/ipsend/ipresend.c
+++ b/ipsend/ipresend.c
diff --git a/contrib/ipfilter/ipsend/ipsend.1 b/ipsend/ipsend.1
index f2f8066..f2f8066 100644
--- a/contrib/ipfilter/ipsend/ipsend.1
+++ b/ipsend/ipsend.1
diff --git a/contrib/ipfilter/ipsend/ipsend.5 b/ipsend/ipsend.5
index 4c1e66a..4c1e66a 100644
--- a/contrib/ipfilter/ipsend/ipsend.5
+++ b/ipsend/ipsend.5
diff --git a/contrib/ipfilter/ipsend/ipsend.c b/ipsend/ipsend.c
index dcd897c..dcd897c 100644
--- a/contrib/ipfilter/ipsend/ipsend.c
+++ b/ipsend/ipsend.c
diff --git a/contrib/ipfilter/ipsend/ipsend.h b/ipsend/ipsend.h
index f5e51a7..f5e51a7 100644
--- a/contrib/ipfilter/ipsend/ipsend.h
+++ b/ipsend/ipsend.h
diff --git a/contrib/ipfilter/ipsend/ipsend.sed b/ipsend/ipsend.sed
index 774c0e2..774c0e2 100644
--- a/contrib/ipfilter/ipsend/ipsend.sed
+++ b/ipsend/ipsend.sed
diff --git a/contrib/ipfilter/ipsend/ipsopt.c b/ipsend/ipsopt.c
index 9326bc6..9326bc6 100644
--- a/contrib/ipfilter/ipsend/ipsopt.c
+++ b/ipsend/ipsopt.c
diff --git a/contrib/ipfilter/ipsend/iptest.1 b/ipsend/iptest.1
index ca74094..ca74094 100644
--- a/contrib/ipfilter/ipsend/iptest.1
+++ b/ipsend/iptest.1
diff --git a/contrib/ipfilter/ipsend/iptest.c b/ipsend/iptest.c
index 000d1cc..000d1cc 100644
--- a/contrib/ipfilter/ipsend/iptest.c
+++ b/ipsend/iptest.c
diff --git a/contrib/ipfilter/ipsend/iptests.c b/ipsend/iptests.c
index 56cc34b..56cc34b 100644
--- a/contrib/ipfilter/ipsend/iptests.c
+++ b/ipsend/iptests.c
diff --git a/contrib/ipfilter/ipsend/larp.c b/ipsend/larp.c
index 3d0c89c..3d0c89c 100644
--- a/contrib/ipfilter/ipsend/larp.c
+++ b/ipsend/larp.c
diff --git a/contrib/ipfilter/ipsend/linux.h b/ipsend/linux.h
index ae2e05f..ae2e05f 100644
--- a/contrib/ipfilter/ipsend/linux.h
+++ b/ipsend/linux.h
diff --git a/contrib/ipfilter/ipsend/lsock.c b/ipsend/lsock.c
index 7163ea7..7163ea7 100644
--- a/contrib/ipfilter/ipsend/lsock.c
+++ b/ipsend/lsock.c
diff --git a/contrib/ipfilter/ipsend/resend.c b/ipsend/resend.c
index e7b1ef4..e7b1ef4 100644
--- a/contrib/ipfilter/ipsend/resend.c
+++ b/ipsend/resend.c
diff --git a/contrib/ipfilter/ipsend/sbpf.c b/ipsend/sbpf.c
index 374b7ed..374b7ed 100644
--- a/contrib/ipfilter/ipsend/sbpf.c
+++ b/ipsend/sbpf.c
diff --git a/contrib/ipfilter/ipsend/sdlpi.c b/ipsend/sdlpi.c
index 1ce8946..1ce8946 100644
--- a/contrib/ipfilter/ipsend/sdlpi.c
+++ b/ipsend/sdlpi.c
diff --git a/contrib/ipfilter/ipsend/sirix.c b/ipsend/sirix.c
index 0f634f7..0f634f7 100644
--- a/contrib/ipfilter/ipsend/sirix.c
+++ b/ipsend/sirix.c
diff --git a/contrib/ipfilter/ipsend/slinux.c b/ipsend/slinux.c
index 7c362b6..7c362b6 100644
--- a/contrib/ipfilter/ipsend/slinux.c
+++ b/ipsend/slinux.c
diff --git a/contrib/ipfilter/ipsend/snit.c b/ipsend/snit.c
index bcd07d0..bcd07d0 100644
--- a/contrib/ipfilter/ipsend/snit.c
+++ b/ipsend/snit.c
diff --git a/contrib/ipfilter/ipsend/sock.c b/ipsend/sock.c
index f4317fc..f4317fc 100644
--- a/contrib/ipfilter/ipsend/sock.c
+++ b/ipsend/sock.c
diff --git a/contrib/ipfilter/ipsend/sockraw.c b/ipsend/sockraw.c
index 0e3fe59..0e3fe59 100644
--- a/contrib/ipfilter/ipsend/sockraw.c
+++ b/ipsend/sockraw.c
diff --git a/contrib/ipfilter/ipsend/tcpip.h b/ipsend/tcpip.h
index 44a2de9..44a2de9 100644
--- a/contrib/ipfilter/ipsend/tcpip.h
+++ b/ipsend/tcpip.h
diff --git a/contrib/ipfilter/ipsend/ultrix.c b/ipsend/ultrix.c
index f41a8a9..f41a8a9 100644
--- a/contrib/ipfilter/ipsend/ultrix.c
+++ b/ipsend/ultrix.c
diff --git a/contrib/ipfilter/ipt.c b/ipt.c
index 5a20f24..5a20f24 100644
--- a/contrib/ipfilter/ipt.c
+++ b/ipt.c
diff --git a/contrib/ipfilter/ipt.h b/ipt.h
index 43b9a6d..43b9a6d 100644
--- a/contrib/ipfilter/ipt.h
+++ b/ipt.h
diff --git a/contrib/ipfilter/kmem.c b/kmem.c
index 5723ba3..5723ba3 100644
--- a/contrib/ipfilter/kmem.c
+++ b/kmem.c
diff --git a/contrib/ipfilter/kmem.h b/kmem.h
index d2b1171..d2b1171 100644
--- a/contrib/ipfilter/kmem.h
+++ b/kmem.h
diff --git a/contrib/ipfilter/l4check/Makefile b/l4check/Makefile
index e2bb9f8..e2bb9f8 100644
--- a/contrib/ipfilter/l4check/Makefile
+++ b/l4check/Makefile
diff --git a/contrib/ipfilter/l4check/http.check b/l4check/http.check
index 56d93d9..56d93d9 100644
--- a/contrib/ipfilter/l4check/http.check
+++ b/l4check/http.check
diff --git a/contrib/ipfilter/l4check/http.ok b/l4check/http.ok
index 2b5d2c1..2b5d2c1 100644
--- a/contrib/ipfilter/l4check/http.ok
+++ b/l4check/http.ok
diff --git a/contrib/ipfilter/l4check/l4check.c b/l4check/l4check.c
index a096fff..a096fff 100644
--- a/contrib/ipfilter/l4check/l4check.c
+++ b/l4check/l4check.c
diff --git a/contrib/ipfilter/l4check/l4check.conf b/l4check/l4check.conf
index d000e9f..d000e9f 100644
--- a/contrib/ipfilter/l4check/l4check.conf
+++ b/l4check/l4check.conf
diff --git a/contrib/ipfilter/lib/Makefile b/lib/Makefile
index a838063..a838063 100644
--- a/contrib/ipfilter/lib/Makefile
+++ b/lib/Makefile
diff --git a/contrib/ipfilter/lib/addicmp.c b/lib/addicmp.c
index 2567397..2567397 100644
--- a/contrib/ipfilter/lib/addicmp.c
+++ b/lib/addicmp.c
diff --git a/contrib/ipfilter/lib/addipopt.c b/lib/addipopt.c
index 17fac0d..17fac0d 100644
--- a/contrib/ipfilter/lib/addipopt.c
+++ b/lib/addipopt.c
diff --git a/contrib/ipfilter/lib/addkeep.c b/lib/addkeep.c
index bbc7759..bbc7759 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 3c1a518..3c1a518 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 50a4275..50a4275 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 83fd04b..83fd04b 100644
--- a/contrib/ipfilter/lib/bcopywrap.c
+++ b/lib/bcopywrap.c
diff --git a/contrib/ipfilter/lib/binprint.c b/lib/binprint.c
index 4eb3828..4eb3828 100644
--- a/contrib/ipfilter/lib/binprint.c
+++ b/lib/binprint.c
diff --git a/contrib/ipfilter/lib/buildopts.c b/lib/buildopts.c
index d493f5e..d493f5e 100644
--- a/contrib/ipfilter/lib/buildopts.c
+++ b/lib/buildopts.c
diff --git a/contrib/ipfilter/lib/checkrev.c b/lib/checkrev.c
index 3c40226..3c40226 100644
--- a/contrib/ipfilter/lib/checkrev.c
+++ b/lib/checkrev.c
diff --git a/contrib/ipfilter/lib/count4bits.c b/lib/count4bits.c
index 51e6025..51e6025 100644
--- a/contrib/ipfilter/lib/count4bits.c
+++ b/lib/count4bits.c
diff --git a/contrib/ipfilter/lib/count6bits.c b/lib/count6bits.c
index be090b7..be090b7 100644
--- a/contrib/ipfilter/lib/count6bits.c
+++ b/lib/count6bits.c
diff --git a/contrib/ipfilter/lib/debug.c b/lib/debug.c
index 144bc02..144bc02 100644
--- a/contrib/ipfilter/lib/debug.c
+++ b/lib/debug.c
diff --git a/contrib/ipfilter/lib/extras.c b/lib/extras.c
index 9087ca6..9087ca6 100644
--- a/contrib/ipfilter/lib/extras.c
+++ b/lib/extras.c
diff --git a/contrib/ipfilter/lib/facpri.c b/lib/facpri.c
index 6785e22..6785e22 100644
--- a/contrib/ipfilter/lib/facpri.c
+++ b/lib/facpri.c
diff --git a/contrib/ipfilter/lib/facpri.h b/lib/facpri.h
index b6d5f5a..b6d5f5a 100644
--- a/contrib/ipfilter/lib/facpri.h
+++ b/lib/facpri.h
diff --git a/contrib/ipfilter/lib/fill6bits.c b/lib/fill6bits.c
index a5f459a..a5f459a 100644
--- a/contrib/ipfilter/lib/fill6bits.c
+++ b/lib/fill6bits.c
diff --git a/contrib/ipfilter/lib/flags.c b/lib/flags.c
index 4baf3bd..4baf3bd 100644
--- a/contrib/ipfilter/lib/flags.c
+++ b/lib/flags.c
diff --git a/contrib/ipfilter/lib/genmask.c b/lib/genmask.c
index 238e5b6..238e5b6 100644
--- a/contrib/ipfilter/lib/genmask.c
+++ b/lib/genmask.c
diff --git a/contrib/ipfilter/lib/gethost.c b/lib/gethost.c
index d97766f..d97766f 100644
--- a/contrib/ipfilter/lib/gethost.c
+++ b/lib/gethost.c
diff --git a/contrib/ipfilter/lib/getifname.c b/lib/getifname.c
index 6163239..6163239 100644
--- a/contrib/ipfilter/lib/getifname.c
+++ b/lib/getifname.c
diff --git a/contrib/ipfilter/lib/getline.c b/lib/getline.c
index 7d06d43..7d06d43 100644
--- a/contrib/ipfilter/lib/getline.c
+++ b/lib/getline.c
diff --git a/contrib/ipfilter/lib/getnattype.c b/lib/getnattype.c
index 04463c2..04463c2 100644
--- a/contrib/ipfilter/lib/getnattype.c
+++ b/lib/getnattype.c
diff --git a/contrib/ipfilter/lib/getport.c b/lib/getport.c
index 1c5177c..1c5177c 100644
--- a/contrib/ipfilter/lib/getport.c
+++ b/lib/getport.c
diff --git a/contrib/ipfilter/lib/getportproto.c b/lib/getportproto.c
index 5a247ae..5a247ae 100644
--- a/contrib/ipfilter/lib/getportproto.c
+++ b/lib/getportproto.c
diff --git a/contrib/ipfilter/lib/getproto.c b/lib/getproto.c
index 9714da2..9714da2 100644
--- a/contrib/ipfilter/lib/getproto.c
+++ b/lib/getproto.c
diff --git a/contrib/ipfilter/lib/getsumd.c b/lib/getsumd.c
index 00974bc..00974bc 100644
--- a/contrib/ipfilter/lib/getsumd.c
+++ b/lib/getsumd.c
diff --git a/contrib/ipfilter/lib/hexdump.c b/lib/hexdump.c
index 86e731e..86e731e 100644
--- a/contrib/ipfilter/lib/hexdump.c
+++ b/lib/hexdump.c
diff --git a/contrib/ipfilter/lib/hostmask.c b/lib/hostmask.c
index 4ee41e16..4ee41e16 100644
--- a/contrib/ipfilter/lib/hostmask.c
+++ b/lib/hostmask.c
diff --git a/contrib/ipfilter/lib/hostname.c b/lib/hostname.c
index b8295d4..b8295d4 100644
--- a/contrib/ipfilter/lib/hostname.c
+++ b/lib/hostname.c
diff --git a/contrib/ipfilter/lib/hostnum.c b/lib/hostnum.c
index 2ec0529..2ec0529 100644
--- a/contrib/ipfilter/lib/hostnum.c
+++ b/lib/hostnum.c
diff --git a/contrib/ipfilter/lib/icmpcode.c b/lib/icmpcode.c
index 69841e0..69841e0 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 820b7b5..820b7b5 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 b9f162f..b9f162f 100644
--- a/contrib/ipfilter/lib/initparse.c
+++ b/lib/initparse.c
diff --git a/contrib/ipfilter/lib/ionames.c b/lib/ionames.c
index cc9374d..cc9374d 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 8f90fdb..8f90fdb 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 52eb508..52eb508 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 4851fff..4851fff 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 fbfe6b0..fbfe6b0 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 a4c7318..a4c7318 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 21bb764..21bb764 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 5dc65b4..5dc65b4 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 a59db23..a59db23 100644
--- a/contrib/ipfilter/lib/ipoptsec.c
+++ b/lib/ipoptsec.c
diff --git a/contrib/ipfilter/lib/kmem.c b/lib/kmem.c
index 07830fb..07830fb 100644
--- a/contrib/ipfilter/lib/kmem.c
+++ b/lib/kmem.c
diff --git a/contrib/ipfilter/lib/kmem.h b/lib/kmem.h
index 70f0a7a..70f0a7a 100644
--- a/contrib/ipfilter/lib/kmem.h
+++ b/lib/kmem.h
diff --git a/contrib/ipfilter/lib/kmemcpywrap.c b/lib/kmemcpywrap.c
index 7a4a161..7a4a161 100644
--- a/contrib/ipfilter/lib/kmemcpywrap.c
+++ b/lib/kmemcpywrap.c
diff --git a/contrib/ipfilter/lib/kvatoname.c b/lib/kvatoname.c
index b0fe69d..b0fe69d 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 9bb3899..9bb3899 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 84abca0..84abca0 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 8ff907a..8ff907a 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 164b8b4..164b8b4 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 f22b063..f22b063 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 2afc4d2..2afc4d2 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 7709153..7709153 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 47dd8ba..47dd8ba 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 e4335cd..e4335cd 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 1a58156..1a58156 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 89e3474..89e3474 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 ccf7864..ccf7864 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 9937380..9937380 100644
--- a/contrib/ipfilter/lib/natparse.c
+++ b/lib/natparse.c
diff --git a/contrib/ipfilter/lib/ntomask.c b/lib/ntomask.c
index 4a50ef8..4a50ef8 100644
--- a/contrib/ipfilter/lib/ntomask.c
+++ b/lib/ntomask.c
diff --git a/contrib/ipfilter/lib/optname.c b/lib/optname.c
index 33e5f17..33e5f17 100644
--- a/contrib/ipfilter/lib/optname.c
+++ b/lib/optname.c
diff --git a/contrib/ipfilter/lib/optprint.c b/lib/optprint.c
index 8c14fe4..8c14fe4 100644
--- a/contrib/ipfilter/lib/optprint.c
+++ b/lib/optprint.c
diff --git a/contrib/ipfilter/lib/optprintv6.c b/lib/optprintv6.c
index 5172b5c..5172b5c 100644
--- a/contrib/ipfilter/lib/optprintv6.c
+++ b/lib/optprintv6.c
diff --git a/contrib/ipfilter/lib/optvalue.c b/lib/optvalue.c
index 37bfcf9..37bfcf9 100644
--- a/contrib/ipfilter/lib/optvalue.c
+++ b/lib/optvalue.c
diff --git a/contrib/ipfilter/lib/parse.c b/lib/parse.c
index 1a49d16..1a49d16 100644
--- a/contrib/ipfilter/lib/parse.c
+++ b/lib/parse.c
diff --git a/contrib/ipfilter/lib/portname.c b/lib/portname.c
index d8bf1d9..d8bf1d9 100644
--- a/contrib/ipfilter/lib/portname.c
+++ b/lib/portname.c
diff --git a/contrib/ipfilter/lib/portnum.c b/lib/portnum.c
index 4079f46..4079f46 100644
--- a/contrib/ipfilter/lib/portnum.c
+++ b/lib/portnum.c
diff --git a/contrib/ipfilter/lib/ports.c b/lib/ports.c
index 9a44e2c..9a44e2c 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 696fcd3..696fcd3 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 99f3e58..99f3e58 100644
--- a/contrib/ipfilter/lib/printactivenat.c
+++ b/lib/printactivenat.c
diff --git a/contrib/ipfilter/lib/printaps.c b/lib/printaps.c
index c0c36d4..c0c36d4 100644
--- a/contrib/ipfilter/lib/printaps.c
+++ b/lib/printaps.c
diff --git a/contrib/ipfilter/lib/printbuf.c b/lib/printbuf.c
index bc097e0..bc097e0 100644
--- a/contrib/ipfilter/lib/printbuf.c
+++ b/lib/printbuf.c
diff --git a/contrib/ipfilter/lib/printfr.c b/lib/printfr.c
index 0750694..0750694 100644
--- a/contrib/ipfilter/lib/printfr.c
+++ b/lib/printfr.c
diff --git a/contrib/ipfilter/lib/printfraginfo.c b/lib/printfraginfo.c
index 012df06..012df06 100644
--- a/contrib/ipfilter/lib/printfraginfo.c
+++ b/lib/printfraginfo.c
diff --git a/contrib/ipfilter/lib/printhash.c b/lib/printhash.c
index 8e7948b..8e7948b 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 1afe632..1afe632 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 d278c36..d278c36 100644
--- a/contrib/ipfilter/lib/printhashdata.c
+++ b/lib/printhashdata.c
diff --git a/contrib/ipfilter/lib/printhashnode.c b/lib/printhashnode.c
index 9b51af9..9b51af9 100644
--- a/contrib/ipfilter/lib/printhashnode.c
+++ b/lib/printhashnode.c
diff --git a/contrib/ipfilter/lib/printhostmap.c b/lib/printhostmap.c
index 92996ed..92996ed 100644
--- a/contrib/ipfilter/lib/printhostmap.c
+++ b/lib/printhostmap.c
diff --git a/contrib/ipfilter/lib/printhostmask.c b/lib/printhostmask.c
index 105fb20..105fb20 100644
--- a/contrib/ipfilter/lib/printhostmask.c
+++ b/lib/printhostmask.c
diff --git a/contrib/ipfilter/lib/printifname.c b/lib/printifname.c
index 1bfe27d..1bfe27d 100644
--- a/contrib/ipfilter/lib/printifname.c
+++ b/lib/printifname.c
diff --git a/contrib/ipfilter/lib/printip.c b/lib/printip.c
index fb91208..fb91208 100644
--- a/contrib/ipfilter/lib/printip.c
+++ b/lib/printip.c
diff --git a/contrib/ipfilter/lib/printlog.c b/lib/printlog.c
index 192c671..192c671 100644
--- a/contrib/ipfilter/lib/printlog.c
+++ b/lib/printlog.c
diff --git a/contrib/ipfilter/lib/printmask.c b/lib/printmask.c
index 27b3e6c..27b3e6c 100644
--- a/contrib/ipfilter/lib/printmask.c
+++ b/lib/printmask.c
diff --git a/contrib/ipfilter/lib/printnat.c b/lib/printnat.c
index 37666a2..37666a2 100644
--- a/contrib/ipfilter/lib/printnat.c
+++ b/lib/printnat.c
diff --git a/contrib/ipfilter/lib/printpacket.c b/lib/printpacket.c
index 6ee3679..6ee3679 100644
--- a/contrib/ipfilter/lib/printpacket.c
+++ b/lib/printpacket.c
diff --git a/contrib/ipfilter/lib/printpacket6.c b/lib/printpacket6.c
index 16c807d..16c807d 100644
--- a/contrib/ipfilter/lib/printpacket6.c
+++ b/lib/printpacket6.c
diff --git a/contrib/ipfilter/lib/printpool.c b/lib/printpool.c
index cfb1e78..cfb1e78 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 e228a39..e228a39 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 8d8e962..8d8e962 100644
--- a/contrib/ipfilter/lib/printpooldata.c
+++ b/lib/printpooldata.c
diff --git a/contrib/ipfilter/lib/printpoolnode.c b/lib/printpoolnode.c
index a53ee33..a53ee33 100644
--- a/contrib/ipfilter/lib/printpoolnode.c
+++ b/lib/printpoolnode.c
diff --git a/contrib/ipfilter/lib/printportcmp.c b/lib/printportcmp.c
index a820387..a820387 100644
--- a/contrib/ipfilter/lib/printportcmp.c
+++ b/lib/printportcmp.c
diff --git a/contrib/ipfilter/lib/printproto.c b/lib/printproto.c
index e65ec11..e65ec11 100644
--- a/contrib/ipfilter/lib/printproto.c
+++ b/lib/printproto.c
diff --git a/contrib/ipfilter/lib/printsbuf.c b/lib/printsbuf.c
index 81f5e0b..81f5e0b 100644
--- a/contrib/ipfilter/lib/printsbuf.c
+++ b/lib/printsbuf.c
diff --git a/contrib/ipfilter/lib/printstate.c b/lib/printstate.c
index fcf42d6..fcf42d6 100644
--- a/contrib/ipfilter/lib/printstate.c
+++ b/lib/printstate.c
diff --git a/contrib/ipfilter/lib/printtqtable.c b/lib/printtqtable.c
index 67adb53..67adb53 100644
--- a/contrib/ipfilter/lib/printtqtable.c
+++ b/lib/printtqtable.c
diff --git a/contrib/ipfilter/lib/printtunable.c b/lib/printtunable.c
index dcf9f85..dcf9f85 100644
--- a/contrib/ipfilter/lib/printtunable.c
+++ b/lib/printtunable.c
diff --git a/contrib/ipfilter/lib/ratoi.c b/lib/ratoi.c
index fb8552d..fb8552d 100644
--- a/contrib/ipfilter/lib/ratoi.c
+++ b/lib/ratoi.c
diff --git a/contrib/ipfilter/lib/ratoui.c b/lib/ratoui.c
index 191f87f..191f87f 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 55dab91..55dab91 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 d51f8ab..d51f8ab 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 19ab4c6..19ab4c6 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 ad04b23..ad04b23 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 ab9b82e..ab9b82e 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 1f0c3a8..1f0c3a8 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 67b7dad..67b7dad 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 bf2c284..bf2c284 100644
--- a/contrib/ipfilter/lib/tcpflags.c
+++ b/lib/tcpflags.c
diff --git a/contrib/ipfilter/lib/tcpoptnames.c b/lib/tcpoptnames.c
index 7c03736..7c03736 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 8f2c16f..8f2c16f 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 97c20b0..97c20b0 100644
--- a/contrib/ipfilter/lib/v6ionames.c
+++ b/lib/v6ionames.c
diff --git a/contrib/ipfilter/lib/v6optvalue.c b/lib/v6optvalue.c
index 6123fc2..6123fc2 100644
--- a/contrib/ipfilter/lib/v6optvalue.c
+++ b/lib/v6optvalue.c
diff --git a/contrib/ipfilter/lib/var.c b/lib/var.c
index 3d90a23..3d90a23 100644
--- a/contrib/ipfilter/lib/var.c
+++ b/lib/var.c
diff --git a/contrib/ipfilter/lib/verbose.c b/lib/verbose.c
index 4a856b0..4a856b0 100644
--- a/contrib/ipfilter/lib/verbose.c
+++ b/lib/verbose.c
diff --git a/contrib/ipfilter/linux.h b/linux.h
index 61fd821..61fd821 100644
--- a/contrib/ipfilter/linux.h
+++ b/linux.h
diff --git a/contrib/ipfilter/man/Makefile b/man/Makefile
index 3f12ccb..3f12ccb 100644
--- a/contrib/ipfilter/man/Makefile
+++ b/man/Makefile
diff --git a/contrib/ipfilter/man/ipf.1 b/man/ipf.1
index 5ea06fa..5ea06fa 100644
--- a/contrib/ipfilter/man/ipf.1
+++ b/man/ipf.1
diff --git a/contrib/ipfilter/man/ipf.4 b/man/ipf.4
index e2e5b5b..e2e5b5b 100644
--- a/contrib/ipfilter/man/ipf.4
+++ b/man/ipf.4
diff --git a/contrib/ipfilter/man/ipf.5 b/man/ipf.5
index 3fd9e94..3fd9e94 100644
--- a/contrib/ipfilter/man/ipf.5
+++ b/man/ipf.5
diff --git a/contrib/ipfilter/man/ipf.8 b/man/ipf.8
index a438415..a438415 100644
--- a/contrib/ipfilter/man/ipf.8
+++ b/man/ipf.8
diff --git a/contrib/ipfilter/man/ipfilter.4 b/man/ipfilter.4
index b2d2f2a..b2d2f2a 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 72534a7..72534a7 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 0bba0f4..0bba0f4 100644
--- a/contrib/ipfilter/man/ipfilter.5
+++ b/man/ipfilter.5
diff --git a/contrib/ipfilter/man/ipfs.8 b/man/ipfs.8
index d5bf460..d5bf460 100644
--- a/contrib/ipfilter/man/ipfs.8
+++ b/man/ipfs.8
diff --git a/contrib/ipfilter/man/ipfstat.8 b/man/ipfstat.8
index 95cf6f3..95cf6f3 100644
--- a/contrib/ipfilter/man/ipfstat.8
+++ b/man/ipfstat.8
diff --git a/contrib/ipfilter/man/ipftest.1 b/man/ipftest.1
index 5153687..5153687 100644
--- a/contrib/ipfilter/man/ipftest.1
+++ b/man/ipftest.1
diff --git a/contrib/ipfilter/man/ipl.4 b/man/ipl.4
index d8106cc..d8106cc 100644
--- a/contrib/ipfilter/man/ipl.4
+++ b/man/ipl.4
diff --git a/contrib/ipfilter/man/ipmon.5 b/man/ipmon.5
index 2e3eebd..2e3eebd 100644
--- a/contrib/ipfilter/man/ipmon.5
+++ b/man/ipmon.5
diff --git a/contrib/ipfilter/man/ipmon.8 b/man/ipmon.8
index 905a9c8..905a9c8 100644
--- a/contrib/ipfilter/man/ipmon.8
+++ b/man/ipmon.8
diff --git a/contrib/ipfilter/man/ipnat.1 b/man/ipnat.1
index f241415..f241415 100644
--- a/contrib/ipfilter/man/ipnat.1
+++ b/man/ipnat.1
diff --git a/contrib/ipfilter/man/ipnat.4 b/man/ipnat.4
index 54f55d3..54f55d3 100644
--- a/contrib/ipfilter/man/ipnat.4
+++ b/man/ipnat.4
diff --git a/contrib/ipfilter/man/ipnat.5 b/man/ipnat.5
index 2d76a46..2d76a46 100644
--- a/contrib/ipfilter/man/ipnat.5
+++ b/man/ipnat.5
diff --git a/contrib/ipfilter/man/ipnat.8 b/man/ipnat.8
index 683e8f1..683e8f1 100644
--- a/contrib/ipfilter/man/ipnat.8
+++ b/man/ipnat.8
diff --git a/contrib/ipfilter/man/ippool.5 b/man/ippool.5
index aeff3c8..aeff3c8 100644
--- a/contrib/ipfilter/man/ippool.5
+++ b/man/ippool.5
diff --git a/contrib/ipfilter/man/ippool.8 b/man/ippool.8
index e27cb92..e27cb92 100644
--- a/contrib/ipfilter/man/ippool.8
+++ b/man/ippool.8
diff --git a/contrib/ipfilter/man/ipscan.5 b/man/ipscan.5
index cc12ca3..cc12ca3 100644
--- a/contrib/ipfilter/man/ipscan.5
+++ b/man/ipscan.5
diff --git a/contrib/ipfilter/man/ipscan.8 b/man/ipscan.8
index 958c456..958c456 100644
--- a/contrib/ipfilter/man/ipscan.8
+++ b/man/ipscan.8
diff --git a/contrib/ipfilter/man/man.sed b/man/man.sed
index 0be8dab..0be8dab 100644
--- a/contrib/ipfilter/man/man.sed
+++ b/man/man.sed
diff --git a/contrib/ipfilter/man/mkfilters.1 b/man/mkfilters.1
index b5fd9dc..b5fd9dc 100644
--- a/contrib/ipfilter/man/mkfilters.1
+++ b/man/mkfilters.1
diff --git a/contrib/ipfilter/md5.c b/md5.c
index c46a957..c46a957 100644
--- a/contrib/ipfilter/md5.c
+++ b/md5.c
diff --git a/contrib/ipfilter/md5.h b/md5.h
index e67f5b1..e67f5b1 100644
--- a/contrib/ipfilter/md5.h
+++ b/md5.h
diff --git a/contrib/ipfilter/misc.c b/misc.c
index e39b98f..e39b98f 100644
--- a/contrib/ipfilter/misc.c
+++ b/misc.c
diff --git a/contrib/ipfilter/mkfilters b/mkfilters
index f0e6ff4..f0e6ff4 100644
--- a/contrib/ipfilter/mkfilters
+++ b/mkfilters
diff --git a/contrib/ipfilter/ml_ipl.c b/ml_ipl.c
index 4db9a9b..4db9a9b 100644
--- a/contrib/ipfilter/ml_ipl.c
+++ b/ml_ipl.c
diff --git a/contrib/ipfilter/mlf_ipl.c b/mlf_ipl.c
index b39a14d..b39a14d 100644
--- a/contrib/ipfilter/mlf_ipl.c
+++ b/mlf_ipl.c
diff --git a/contrib/ipfilter/mlf_rule.c b/mlf_rule.c
index c540ebd..c540ebd 100644
--- a/contrib/ipfilter/mlf_rule.c
+++ b/mlf_rule.c
diff --git a/contrib/ipfilter/mlfk_ipl.c b/mlfk_ipl.c
index 0f50fea..0f50fea 100644
--- a/contrib/ipfilter/mlfk_ipl.c
+++ b/mlfk_ipl.c
diff --git a/contrib/ipfilter/mlfk_rule.c b/mlfk_rule.c
index c175076..c175076 100644
--- a/contrib/ipfilter/mlfk_rule.c
+++ b/mlfk_rule.c
diff --git a/contrib/ipfilter/mlh_rule.c b/mlh_rule.c
index e71c7be..e71c7be 100644
--- a/contrib/ipfilter/mlh_rule.c
+++ b/mlh_rule.c
diff --git a/contrib/ipfilter/mli_ipl.c b/mli_ipl.c
index 235a5af..235a5af 100644
--- a/contrib/ipfilter/mli_ipl.c
+++ b/mli_ipl.c
diff --git a/contrib/ipfilter/mln_ipl.c b/mln_ipl.c
index b170940..b170940 100644
--- a/contrib/ipfilter/mln_ipl.c
+++ b/mln_ipl.c
diff --git a/contrib/ipfilter/mls_ipl.c b/mls_ipl.c
index 5a70ab9..5a70ab9 100644
--- a/contrib/ipfilter/mls_ipl.c
+++ b/mls_ipl.c
diff --git a/contrib/ipfilter/natparse.c b/natparse.c
index 7246234..7246234 100644
--- a/contrib/ipfilter/natparse.c
+++ b/natparse.c
diff --git a/contrib/ipfilter/net/.cvsignore b/net/.cvsignore
index 19f86f4..19f86f4 100644
--- a/contrib/ipfilter/net/.cvsignore
+++ b/net/.cvsignore
diff --git a/contrib/ipfilter/opt.c b/opt.c
index 825a5e3..825a5e3 100644
--- a/contrib/ipfilter/opt.c
+++ b/opt.c
diff --git a/contrib/ipfilter/opt_inet6.h b/opt_inet6.h
index 43e7657..43e7657 100644
--- a/contrib/ipfilter/opt_inet6.h
+++ b/opt_inet6.h
diff --git a/contrib/ipfilter/opts.h b/opts.h
index 655f9f0..655f9f0 100644
--- a/contrib/ipfilter/opts.h
+++ b/opts.h
diff --git a/contrib/ipfilter/parse.c b/parse.c
index 0d8a617..0d8a617 100644
--- a/contrib/ipfilter/parse.c
+++ b/parse.c
diff --git a/contrib/ipfilter/pcap-ipf.h b/pcap-ipf.h
index 2ad5b01..2ad5b01 100644
--- a/contrib/ipfilter/pcap-ipf.h
+++ b/pcap-ipf.h
diff --git a/contrib/ipfilter/pcap.h b/pcap.h
index aa24798..aa24798 100644
--- a/contrib/ipfilter/pcap.h
+++ b/pcap.h
diff --git a/contrib/ipfilter/perl/Ipfanaly.pl b/perl/Ipfanaly.pl
index 0fa7c17..0fa7c17 100644
--- a/contrib/ipfilter/perl/Ipfanaly.pl
+++ b/perl/Ipfanaly.pl
diff --git a/contrib/ipfilter/perl/Isbgraph b/perl/Isbgraph
index c68b672..c68b672 100644
--- a/contrib/ipfilter/perl/Isbgraph
+++ b/perl/Isbgraph
diff --git a/contrib/ipfilter/perl/LICENSE b/perl/LICENSE
index 4ae42df..4ae42df 100644
--- a/contrib/ipfilter/perl/LICENSE
+++ b/perl/LICENSE
diff --git a/contrib/ipfilter/perl/Services b/perl/Services
index 401fff0..401fff0 100644
--- a/contrib/ipfilter/perl/Services
+++ b/perl/Services
diff --git a/contrib/ipfilter/perl/ipf-mrtg.pl b/perl/ipf-mrtg.pl
index cce30ab..cce30ab 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 1a7bb3f..1a7bb3f 100644
--- a/contrib/ipfilter/perl/ipfmeta.pl
+++ b/perl/ipfmeta.pl
diff --git a/contrib/ipfilter/perl/logfilter.pl b/perl/logfilter.pl
index 6ebe401..6ebe401 100644
--- a/contrib/ipfilter/perl/logfilter.pl
+++ b/perl/logfilter.pl
diff --git a/contrib/ipfilter/perl/plog b/perl/plog
index 208c6ea..208c6ea 100644
--- a/contrib/ipfilter/perl/plog
+++ b/perl/plog
diff --git a/contrib/ipfilter/printnat.c b/printnat.c
index 5a12b32..5a12b32 100644
--- a/contrib/ipfilter/printnat.c
+++ b/printnat.c
diff --git a/contrib/ipfilter/printstate.c b/printstate.c
index 624493b..624493b 100644
--- a/contrib/ipfilter/printstate.c
+++ b/printstate.c
diff --git a/contrib/ipfilter/radix.c b/radix.c
index f9fc20c..f9fc20c 100644
--- a/contrib/ipfilter/radix.c
+++ b/radix.c
diff --git a/contrib/ipfilter/radix_ipf.h b/radix_ipf.h
index f9b0a30..f9b0a30 100644
--- a/contrib/ipfilter/radix_ipf.h
+++ b/radix_ipf.h
diff --git a/contrib/ipfilter/relay.c b/relay.c
index 6a67433..6a67433 100644
--- a/contrib/ipfilter/relay.c
+++ b/relay.c
diff --git a/contrib/ipfilter/rules/.cvsignore b/rules/.cvsignore
index 3e75765..3e75765 100644
--- a/contrib/ipfilter/rules/.cvsignore
+++ b/rules/.cvsignore
diff --git a/contrib/ipfilter/rules/BASIC.NAT b/rules/BASIC.NAT
index 213e338..213e338 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 d2bd60a..d2bd60a 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 46564f0..46564f0 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 ff93f49..ff93f49 100644
--- a/contrib/ipfilter/rules/example.1
+++ b/rules/example.1
diff --git a/contrib/ipfilter/rules/example.10 b/rules/example.10
index 560d1e6..560d1e6 100644
--- a/contrib/ipfilter/rules/example.10
+++ b/rules/example.10
diff --git a/contrib/ipfilter/rules/example.11 b/rules/example.11
index c6b4e7f..c6b4e7f 100644
--- a/contrib/ipfilter/rules/example.11
+++ b/rules/example.11
diff --git a/contrib/ipfilter/rules/example.12 b/rules/example.12
index c0ba1d3..c0ba1d3 100644
--- a/contrib/ipfilter/rules/example.12
+++ b/rules/example.12
diff --git a/contrib/ipfilter/rules/example.13 b/rules/example.13
index 854f07f..854f07f 100644
--- a/contrib/ipfilter/rules/example.13
+++ b/rules/example.13
diff --git a/contrib/ipfilter/rules/example.2 b/rules/example.2
index 4f81725..4f81725 100644
--- a/contrib/ipfilter/rules/example.2
+++ b/rules/example.2
diff --git a/contrib/ipfilter/rules/example.3 b/rules/example.3
index cd31f73..cd31f73 100644
--- a/contrib/ipfilter/rules/example.3
+++ b/rules/example.3
diff --git a/contrib/ipfilter/rules/example.4 b/rules/example.4
index 7918ec2..7918ec2 100644
--- a/contrib/ipfilter/rules/example.4
+++ b/rules/example.4
diff --git a/contrib/ipfilter/rules/example.5 b/rules/example.5
index 6d688b5..6d688b5 100644
--- a/contrib/ipfilter/rules/example.5
+++ b/rules/example.5
diff --git a/contrib/ipfilter/rules/example.6 b/rules/example.6
index d40f0f3..d40f0f3 100644
--- a/contrib/ipfilter/rules/example.6
+++ b/rules/example.6
diff --git a/contrib/ipfilter/rules/example.7 b/rules/example.7
index 062de98..062de98 100644
--- a/contrib/ipfilter/rules/example.7
+++ b/rules/example.7
diff --git a/contrib/ipfilter/rules/example.8 b/rules/example.8
index baa0258..baa0258 100644
--- a/contrib/ipfilter/rules/example.8
+++ b/rules/example.8
diff --git a/contrib/ipfilter/rules/example.9 b/rules/example.9
index daff203..daff203 100644
--- a/contrib/ipfilter/rules/example.9
+++ b/rules/example.9
diff --git a/contrib/ipfilter/rules/example.sr b/rules/example.sr
index c4c1994..c4c1994 100644
--- a/contrib/ipfilter/rules/example.sr
+++ b/rules/example.sr
diff --git a/contrib/ipfilter/rules/firewall b/rules/firewall
index 681a81d..681a81d 100644
--- a/contrib/ipfilter/rules/firewall
+++ b/rules/firewall
diff --git a/contrib/ipfilter/rules/ftp-proxy b/rules/ftp-proxy
index ad2f717..ad2f717 100644
--- a/contrib/ipfilter/rules/ftp-proxy
+++ b/rules/ftp-proxy
diff --git a/contrib/ipfilter/rules/ftppxy b/rules/ftppxy
index 2c42c52..2c42c52 100755
--- a/contrib/ipfilter/rules/ftppxy
+++ b/rules/ftppxy
diff --git a/contrib/ipfilter/rules/ip_rules b/rules/ip_rules
index 9850f16..9850f16 100644
--- a/contrib/ipfilter/rules/ip_rules
+++ b/rules/ip_rules
diff --git a/contrib/ipfilter/rules/ipmon.conf b/rules/ipmon.conf
index 47b0146..47b0146 100644
--- a/contrib/ipfilter/rules/ipmon.conf
+++ b/rules/ipmon.conf
diff --git a/contrib/ipfilter/rules/nat-setup b/rules/nat-setup
index b10e8f1..b10e8f1 100644
--- a/contrib/ipfilter/rules/nat-setup
+++ b/rules/nat-setup
diff --git a/contrib/ipfilter/rules/nat.eg b/rules/nat.eg
index 9c26754..9c26754 100644
--- a/contrib/ipfilter/rules/nat.eg
+++ b/rules/nat.eg
diff --git a/contrib/ipfilter/rules/pool.conf b/rules/pool.conf
index 285398d..285398d 100644
--- a/contrib/ipfilter/rules/pool.conf
+++ b/rules/pool.conf
diff --git a/contrib/ipfilter/rules/rules.sed b/rules/rules.sed
index 050d9b6..050d9b6 100644
--- a/contrib/ipfilter/rules/rules.sed
+++ b/rules/rules.sed
diff --git a/contrib/ipfilter/rules/server b/rules/server
index f2fb204..f2fb204 100644
--- a/contrib/ipfilter/rules/server
+++ b/rules/server
diff --git a/contrib/ipfilter/rules/tcpstate b/rules/tcpstate
index 339a25f..339a25f 100644
--- a/contrib/ipfilter/rules/tcpstate
+++ b/rules/tcpstate
diff --git a/contrib/ipfilter/samples/.cvsignore b/samples/.cvsignore
index 4d38251..4d38251 100644
--- a/contrib/ipfilter/samples/.cvsignore
+++ b/samples/.cvsignore
diff --git a/contrib/ipfilter/samples/Makefile b/samples/Makefile
index 47ab4a2..47ab4a2 100644
--- a/contrib/ipfilter/samples/Makefile
+++ b/samples/Makefile
diff --git a/contrib/ipfilter/samples/ipfilter-pb.gif b/samples/ipfilter-pb.gif
index afaefa8..afaefa8 100644
--- a/contrib/ipfilter/samples/ipfilter-pb.gif
+++ b/samples/ipfilter-pb.gif
diff --git a/contrib/ipfilter/samples/proxy.c b/samples/proxy.c
index f2063ec..f2063ec 100644
--- a/contrib/ipfilter/samples/proxy.c
+++ b/samples/proxy.c
diff --git a/contrib/ipfilter/samples/relay.c b/samples/relay.c
index 6b96fc4..6b96fc4 100644
--- a/contrib/ipfilter/samples/relay.c
+++ b/samples/relay.c
diff --git a/contrib/ipfilter/samples/userauth.c b/samples/userauth.c
index dbfeac6..dbfeac6 100644
--- a/contrib/ipfilter/samples/userauth.c
+++ b/samples/userauth.c
diff --git a/contrib/ipfilter/snoop.h b/snoop.h
index 8fa6f7e..8fa6f7e 100644
--- a/contrib/ipfilter/snoop.h
+++ b/snoop.h
diff --git a/contrib/ipfilter/solaris.c b/solaris.c
index aa139d3..aa139d3 100644
--- a/contrib/ipfilter/solaris.c
+++ b/solaris.c
diff --git a/contrib/ipfilter/test/.cvsignore b/test/.cvsignore
index 5825abc..5825abc 100644
--- a/contrib/ipfilter/test/.cvsignore
+++ b/test/.cvsignore
diff --git a/contrib/ipfilter/test/Makefile b/test/Makefile
index b0462f3..b0462f3 100644
--- a/contrib/ipfilter/test/Makefile
+++ b/test/Makefile
diff --git a/contrib/ipfilter/test/README.TXT b/test/README.TXT
index 0b62145..0b62145 100644
--- a/contrib/ipfilter/test/README.TXT
+++ b/test/README.TXT
diff --git a/contrib/ipfilter/test/bpftest b/test/bpftest
index b24c0f1..b24c0f1 100644
--- a/contrib/ipfilter/test/bpftest
+++ b/test/bpftest
diff --git a/contrib/ipfilter/test/dotest b/test/dotest
index 2989109..2989109 100644
--- a/contrib/ipfilter/test/dotest
+++ b/test/dotest
diff --git a/contrib/ipfilter/test/dotest6 b/test/dotest6
index d6db564..d6db564 100755
--- a/contrib/ipfilter/test/dotest6
+++ b/test/dotest6
diff --git a/contrib/ipfilter/test/expected/1 b/test/expected/1
index 93b7333..93b7333 100644
--- a/contrib/ipfilter/test/expected/1
+++ b/test/expected/1
diff --git a/contrib/ipfilter/test/expected/10 b/test/expected/10
index bc0d83e..bc0d83e 100644
--- a/contrib/ipfilter/test/expected/10
+++ b/test/expected/10
diff --git a/contrib/ipfilter/test/expected/11 b/test/expected/11
index eb00875..eb00875 100644
--- a/contrib/ipfilter/test/expected/11
+++ b/test/expected/11
diff --git a/contrib/ipfilter/test/expected/12 b/test/expected/12
index f94cf76..f94cf76 100644
--- a/contrib/ipfilter/test/expected/12
+++ b/test/expected/12
diff --git a/contrib/ipfilter/test/expected/14 b/test/expected/14
index d06d92b..d06d92b 100644
--- a/contrib/ipfilter/test/expected/14
+++ b/test/expected/14
diff --git a/contrib/ipfilter/test/expected/2 b/test/expected/2
index 03b71cd..03b71cd 100644
--- a/contrib/ipfilter/test/expected/2
+++ b/test/expected/2
diff --git a/contrib/ipfilter/test/expected/3 b/test/expected/3
index d06d92b..d06d92b 100644
--- a/contrib/ipfilter/test/expected/3
+++ b/test/expected/3
diff --git a/contrib/ipfilter/test/expected/4 b/test/expected/4
index d06d92b..d06d92b 100644
--- a/contrib/ipfilter/test/expected/4
+++ b/test/expected/4
diff --git a/contrib/ipfilter/test/expected/5 b/test/expected/5
index bc80580..bc80580 100644
--- a/contrib/ipfilter/test/expected/5
+++ b/test/expected/5
diff --git a/contrib/ipfilter/test/expected/6 b/test/expected/6
index bc80580..bc80580 100644
--- a/contrib/ipfilter/test/expected/6
+++ b/test/expected/6
diff --git a/contrib/ipfilter/test/expected/7 b/test/expected/7
index c53d6ea..c53d6ea 100644
--- a/contrib/ipfilter/test/expected/7
+++ b/test/expected/7
diff --git a/contrib/ipfilter/test/expected/8 b/test/expected/8
index 398058a..398058a 100644
--- a/contrib/ipfilter/test/expected/8
+++ b/test/expected/8
diff --git a/contrib/ipfilter/test/expected/9 b/test/expected/9
index a4572e6..a4572e6 100644
--- a/contrib/ipfilter/test/expected/9
+++ b/test/expected/9
diff --git a/contrib/ipfilter/test/expected/Makefile b/test/expected/Makefile
index bb91b8b..bb91b8b 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 85ce84c..85ce84c 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 76381a7..76381a7 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 e69de29..e69de29 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 86d9592..86d9592 100644
--- a/contrib/ipfilter/test/expected/f1
+++ b/test/expected/f1
diff --git a/contrib/ipfilter/test/expected/f10 b/test/expected/f10
index da6c312..da6c312 100644
--- a/contrib/ipfilter/test/expected/f10
+++ b/test/expected/f10
diff --git a/contrib/ipfilter/test/expected/f11 b/test/expected/f11
index c1eb060..c1eb060 100644
--- a/contrib/ipfilter/test/expected/f11
+++ b/test/expected/f11
diff --git a/contrib/ipfilter/test/expected/f12 b/test/expected/f12
index 094d8c0..094d8c0 100644
--- a/contrib/ipfilter/test/expected/f12
+++ b/test/expected/f12
diff --git a/contrib/ipfilter/test/expected/f13 b/test/expected/f13
index 99c0565..99c0565 100644
--- a/contrib/ipfilter/test/expected/f13
+++ b/test/expected/f13
diff --git a/contrib/ipfilter/test/expected/f14 b/test/expected/f14
index 1c6ed5c..1c6ed5c 100644
--- a/contrib/ipfilter/test/expected/f14
+++ b/test/expected/f14
diff --git a/contrib/ipfilter/test/expected/f15 b/test/expected/f15
index 9b31258..9b31258 100644
--- a/contrib/ipfilter/test/expected/f15
+++ b/test/expected/f15
diff --git a/contrib/ipfilter/test/expected/f16 b/test/expected/f16
index b6cb3fa..b6cb3fa 100644
--- a/contrib/ipfilter/test/expected/f16
+++ b/test/expected/f16
diff --git a/contrib/ipfilter/test/expected/f17 b/test/expected/f17
index c586e5b..c586e5b 100644
--- a/contrib/ipfilter/test/expected/f17
+++ b/test/expected/f17
diff --git a/contrib/ipfilter/test/expected/f18 b/test/expected/f18
index 801abd3..801abd3 100644
--- a/contrib/ipfilter/test/expected/f18
+++ b/test/expected/f18
diff --git a/contrib/ipfilter/test/expected/f19 b/test/expected/f19
index 5ee2e9d..5ee2e9d 100644
--- a/contrib/ipfilter/test/expected/f19
+++ b/test/expected/f19
diff --git a/contrib/ipfilter/test/expected/f2 b/test/expected/f2
index 7093a41..7093a41 100644
--- a/contrib/ipfilter/test/expected/f2
+++ b/test/expected/f2
diff --git a/contrib/ipfilter/test/expected/f20 b/test/expected/f20
index 86308a0..86308a0 100644
--- a/contrib/ipfilter/test/expected/f20
+++ b/test/expected/f20
diff --git a/contrib/ipfilter/test/expected/f24 b/test/expected/f24
index 801abd3..801abd3 100644
--- a/contrib/ipfilter/test/expected/f24
+++ b/test/expected/f24
diff --git a/contrib/ipfilter/test/expected/f3 b/test/expected/f3
index 5df3ac4..5df3ac4 100644
--- a/contrib/ipfilter/test/expected/f3
+++ b/test/expected/f3
diff --git a/contrib/ipfilter/test/expected/f4 b/test/expected/f4
index 5df3ac4..5df3ac4 100644
--- a/contrib/ipfilter/test/expected/f4
+++ b/test/expected/f4
diff --git a/contrib/ipfilter/test/expected/f5 b/test/expected/f5
index 36c7d40..36c7d40 100644
--- a/contrib/ipfilter/test/expected/f5
+++ b/test/expected/f5
diff --git a/contrib/ipfilter/test/expected/f6 b/test/expected/f6
index 36c7d40..36c7d40 100644
--- a/contrib/ipfilter/test/expected/f6
+++ b/test/expected/f6
diff --git a/contrib/ipfilter/test/expected/f7 b/test/expected/f7
index 7a4daed..7a4daed 100644
--- a/contrib/ipfilter/test/expected/f7
+++ b/test/expected/f7
diff --git a/contrib/ipfilter/test/expected/f8 b/test/expected/f8
index ad42ff2..ad42ff2 100644
--- a/contrib/ipfilter/test/expected/f8
+++ b/test/expected/f8
diff --git a/contrib/ipfilter/test/expected/f9 b/test/expected/f9
index cc5be68..cc5be68 100644
--- a/contrib/ipfilter/test/expected/f9
+++ b/test/expected/f9
diff --git a/contrib/ipfilter/test/expected/i1 b/test/expected/i1
index 74d0f30..74d0f30 100644
--- a/contrib/ipfilter/test/expected/i1
+++ b/test/expected/i1
diff --git a/contrib/ipfilter/test/expected/i10 b/test/expected/i10
index 9e0a5d5..9e0a5d5 100644
--- a/contrib/ipfilter/test/expected/i10
+++ b/test/expected/i10
diff --git a/contrib/ipfilter/test/expected/i11 b/test/expected/i11
index 154f31e..154f31e 100644
--- a/contrib/ipfilter/test/expected/i11
+++ b/test/expected/i11
diff --git a/contrib/ipfilter/test/expected/i12 b/test/expected/i12
index dadf597..dadf597 100644
--- a/contrib/ipfilter/test/expected/i12
+++ b/test/expected/i12
diff --git a/contrib/ipfilter/test/expected/i13 b/test/expected/i13
index 5c8d945..5c8d945 100644
--- a/contrib/ipfilter/test/expected/i13
+++ b/test/expected/i13
diff --git a/contrib/ipfilter/test/expected/i14 b/test/expected/i14
index 08ba19a..08ba19a 100644
--- a/contrib/ipfilter/test/expected/i14
+++ b/test/expected/i14
diff --git a/contrib/ipfilter/test/expected/i15 b/test/expected/i15
index 4974659..4974659 100644
--- a/contrib/ipfilter/test/expected/i15
+++ b/test/expected/i15
diff --git a/contrib/ipfilter/test/expected/i16 b/test/expected/i16
index c5b3cf3..c5b3cf3 100644
--- a/contrib/ipfilter/test/expected/i16
+++ b/test/expected/i16
diff --git a/contrib/ipfilter/test/expected/i17 b/test/expected/i17
index bcc4d2d..bcc4d2d 100644
--- a/contrib/ipfilter/test/expected/i17
+++ b/test/expected/i17
diff --git a/contrib/ipfilter/test/expected/i18 b/test/expected/i18
index 88fca47..88fca47 100644
--- a/contrib/ipfilter/test/expected/i18
+++ b/test/expected/i18
diff --git a/contrib/ipfilter/test/expected/i19 b/test/expected/i19
index 4ca19b5..4ca19b5 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 5d9c26c..5d9c26c 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 5ff18f4..5ff18f4 100644
--- a/contrib/ipfilter/test/expected/i2
+++ b/test/expected/i2
diff --git a/contrib/ipfilter/test/expected/i20 b/test/expected/i20
index 77eabdb..77eabdb 100644
--- a/contrib/ipfilter/test/expected/i20
+++ b/test/expected/i20
diff --git a/contrib/ipfilter/test/expected/i21 b/test/expected/i21
index d4d28da..d4d28da 100644
--- a/contrib/ipfilter/test/expected/i21
+++ b/test/expected/i21
diff --git a/contrib/ipfilter/test/expected/i3 b/test/expected/i3
index 6150c7e..6150c7e 100644
--- a/contrib/ipfilter/test/expected/i3
+++ b/test/expected/i3
diff --git a/contrib/ipfilter/test/expected/i4 b/test/expected/i4
index 4992455..4992455 100644
--- a/contrib/ipfilter/test/expected/i4
+++ b/test/expected/i4
diff --git a/contrib/ipfilter/test/expected/i5 b/test/expected/i5
index edf9865..edf9865 100644
--- a/contrib/ipfilter/test/expected/i5
+++ b/test/expected/i5
diff --git a/contrib/ipfilter/test/expected/i6 b/test/expected/i6
index e4b14c3..e4b14c3 100644
--- a/contrib/ipfilter/test/expected/i6
+++ b/test/expected/i6
diff --git a/contrib/ipfilter/test/expected/i7 b/test/expected/i7
index 309cd28..309cd28 100644
--- a/contrib/ipfilter/test/expected/i7
+++ b/test/expected/i7
diff --git a/contrib/ipfilter/test/expected/i8 b/test/expected/i8
index f033e6b..f033e6b 100644
--- a/contrib/ipfilter/test/expected/i8
+++ b/test/expected/i8
diff --git a/contrib/ipfilter/test/expected/i9 b/test/expected/i9
index b128f99..b128f99 100644
--- a/contrib/ipfilter/test/expected/i9
+++ b/test/expected/i9
diff --git a/contrib/ipfilter/test/expected/in1 b/test/expected/in1
index 03436b6..03436b6 100644
--- a/contrib/ipfilter/test/expected/in1
+++ b/test/expected/in1
diff --git a/contrib/ipfilter/test/expected/in2 b/test/expected/in2
index f1239b1..f1239b1 100644
--- a/contrib/ipfilter/test/expected/in2
+++ b/test/expected/in2
diff --git a/contrib/ipfilter/test/expected/in3 b/test/expected/in3
index b8a85bf..b8a85bf 100644
--- a/contrib/ipfilter/test/expected/in3
+++ b/test/expected/in3
diff --git a/contrib/ipfilter/test/expected/in4 b/test/expected/in4
index ac8dce1..ac8dce1 100644
--- a/contrib/ipfilter/test/expected/in4
+++ b/test/expected/in4
diff --git a/contrib/ipfilter/test/expected/in5 b/test/expected/in5
index e77de71..e77de71 100644
--- a/contrib/ipfilter/test/expected/in5
+++ b/test/expected/in5
diff --git a/contrib/ipfilter/test/expected/in6 b/test/expected/in6
index 05426e7..05426e7 100644
--- a/contrib/ipfilter/test/expected/in6
+++ b/test/expected/in6
diff --git a/contrib/ipfilter/test/expected/ip1 b/test/expected/ip1
index b04fa9d..b04fa9d 100644
--- a/contrib/ipfilter/test/expected/ip1
+++ b/test/expected/ip1
diff --git a/contrib/ipfilter/test/expected/ip2 b/test/expected/ip2
index 9b0ed2b..9b0ed2b 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 9fd5437..9fd5437 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 ba1581b..ba1581b 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 58cddec..58cddec 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 3133a7f..3133a7f 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 abc0e87..abc0e87 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 ba0de69..ba0de69 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 c060086..c060086 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 537f9bb..537f9bb 100644
--- a/contrib/ipfilter/test/expected/n1
+++ b/test/expected/n1
diff --git a/contrib/ipfilter/test/expected/n10 b/test/expected/n10
index ae541d1..ae541d1 100644
--- a/contrib/ipfilter/test/expected/n10
+++ b/test/expected/n10
diff --git a/contrib/ipfilter/test/expected/n11 b/test/expected/n11
index 5257a64..5257a64 100644
--- a/contrib/ipfilter/test/expected/n11
+++ b/test/expected/n11
diff --git a/contrib/ipfilter/test/expected/n12 b/test/expected/n12
index 0d5cefb..0d5cefb 100644
--- a/contrib/ipfilter/test/expected/n12
+++ b/test/expected/n12
diff --git a/contrib/ipfilter/test/expected/n13 b/test/expected/n13
index bfe2018..bfe2018 100644
--- a/contrib/ipfilter/test/expected/n13
+++ b/test/expected/n13
diff --git a/contrib/ipfilter/test/expected/n14 b/test/expected/n14
index 4669300..4669300 100644
--- a/contrib/ipfilter/test/expected/n14
+++ b/test/expected/n14
diff --git a/contrib/ipfilter/test/expected/n16 b/test/expected/n16
index da617d9..da617d9 100644
--- a/contrib/ipfilter/test/expected/n16
+++ b/test/expected/n16
diff --git a/contrib/ipfilter/test/expected/n2 b/test/expected/n2
index 827272e..827272e 100644
--- a/contrib/ipfilter/test/expected/n2
+++ b/test/expected/n2
diff --git a/contrib/ipfilter/test/expected/n3 b/test/expected/n3
index 0e019ae..0e019ae 100644
--- a/contrib/ipfilter/test/expected/n3
+++ b/test/expected/n3
diff --git a/contrib/ipfilter/test/expected/n4 b/test/expected/n4
index 863217c..863217c 100644
--- a/contrib/ipfilter/test/expected/n4
+++ b/test/expected/n4
diff --git a/contrib/ipfilter/test/expected/n5 b/test/expected/n5
index 0e578b6..0e578b6 100644
--- a/contrib/ipfilter/test/expected/n5
+++ b/test/expected/n5
diff --git a/contrib/ipfilter/test/expected/n6 b/test/expected/n6
index cbdad9f..cbdad9f 100644
--- a/contrib/ipfilter/test/expected/n6
+++ b/test/expected/n6
diff --git a/contrib/ipfilter/test/expected/n7 b/test/expected/n7
index eb23534..eb23534 100644
--- a/contrib/ipfilter/test/expected/n7
+++ b/test/expected/n7
diff --git a/contrib/ipfilter/test/expected/n8 b/test/expected/n8
index d3e061d..d3e061d 100644
--- a/contrib/ipfilter/test/expected/n8
+++ b/test/expected/n8
diff --git a/contrib/ipfilter/test/expected/n9 b/test/expected/n9
index 917105f..917105f 100644
--- a/contrib/ipfilter/test/expected/n9
+++ b/test/expected/n9
diff --git a/contrib/ipfilter/test/expected/ni1 b/test/expected/ni1
index d4e2de2..d4e2de2 100644
--- a/contrib/ipfilter/test/expected/ni1
+++ b/test/expected/ni1
diff --git a/contrib/ipfilter/test/expected/ni10 b/test/expected/ni10
index 3ee63fb..3ee63fb 100644
--- a/contrib/ipfilter/test/expected/ni10
+++ b/test/expected/ni10
diff --git a/contrib/ipfilter/test/expected/ni11 b/test/expected/ni11
index 88d6406..88d6406 100644
--- a/contrib/ipfilter/test/expected/ni11
+++ b/test/expected/ni11
diff --git a/contrib/ipfilter/test/expected/ni12 b/test/expected/ni12
index 7d24a49..7d24a49 100644
--- a/contrib/ipfilter/test/expected/ni12
+++ b/test/expected/ni12
diff --git a/contrib/ipfilter/test/expected/ni13 b/test/expected/ni13
index 897bef3..897bef3 100644
--- a/contrib/ipfilter/test/expected/ni13
+++ b/test/expected/ni13
diff --git a/contrib/ipfilter/test/expected/ni14 b/test/expected/ni14
index 5ad5a1b..5ad5a1b 100644
--- a/contrib/ipfilter/test/expected/ni14
+++ b/test/expected/ni14
diff --git a/contrib/ipfilter/test/expected/ni15 b/test/expected/ni15
index 3820d56..3820d56 100644
--- a/contrib/ipfilter/test/expected/ni15
+++ b/test/expected/ni15
diff --git a/contrib/ipfilter/test/expected/ni16 b/test/expected/ni16
index 2c34f5c..2c34f5c 100644
--- a/contrib/ipfilter/test/expected/ni16
+++ b/test/expected/ni16
diff --git a/contrib/ipfilter/test/expected/ni19 b/test/expected/ni19
index fa40771..fa40771 100644
--- a/contrib/ipfilter/test/expected/ni19
+++ b/test/expected/ni19
diff --git a/contrib/ipfilter/test/expected/ni2 b/test/expected/ni2
index e2a7eb8..e2a7eb8 100644
--- a/contrib/ipfilter/test/expected/ni2
+++ b/test/expected/ni2
diff --git a/contrib/ipfilter/test/expected/ni20 b/test/expected/ni20
index 6001a5a..6001a5a 100644
--- a/contrib/ipfilter/test/expected/ni20
+++ b/test/expected/ni20
diff --git a/contrib/ipfilter/test/expected/ni21 b/test/expected/ni21
index 349ae23..349ae23 100644
--- a/contrib/ipfilter/test/expected/ni21
+++ b/test/expected/ni21
diff --git a/contrib/ipfilter/test/expected/ni23 b/test/expected/ni23
index 24909b0..24909b0 100644
--- a/contrib/ipfilter/test/expected/ni23
+++ b/test/expected/ni23
diff --git a/contrib/ipfilter/test/expected/ni3 b/test/expected/ni3
index 107d5d9..107d5d9 100644
--- a/contrib/ipfilter/test/expected/ni3
+++ b/test/expected/ni3
diff --git a/contrib/ipfilter/test/expected/ni4 b/test/expected/ni4
index c9f7504..c9f7504 100644
--- a/contrib/ipfilter/test/expected/ni4
+++ b/test/expected/ni4
diff --git a/contrib/ipfilter/test/expected/ni5 b/test/expected/ni5
index e713cf2..e713cf2 100644
--- a/contrib/ipfilter/test/expected/ni5
+++ b/test/expected/ni5
diff --git a/contrib/ipfilter/test/expected/ni6 b/test/expected/ni6
index 0da034a..0da034a 100644
--- a/contrib/ipfilter/test/expected/ni6
+++ b/test/expected/ni6
diff --git a/contrib/ipfilter/test/expected/ni7 b/test/expected/ni7
index 38c39ab..38c39ab 100644
--- a/contrib/ipfilter/test/expected/ni7
+++ b/test/expected/ni7
diff --git a/contrib/ipfilter/test/expected/ni8 b/test/expected/ni8
index 689ccaa..689ccaa 100644
--- a/contrib/ipfilter/test/expected/ni8
+++ b/test/expected/ni8
diff --git a/contrib/ipfilter/test/expected/ni9 b/test/expected/ni9
index 1eb6fbc..1eb6fbc 100644
--- a/contrib/ipfilter/test/expected/ni9
+++ b/test/expected/ni9
diff --git a/contrib/ipfilter/test/expected/p1 b/test/expected/p1
index 9f02804..9f02804 100644
--- a/contrib/ipfilter/test/expected/p1
+++ b/test/expected/p1
diff --git a/contrib/ipfilter/test/expected/p2 b/test/expected/p2
index 67a7c3e..67a7c3e 100644
--- a/contrib/ipfilter/test/expected/p2
+++ b/test/expected/p2
diff --git a/contrib/ipfilter/test/expected/p3 b/test/expected/p3
index 94fde9e..94fde9e 100644
--- a/contrib/ipfilter/test/expected/p3
+++ b/test/expected/p3
diff --git a/contrib/ipfilter/test/expected/p5 b/test/expected/p5
index d8ea95c..d8ea95c 100644
--- a/contrib/ipfilter/test/expected/p5
+++ b/test/expected/p5
diff --git a/contrib/ipfilter/test/hextest b/test/hextest
index b7b0b2c..b7b0b2c 100644
--- a/contrib/ipfilter/test/hextest
+++ b/test/hextest
diff --git a/contrib/ipfilter/test/input/1 b/test/input/1
index 7c3ae8a..7c3ae8a 100644
--- a/contrib/ipfilter/test/input/1
+++ b/test/input/1
diff --git a/contrib/ipfilter/test/input/10 b/test/input/10
index 254cee7..254cee7 100644
--- a/contrib/ipfilter/test/input/10
+++ b/test/input/10
diff --git a/contrib/ipfilter/test/input/11 b/test/input/11
index 4eda58e..4eda58e 100644
--- a/contrib/ipfilter/test/input/11
+++ b/test/input/11
diff --git a/contrib/ipfilter/test/input/12 b/test/input/12
index 5d9c1de..5d9c1de 100644
--- a/contrib/ipfilter/test/input/12
+++ b/test/input/12
diff --git a/contrib/ipfilter/test/input/13 b/test/input/13
index 56ec16d..56ec16d 100644
--- a/contrib/ipfilter/test/input/13
+++ b/test/input/13
diff --git a/contrib/ipfilter/test/input/14 b/test/input/14
index 16a806f..16a806f 100644
--- a/contrib/ipfilter/test/input/14
+++ b/test/input/14
diff --git a/contrib/ipfilter/test/input/2 b/test/input/2
index d168af0..d168af0 100644
--- a/contrib/ipfilter/test/input/2
+++ b/test/input/2
diff --git a/contrib/ipfilter/test/input/3 b/test/input/3
index 16a806f..16a806f 100644
--- a/contrib/ipfilter/test/input/3
+++ b/test/input/3
diff --git a/contrib/ipfilter/test/input/4 b/test/input/4
index 2956d1b..2956d1b 100644
--- a/contrib/ipfilter/test/input/4
+++ b/test/input/4
diff --git a/contrib/ipfilter/test/input/5 b/test/input/5
index 41600c1..41600c1 100644
--- a/contrib/ipfilter/test/input/5
+++ b/test/input/5
diff --git a/contrib/ipfilter/test/input/6 b/test/input/6
index 21f0be3..21f0be3 100644
--- a/contrib/ipfilter/test/input/6
+++ b/test/input/6
diff --git a/contrib/ipfilter/test/input/7 b/test/input/7
index 2721af2..2721af2 100644
--- a/contrib/ipfilter/test/input/7
+++ b/test/input/7
diff --git a/contrib/ipfilter/test/input/8 b/test/input/8
index cace511..cace511 100644
--- a/contrib/ipfilter/test/input/8
+++ b/test/input/8
diff --git a/contrib/ipfilter/test/input/9 b/test/input/9
index 33f3be3..33f3be3 100644
--- a/contrib/ipfilter/test/input/9
+++ b/test/input/9
diff --git a/contrib/ipfilter/test/input/f1 b/test/input/f1
index 7c3ae8a..7c3ae8a 100644
--- a/contrib/ipfilter/test/input/f1
+++ b/test/input/f1
diff --git a/contrib/ipfilter/test/input/f10 b/test/input/f10
index 254cee7..254cee7 100644
--- a/contrib/ipfilter/test/input/f10
+++ b/test/input/f10
diff --git a/contrib/ipfilter/test/input/f11 b/test/input/f11
index d558150..d558150 100644
--- a/contrib/ipfilter/test/input/f11
+++ b/test/input/f11
diff --git a/contrib/ipfilter/test/input/f12 b/test/input/f12
index 52edde1..52edde1 100644
--- a/contrib/ipfilter/test/input/f12
+++ b/test/input/f12
diff --git a/contrib/ipfilter/test/input/f13 b/test/input/f13
index 77e537e..77e537e 100644
--- a/contrib/ipfilter/test/input/f13
+++ b/test/input/f13
diff --git a/contrib/ipfilter/test/input/f14 b/test/input/f14
index 16a806f..16a806f 100644
--- a/contrib/ipfilter/test/input/f14
+++ b/test/input/f14
diff --git a/contrib/ipfilter/test/input/f15 b/test/input/f15
index db547cb..db547cb 100644
--- a/contrib/ipfilter/test/input/f15
+++ b/test/input/f15
diff --git a/contrib/ipfilter/test/input/f16 b/test/input/f16
index a17f41f..a17f41f 100644
--- a/contrib/ipfilter/test/input/f16
+++ b/test/input/f16
diff --git a/contrib/ipfilter/test/input/f17 b/test/input/f17
index a0d44d7..a0d44d7 100644
--- a/contrib/ipfilter/test/input/f17
+++ b/test/input/f17
diff --git a/contrib/ipfilter/test/input/f18 b/test/input/f18
index 9ecbb7f..9ecbb7f 100644
--- a/contrib/ipfilter/test/input/f18
+++ b/test/input/f18
diff --git a/contrib/ipfilter/test/input/f19 b/test/input/f19
index 6cab988..6cab988 100644
--- a/contrib/ipfilter/test/input/f19
+++ b/test/input/f19
diff --git a/contrib/ipfilter/test/input/f2 b/test/input/f2
index f4e9d23..f4e9d23 100644
--- a/contrib/ipfilter/test/input/f2
+++ b/test/input/f2
diff --git a/contrib/ipfilter/test/input/f20 b/test/input/f20
index 605ba7c..605ba7c 100644
--- a/contrib/ipfilter/test/input/f20
+++ b/test/input/f20
diff --git a/contrib/ipfilter/test/input/f24 b/test/input/f24
index 1d06682..1d06682 100644
--- a/contrib/ipfilter/test/input/f24
+++ b/test/input/f24
diff --git a/contrib/ipfilter/test/input/f3 b/test/input/f3
index 16a806f..16a806f 100644
--- a/contrib/ipfilter/test/input/f3
+++ b/test/input/f3
diff --git a/contrib/ipfilter/test/input/f4 b/test/input/f4
index 2956d1b..2956d1b 100644
--- a/contrib/ipfilter/test/input/f4
+++ b/test/input/f4
diff --git a/contrib/ipfilter/test/input/f5 b/test/input/f5
index 41600c1..41600c1 100644
--- a/contrib/ipfilter/test/input/f5
+++ b/test/input/f5
diff --git a/contrib/ipfilter/test/input/f6 b/test/input/f6
index 21f0be3..21f0be3 100644
--- a/contrib/ipfilter/test/input/f6
+++ b/test/input/f6
diff --git a/contrib/ipfilter/test/input/f7 b/test/input/f7
index dbc9e33..dbc9e33 100644
--- a/contrib/ipfilter/test/input/f7
+++ b/test/input/f7
diff --git a/contrib/ipfilter/test/input/f8 b/test/input/f8
index cace511..cace511 100644
--- a/contrib/ipfilter/test/input/f8
+++ b/test/input/f8
diff --git a/contrib/ipfilter/test/input/f9 b/test/input/f9
index e64e299..e64e299 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 e69de29..e69de29 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 ef34eb5..ef34eb5 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 8cc2d17..8cc2d17 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 3f0fd30..3f0fd30 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 8cc2d17..8cc2d17 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 e8ad9f2..e8ad9f2 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 e46407c..e46407c 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 82efeac..82efeac 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 a59dbe3..a59dbe3 100644
--- a/contrib/ipfilter/test/input/l1
+++ b/test/input/l1
diff --git a/contrib/ipfilter/test/input/n1 b/test/input/n1
index 04b24ef..04b24ef 100644
--- a/contrib/ipfilter/test/input/n1
+++ b/test/input/n1
diff --git a/contrib/ipfilter/test/input/n10 b/test/input/n10
index 321ed0b..321ed0b 100644
--- a/contrib/ipfilter/test/input/n10
+++ b/test/input/n10
diff --git a/contrib/ipfilter/test/input/n11 b/test/input/n11
index 8712674..8712674 100644
--- a/contrib/ipfilter/test/input/n11
+++ b/test/input/n11
diff --git a/contrib/ipfilter/test/input/n12 b/test/input/n12
index fb4d76d..fb4d76d 100644
--- a/contrib/ipfilter/test/input/n12
+++ b/test/input/n12
diff --git a/contrib/ipfilter/test/input/n13 b/test/input/n13
index ac7bbbd..ac7bbbd 100644
--- a/contrib/ipfilter/test/input/n13
+++ b/test/input/n13
diff --git a/contrib/ipfilter/test/input/n14 b/test/input/n14
index 969eb1c..969eb1c 100644
--- a/contrib/ipfilter/test/input/n14
+++ b/test/input/n14
diff --git a/contrib/ipfilter/test/input/n16 b/test/input/n16
index 2e77e40..2e77e40 100644
--- a/contrib/ipfilter/test/input/n16
+++ b/test/input/n16
diff --git a/contrib/ipfilter/test/input/n2 b/test/input/n2
index 476f16e..476f16e 100644
--- a/contrib/ipfilter/test/input/n2
+++ b/test/input/n2
diff --git a/contrib/ipfilter/test/input/n3 b/test/input/n3
index deca317..deca317 100644
--- a/contrib/ipfilter/test/input/n3
+++ b/test/input/n3
diff --git a/contrib/ipfilter/test/input/n4 b/test/input/n4
index 1218ef9..1218ef9 100644
--- a/contrib/ipfilter/test/input/n4
+++ b/test/input/n4
diff --git a/contrib/ipfilter/test/input/n5 b/test/input/n5
index 579210b..579210b 100644
--- a/contrib/ipfilter/test/input/n5
+++ b/test/input/n5
diff --git a/contrib/ipfilter/test/input/n6 b/test/input/n6
index 8a0c924..8a0c924 100644
--- a/contrib/ipfilter/test/input/n6
+++ b/test/input/n6
diff --git a/contrib/ipfilter/test/input/n7 b/test/input/n7
index 79af901..79af901 100644
--- a/contrib/ipfilter/test/input/n7
+++ b/test/input/n7
diff --git a/contrib/ipfilter/test/input/n8 b/test/input/n8
index 1f5b213..1f5b213 100644
--- a/contrib/ipfilter/test/input/n8
+++ b/test/input/n8
diff --git a/contrib/ipfilter/test/input/n9 b/test/input/n9
index c4aada8..c4aada8 100644
--- a/contrib/ipfilter/test/input/n9
+++ b/test/input/n9
diff --git a/contrib/ipfilter/test/input/ni1 b/test/input/ni1
index fb6b0b6..fb6b0b6 100644
--- a/contrib/ipfilter/test/input/ni1
+++ b/test/input/ni1
diff --git a/contrib/ipfilter/test/input/ni10 b/test/input/ni10
index 48ac225..48ac225 100644
--- a/contrib/ipfilter/test/input/ni10
+++ b/test/input/ni10
diff --git a/contrib/ipfilter/test/input/ni11 b/test/input/ni11
index 788e603..788e603 100644
--- a/contrib/ipfilter/test/input/ni11
+++ b/test/input/ni11
diff --git a/contrib/ipfilter/test/input/ni12 b/test/input/ni12
index 788e603..788e603 100644
--- a/contrib/ipfilter/test/input/ni12
+++ b/test/input/ni12
diff --git a/contrib/ipfilter/test/input/ni13 b/test/input/ni13
index 77569ee..77569ee 100644
--- a/contrib/ipfilter/test/input/ni13
+++ b/test/input/ni13
diff --git a/contrib/ipfilter/test/input/ni14 b/test/input/ni14
index 6811321..6811321 100644
--- a/contrib/ipfilter/test/input/ni14
+++ b/test/input/ni14
diff --git a/contrib/ipfilter/test/input/ni15 b/test/input/ni15
index fb445bb..fb445bb 100644
--- a/contrib/ipfilter/test/input/ni15
+++ b/test/input/ni15
diff --git a/contrib/ipfilter/test/input/ni16 b/test/input/ni16
index 24bfcfc..24bfcfc 100644
--- a/contrib/ipfilter/test/input/ni16
+++ b/test/input/ni16
diff --git a/contrib/ipfilter/test/input/ni17 b/test/input/ni17
index f9dec94..f9dec94 100644
--- a/contrib/ipfilter/test/input/ni17
+++ b/test/input/ni17
diff --git a/contrib/ipfilter/test/input/ni19 b/test/input/ni19
index d95e68a..d95e68a 100644
--- a/contrib/ipfilter/test/input/ni19
+++ b/test/input/ni19
diff --git a/contrib/ipfilter/test/input/ni2 b/test/input/ni2
index 3045821..3045821 100644
--- a/contrib/ipfilter/test/input/ni2
+++ b/test/input/ni2
diff --git a/contrib/ipfilter/test/input/ni20 b/test/input/ni20
index 4c2b87e..4c2b87e 100644
--- a/contrib/ipfilter/test/input/ni20
+++ b/test/input/ni20
diff --git a/contrib/ipfilter/test/input/ni21 b/test/input/ni21
index daf741e..daf741e 100644
--- a/contrib/ipfilter/test/input/ni21
+++ b/test/input/ni21
diff --git a/contrib/ipfilter/test/input/ni23 b/test/input/ni23
index 938b7b8..938b7b8 100644
--- a/contrib/ipfilter/test/input/ni23
+++ b/test/input/ni23
diff --git a/contrib/ipfilter/test/input/ni3 b/test/input/ni3
index 66b22a6..66b22a6 100644
--- a/contrib/ipfilter/test/input/ni3
+++ b/test/input/ni3
diff --git a/contrib/ipfilter/test/input/ni4 b/test/input/ni4
index ad5575f..ad5575f 100644
--- a/contrib/ipfilter/test/input/ni4
+++ b/test/input/ni4
diff --git a/contrib/ipfilter/test/input/ni5 b/test/input/ni5
index c45be54..c45be54 100644
--- a/contrib/ipfilter/test/input/ni5
+++ b/test/input/ni5
diff --git a/contrib/ipfilter/test/input/ni6 b/test/input/ni6
index 70e80c0..70e80c0 100644
--- a/contrib/ipfilter/test/input/ni6
+++ b/test/input/ni6
diff --git a/contrib/ipfilter/test/input/ni7 b/test/input/ni7
index 30f247d..30f247d 100644
--- a/contrib/ipfilter/test/input/ni7
+++ b/test/input/ni7
diff --git a/contrib/ipfilter/test/input/ni8 b/test/input/ni8
index 788e603..788e603 100644
--- a/contrib/ipfilter/test/input/ni8
+++ b/test/input/ni8
diff --git a/contrib/ipfilter/test/input/ni9 b/test/input/ni9
index 788e603..788e603 100644
--- a/contrib/ipfilter/test/input/ni9
+++ b/test/input/ni9
diff --git a/contrib/ipfilter/test/input/p1 b/test/input/p1
index f6753fa..f6753fa 100644
--- a/contrib/ipfilter/test/input/p1
+++ b/test/input/p1
diff --git a/contrib/ipfilter/test/input/p2 b/test/input/p2
index f6753fa..f6753fa 100644
--- a/contrib/ipfilter/test/input/p2
+++ b/test/input/p2
diff --git a/contrib/ipfilter/test/input/p3 b/test/input/p3
index 4a6666b..4a6666b 100644
--- a/contrib/ipfilter/test/input/p3
+++ b/test/input/p3
diff --git a/contrib/ipfilter/test/input/p5 b/test/input/p5
index f6753fa..f6753fa 100644
--- a/contrib/ipfilter/test/input/p5
+++ b/test/input/p5
diff --git a/contrib/ipfilter/test/intest b/test/intest
index e94ca08..e94ca08 100755
--- a/contrib/ipfilter/test/intest
+++ b/test/intest
diff --git a/contrib/ipfilter/test/iptest b/test/iptest
index bb3ab5e..bb3ab5e 100644
--- a/contrib/ipfilter/test/iptest
+++ b/test/iptest
diff --git a/contrib/ipfilter/test/itest b/test/itest
index 8fefc63..8fefc63 100644
--- a/contrib/ipfilter/test/itest
+++ b/test/itest
diff --git a/contrib/ipfilter/test/logtest b/test/logtest
index 089f915..089f915 100755
--- a/contrib/ipfilter/test/logtest
+++ b/test/logtest
diff --git a/contrib/ipfilter/test/mhtest b/test/mhtest
index a4d48d6..a4d48d6 100755
--- a/contrib/ipfilter/test/mhtest
+++ b/test/mhtest
diff --git a/contrib/ipfilter/test/mtest b/test/mtest
index 2a3ed38..2a3ed38 100755
--- a/contrib/ipfilter/test/mtest
+++ b/test/mtest
diff --git a/contrib/ipfilter/test/natipftest b/test/natipftest
index 5776b42..5776b42 100755
--- a/contrib/ipfilter/test/natipftest
+++ b/test/natipftest
diff --git a/contrib/ipfilter/test/nattest b/test/nattest
index fece276..fece276 100755
--- a/contrib/ipfilter/test/nattest
+++ b/test/nattest
diff --git a/contrib/ipfilter/test/ptest b/test/ptest
index 7deccd3..7deccd3 100644
--- a/contrib/ipfilter/test/ptest
+++ b/test/ptest
diff --git a/contrib/ipfilter/test/regress/1 b/test/regress/1
index 6a2ede9..6a2ede9 100644
--- a/contrib/ipfilter/test/regress/1
+++ b/test/regress/1
diff --git a/contrib/ipfilter/test/regress/10 b/test/regress/10
index 3552983..3552983 100644
--- a/contrib/ipfilter/test/regress/10
+++ b/test/regress/10
diff --git a/contrib/ipfilter/test/regress/11 b/test/regress/11
index 0bf0a2a..0bf0a2a 100644
--- a/contrib/ipfilter/test/regress/11
+++ b/test/regress/11
diff --git a/contrib/ipfilter/test/regress/12 b/test/regress/12
index c29f839..c29f839 100644
--- a/contrib/ipfilter/test/regress/12
+++ b/test/regress/12
diff --git a/contrib/ipfilter/test/regress/13 b/test/regress/13
index f123e47..f123e47 100644
--- a/contrib/ipfilter/test/regress/13
+++ b/test/regress/13
diff --git a/contrib/ipfilter/test/regress/14 b/test/regress/14
index aa54af8..aa54af8 100644
--- a/contrib/ipfilter/test/regress/14
+++ b/test/regress/14
diff --git a/contrib/ipfilter/test/regress/2 b/test/regress/2
index e2f02a4..e2f02a4 100644
--- a/contrib/ipfilter/test/regress/2
+++ b/test/regress/2
diff --git a/contrib/ipfilter/test/regress/3 b/test/regress/3
index ee80729..ee80729 100644
--- a/contrib/ipfilter/test/regress/3
+++ b/test/regress/3
diff --git a/contrib/ipfilter/test/regress/4 b/test/regress/4
index bc8af2f..bc8af2f 100644
--- a/contrib/ipfilter/test/regress/4
+++ b/test/regress/4
diff --git a/contrib/ipfilter/test/regress/5 b/test/regress/5
index 998eabd..998eabd 100644
--- a/contrib/ipfilter/test/regress/5
+++ b/test/regress/5
diff --git a/contrib/ipfilter/test/regress/6 b/test/regress/6
index 291f09ad..291f09ad 100644
--- a/contrib/ipfilter/test/regress/6
+++ b/test/regress/6
diff --git a/contrib/ipfilter/test/regress/7 b/test/regress/7
index 6848a68..6848a68 100644
--- a/contrib/ipfilter/test/regress/7
+++ b/test/regress/7
diff --git a/contrib/ipfilter/test/regress/8 b/test/regress/8
index 0f28fd2..0f28fd2 100644
--- a/contrib/ipfilter/test/regress/8
+++ b/test/regress/8
diff --git a/contrib/ipfilter/test/regress/9 b/test/regress/9
index 17bc967..17bc967 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 2c80283..2c80283 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 5d83b77..5d83b77 100644
--- a/contrib/ipfilter/test/regress/bpf1
+++ b/test/regress/bpf1
diff --git a/contrib/ipfilter/test/regress/f1 b/test/regress/f1
index 6a2ede9..6a2ede9 100644
--- a/contrib/ipfilter/test/regress/f1
+++ b/test/regress/f1
diff --git a/contrib/ipfilter/test/regress/f10 b/test/regress/f10
index 3552983..3552983 100644
--- a/contrib/ipfilter/test/regress/f10
+++ b/test/regress/f10
diff --git a/contrib/ipfilter/test/regress/f11 b/test/regress/f11
index a71e528..a71e528 100644
--- a/contrib/ipfilter/test/regress/f11
+++ b/test/regress/f11
diff --git a/contrib/ipfilter/test/regress/f12 b/test/regress/f12
index c29f839..c29f839 100644
--- a/contrib/ipfilter/test/regress/f12
+++ b/test/regress/f12
diff --git a/contrib/ipfilter/test/regress/f13 b/test/regress/f13
index 8106419..8106419 100644
--- a/contrib/ipfilter/test/regress/f13
+++ b/test/regress/f13
diff --git a/contrib/ipfilter/test/regress/f14 b/test/regress/f14
index 06ab519..06ab519 100644
--- a/contrib/ipfilter/test/regress/f14
+++ b/test/regress/f14
diff --git a/contrib/ipfilter/test/regress/f15 b/test/regress/f15
index 16185e1..16185e1 100644
--- a/contrib/ipfilter/test/regress/f15
+++ b/test/regress/f15
diff --git a/contrib/ipfilter/test/regress/f16 b/test/regress/f16
index 920ad8c..920ad8c 100644
--- a/contrib/ipfilter/test/regress/f16
+++ b/test/regress/f16
diff --git a/contrib/ipfilter/test/regress/f17 b/test/regress/f17
index 9a75ae3..9a75ae3 100644
--- a/contrib/ipfilter/test/regress/f17
+++ b/test/regress/f17
diff --git a/contrib/ipfilter/test/regress/f18 b/test/regress/f18
index acba2b3..acba2b3 100644
--- a/contrib/ipfilter/test/regress/f18
+++ b/test/regress/f18
diff --git a/contrib/ipfilter/test/regress/f19 b/test/regress/f19
index d7770b8..d7770b8 100644
--- a/contrib/ipfilter/test/regress/f19
+++ b/test/regress/f19
diff --git a/contrib/ipfilter/test/regress/f2 b/test/regress/f2
index e2f02a4..e2f02a4 100644
--- a/contrib/ipfilter/test/regress/f2
+++ b/test/regress/f2
diff --git a/contrib/ipfilter/test/regress/f20 b/test/regress/f20
index 279523e..279523e 100644
--- a/contrib/ipfilter/test/regress/f20
+++ b/test/regress/f20
diff --git a/contrib/ipfilter/test/regress/f24 b/test/regress/f24
index 5cb3bab..5cb3bab 100644
--- a/contrib/ipfilter/test/regress/f24
+++ b/test/regress/f24
diff --git a/contrib/ipfilter/test/regress/f3 b/test/regress/f3
index ee80729..ee80729 100644
--- a/contrib/ipfilter/test/regress/f3
+++ b/test/regress/f3
diff --git a/contrib/ipfilter/test/regress/f4 b/test/regress/f4
index bc8af2f..bc8af2f 100644
--- a/contrib/ipfilter/test/regress/f4
+++ b/test/regress/f4
diff --git a/contrib/ipfilter/test/regress/f5 b/test/regress/f5
index 998eabd..998eabd 100644
--- a/contrib/ipfilter/test/regress/f5
+++ b/test/regress/f5
diff --git a/contrib/ipfilter/test/regress/f6 b/test/regress/f6
index 291f09ad..291f09ad 100644
--- a/contrib/ipfilter/test/regress/f6
+++ b/test/regress/f6
diff --git a/contrib/ipfilter/test/regress/f7 b/test/regress/f7
index be1b969..be1b969 100644
--- a/contrib/ipfilter/test/regress/f7
+++ b/test/regress/f7
diff --git a/contrib/ipfilter/test/regress/f8 b/test/regress/f8
index 0f28fd2..0f28fd2 100644
--- a/contrib/ipfilter/test/regress/f8
+++ b/test/regress/f8
diff --git a/contrib/ipfilter/test/regress/f9 b/test/regress/f9
index 17bc967..17bc967 100644
--- a/contrib/ipfilter/test/regress/f9
+++ b/test/regress/f9
diff --git a/contrib/ipfilter/test/regress/i1 b/test/regress/i1
index 0fd2c6e..0fd2c6e 100644
--- a/contrib/ipfilter/test/regress/i1
+++ b/test/regress/i1
diff --git a/contrib/ipfilter/test/regress/i10 b/test/regress/i10
index 640ac84..640ac84 100644
--- a/contrib/ipfilter/test/regress/i10
+++ b/test/regress/i10
diff --git a/contrib/ipfilter/test/regress/i11 b/test/regress/i11
index cb7d683..cb7d683 100644
--- a/contrib/ipfilter/test/regress/i11
+++ b/test/regress/i11
diff --git a/contrib/ipfilter/test/regress/i12 b/test/regress/i12
index 5342702..5342702 100644
--- a/contrib/ipfilter/test/regress/i12
+++ b/test/regress/i12
diff --git a/contrib/ipfilter/test/regress/i13 b/test/regress/i13
index 3ba343d..3ba343d 100644
--- a/contrib/ipfilter/test/regress/i13
+++ b/test/regress/i13
diff --git a/contrib/ipfilter/test/regress/i14 b/test/regress/i14
index 2cd2613..2cd2613 100644
--- a/contrib/ipfilter/test/regress/i14
+++ b/test/regress/i14
diff --git a/contrib/ipfilter/test/regress/i15 b/test/regress/i15
index 0e6b0d1..0e6b0d1 100644
--- a/contrib/ipfilter/test/regress/i15
+++ b/test/regress/i15
diff --git a/contrib/ipfilter/test/regress/i16 b/test/regress/i16
index 5c9144a..5c9144a 100644
--- a/contrib/ipfilter/test/regress/i16
+++ b/test/regress/i16
diff --git a/contrib/ipfilter/test/regress/i17 b/test/regress/i17
index e399248..e399248 100644
--- a/contrib/ipfilter/test/regress/i17
+++ b/test/regress/i17
diff --git a/contrib/ipfilter/test/regress/i18 b/test/regress/i18
index 03ce713..03ce713 100644
--- a/contrib/ipfilter/test/regress/i18
+++ b/test/regress/i18
diff --git a/contrib/ipfilter/test/regress/i19 b/test/regress/i19
index a09fd56..a09fd56 100644
--- a/contrib/ipfilter/test/regress/i19
+++ b/test/regress/i19
diff --git a/contrib/ipfilter/test/regress/i2 b/test/regress/i2
index 50f6107..50f6107 100644
--- a/contrib/ipfilter/test/regress/i2
+++ b/test/regress/i2
diff --git a/contrib/ipfilter/test/regress/i20 b/test/regress/i20
index 99039ee..99039ee 100644
--- a/contrib/ipfilter/test/regress/i20
+++ b/test/regress/i20
diff --git a/contrib/ipfilter/test/regress/i21 b/test/regress/i21
index 9d583ab..9d583ab 100644
--- a/contrib/ipfilter/test/regress/i21
+++ b/test/regress/i21
diff --git a/contrib/ipfilter/test/regress/i3 b/test/regress/i3
index 390fc3c..390fc3c 100644
--- a/contrib/ipfilter/test/regress/i3
+++ b/test/regress/i3
diff --git a/contrib/ipfilter/test/regress/i4 b/test/regress/i4
index 8551f76..8551f76 100644
--- a/contrib/ipfilter/test/regress/i4
+++ b/test/regress/i4
diff --git a/contrib/ipfilter/test/regress/i5 b/test/regress/i5
index 788f971..788f971 100644
--- a/contrib/ipfilter/test/regress/i5
+++ b/test/regress/i5
diff --git a/contrib/ipfilter/test/regress/i6 b/test/regress/i6
index 0b371bd..0b371bd 100644
--- a/contrib/ipfilter/test/regress/i6
+++ b/test/regress/i6
diff --git a/contrib/ipfilter/test/regress/i7 b/test/regress/i7
index 1a82940..1a82940 100644
--- a/contrib/ipfilter/test/regress/i7
+++ b/test/regress/i7
diff --git a/contrib/ipfilter/test/regress/i8 b/test/regress/i8
index c30f8bd..c30f8bd 100644
--- a/contrib/ipfilter/test/regress/i8
+++ b/test/regress/i8
diff --git a/contrib/ipfilter/test/regress/i9 b/test/regress/i9
index 441cfa9..441cfa9 100644
--- a/contrib/ipfilter/test/regress/i9
+++ b/test/regress/i9
diff --git a/contrib/ipfilter/test/regress/in1 b/test/regress/in1
index d5d0cf4..d5d0cf4 100644
--- a/contrib/ipfilter/test/regress/in1
+++ b/test/regress/in1
diff --git a/contrib/ipfilter/test/regress/in2 b/test/regress/in2
index 83a2ca5..83a2ca5 100644
--- a/contrib/ipfilter/test/regress/in2
+++ b/test/regress/in2
diff --git a/contrib/ipfilter/test/regress/in3 b/test/regress/in3
index d8016b6..d8016b6 100644
--- a/contrib/ipfilter/test/regress/in3
+++ b/test/regress/in3
diff --git a/contrib/ipfilter/test/regress/in4 b/test/regress/in4
index 46bbd81..46bbd81 100644
--- a/contrib/ipfilter/test/regress/in4
+++ b/test/regress/in4
diff --git a/contrib/ipfilter/test/regress/in5 b/test/regress/in5
index 766c3e3..766c3e3 100644
--- a/contrib/ipfilter/test/regress/in5
+++ b/test/regress/in5
diff --git a/contrib/ipfilter/test/regress/in6 b/test/regress/in6
index 70e71dd..70e71dd 100644
--- a/contrib/ipfilter/test/regress/in6
+++ b/test/regress/in6
diff --git a/contrib/ipfilter/test/regress/ip1 b/test/regress/ip1
index c31ba25..c31ba25 100644
--- a/contrib/ipfilter/test/regress/ip1
+++ b/test/regress/ip1
diff --git a/contrib/ipfilter/test/regress/ip2 b/test/regress/ip2
index 76f31b6..76f31b6 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 814dfd6..814dfd6 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 fc532b6..fc532b6 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 814dfd6..814dfd6 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 6dc9e93..6dc9e93 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 ba8cabb..ba8cabb 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 f1f904b..f1f904b 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 88cca58..88cca58 100644
--- a/contrib/ipfilter/test/regress/l1
+++ b/test/regress/l1
diff --git a/contrib/ipfilter/test/regress/n1 b/test/regress/n1
index 9bcf29b..9bcf29b 100644
--- a/contrib/ipfilter/test/regress/n1
+++ b/test/regress/n1
diff --git a/contrib/ipfilter/test/regress/n10 b/test/regress/n10
index 0f48192..0f48192 100644
--- a/contrib/ipfilter/test/regress/n10
+++ b/test/regress/n10
diff --git a/contrib/ipfilter/test/regress/n11 b/test/regress/n11
index 8cdf7fc..8cdf7fc 100644
--- a/contrib/ipfilter/test/regress/n11
+++ b/test/regress/n11
diff --git a/contrib/ipfilter/test/regress/n12 b/test/regress/n12
index 225675b..225675b 100644
--- a/contrib/ipfilter/test/regress/n12
+++ b/test/regress/n12
diff --git a/contrib/ipfilter/test/regress/n13 b/test/regress/n13
index 8047930..8047930 100644
--- a/contrib/ipfilter/test/regress/n13
+++ b/test/regress/n13
diff --git a/contrib/ipfilter/test/regress/n14 b/test/regress/n14
index 6f5d571..6f5d571 100644
--- a/contrib/ipfilter/test/regress/n14
+++ b/test/regress/n14
diff --git a/contrib/ipfilter/test/regress/n16 b/test/regress/n16
index ff8958c..ff8958c 100644
--- a/contrib/ipfilter/test/regress/n16
+++ b/test/regress/n16
diff --git a/contrib/ipfilter/test/regress/n2 b/test/regress/n2
index dbce5aa..dbce5aa 100644
--- a/contrib/ipfilter/test/regress/n2
+++ b/test/regress/n2
diff --git a/contrib/ipfilter/test/regress/n3 b/test/regress/n3
index 82c83dd..82c83dd 100644
--- a/contrib/ipfilter/test/regress/n3
+++ b/test/regress/n3
diff --git a/contrib/ipfilter/test/regress/n4 b/test/regress/n4
index e7c0314..e7c0314 100644
--- a/contrib/ipfilter/test/regress/n4
+++ b/test/regress/n4
diff --git a/contrib/ipfilter/test/regress/n5 b/test/regress/n5
index e55cea0..e55cea0 100644
--- a/contrib/ipfilter/test/regress/n5
+++ b/test/regress/n5
diff --git a/contrib/ipfilter/test/regress/n6 b/test/regress/n6
index 79f11a4..79f11a4 100644
--- a/contrib/ipfilter/test/regress/n6
+++ b/test/regress/n6
diff --git a/contrib/ipfilter/test/regress/n7 b/test/regress/n7
index be995c2..be995c2 100644
--- a/contrib/ipfilter/test/regress/n7
+++ b/test/regress/n7
diff --git a/contrib/ipfilter/test/regress/n8 b/test/regress/n8
index bf0e94f..bf0e94f 100644
--- a/contrib/ipfilter/test/regress/n8
+++ b/test/regress/n8
diff --git a/contrib/ipfilter/test/regress/n9 b/test/regress/n9
index 81a7ccd..81a7ccd 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 c7e5797..c7e5797 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 f38e435..f38e435 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 4151b6e..4151b6e 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 2a04ef7..2a04ef7 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 4151b6e..4151b6e 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 1d0018c..1d0018c 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 4151b6e..4151b6e 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 8c36bc8..8c36bc8 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 04b6d13..04b6d13 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 7a879d8..7a879d8 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 04b6d13..04b6d13 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 c546e99..c546e99 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 1b9a013..1b9a013 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 420c7b7..420c7b7 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 1b9a013..1b9a013 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 5fad3cd..5fad3cd 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 3da6338..3da6338 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 c6fcec1..c6fcec1 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 56b81a9..56b81a9 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 5956cf9..5956cf9 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 4ad73c2..4ad73c2 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 c6f6d84..c6f6d84 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 f2dd0a7..f2dd0a7 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 6d6ed08..6d6ed08 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 6b2d46a..6b2d46a 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 49ebcf7..49ebcf7 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 094d377..094d377 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 c7e5797..c7e5797 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 4306f4b..4306f4b 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 c7e5797..c7e5797 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 6eefdc2..6eefdc2 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 8f11424..8f11424 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 8e80d22..8e80d22 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 f5b83b2..f5b83b2 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 00d57d0..00d57d0 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 4151b6e..4151b6e 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 2a04ef7..2a04ef7 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 6666241..6666241 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 1d0018c..1d0018c 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 6666241..6666241 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 8c36bc8..8c36bc8 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 acaf639..acaf639 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 14ae3a3..14ae3a3 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 4cfb388..4cfb388 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 aad7cb3..aad7cb3 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 3fadd59..3fadd59 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 ada9f56..ada9f56 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 9a8eaa3..9a8eaa3 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 e69de29..e69de29 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 dfc3f35..dfc3f35 100644
--- a/contrib/ipfilter/test/test.format
+++ b/test/test.format
diff --git a/contrib/ipfilter/test/test.sed b/test/test.sed
index 3ce0cb1..3ce0cb1 100644
--- a/contrib/ipfilter/test/test.sed
+++ b/test/test.sed
diff --git a/contrib/ipfilter/test/vfycksum.pl b/test/vfycksum.pl
index b3a20be..b3a20be 100755
--- a/contrib/ipfilter/test/vfycksum.pl
+++ b/test/vfycksum.pl
diff --git a/contrib/ipfilter/todo b/todo
index 5b2c059..5b2c059 100644
--- a/contrib/ipfilter/todo
+++ b/todo
diff --git a/contrib/ipfilter/tools/BNF.ipf b/tools/BNF.ipf
index 0e84332..0e84332 100644
--- a/contrib/ipfilter/tools/BNF.ipf
+++ b/tools/BNF.ipf
diff --git a/contrib/ipfilter/tools/BNF.ipnat b/tools/BNF.ipnat
index 69ed8a2..69ed8a2 100644
--- a/contrib/ipfilter/tools/BNF.ipnat
+++ b/tools/BNF.ipnat
diff --git a/contrib/ipfilter/tools/Makefile b/tools/Makefile
index 43ec1a8..43ec1a8 100644
--- a/contrib/ipfilter/tools/Makefile
+++ b/tools/Makefile
diff --git a/contrib/ipfilter/tools/ipf.c b/tools/ipf.c
index 063ecf0..063ecf0 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 4156250..4156250 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 aa25c77..aa25c77 100644
--- a/contrib/ipfilter/tools/ipfcomp.c
+++ b/tools/ipfcomp.c
diff --git a/contrib/ipfilter/tools/ipfs.c b/tools/ipfs.c
index 3acb5d4..3acb5d4 100644
--- a/contrib/ipfilter/tools/ipfs.c
+++ b/tools/ipfs.c
diff --git a/contrib/ipfilter/tools/ipfstat.c b/tools/ipfstat.c
index e28fe4c..e28fe4c 100644
--- a/contrib/ipfilter/tools/ipfstat.c
+++ b/tools/ipfstat.c
diff --git a/contrib/ipfilter/tools/ipftest.c b/tools/ipftest.c
index 8343b2c..8343b2c 100644
--- a/contrib/ipfilter/tools/ipftest.c
+++ b/tools/ipftest.c
diff --git a/contrib/ipfilter/tools/ipmon.c b/tools/ipmon.c
index f07396d..f07396d 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 bc3ec6d..bc3ec6d 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 038df6d..038df6d 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 6208c98..6208c98 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 cbdfd69..cbdfd69 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 4aa5108..4aa5108 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 5d7e7e6..5d7e7e6 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 fc79abb..fc79abb 100644
--- a/contrib/ipfilter/tools/ipsyncm.c
+++ b/tools/ipsyncm.c
diff --git a/contrib/ipfilter/tools/ipsyncs.c b/tools/ipsyncs.c
index 3a8270f..3a8270f 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 a6f9cf6..a6f9cf6 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 1ad00c4..1ad00c4 100644
--- a/contrib/ipfilter/tools/lexer.c
+++ b/tools/lexer.c
diff --git a/contrib/ipfilter/tools/lexer.h b/tools/lexer.h
index b838d41..b838d41 100644
--- a/contrib/ipfilter/tools/lexer.h
+++ b/tools/lexer.h