import ipfilter 4.1.8 into the vendor branch

5 files changed, 28 insertions, 12 deletions

diff --git a/contrib/ipfilter/FreeBSD/files.diffs b/contrib/ipfilter/FreeBSD/files.diffs
index 84893d4..2f028e3 100644
--- a/contrib/ipfilter/FreeBSD/files.diffs
+++ b/contrib/ipfilter/FreeBSD/files.diffs
@@ -2,7 +2,7 @@
 --- files	Sun Jan 14 14:32:25 1996
 ***************
 *** 208,213 ****
---- 208,221 ----
+--- 208,225 ----
   netinet/tcp_timer.c	optional inet
   netinet/tcp_usrreq.c	optional inet
   netinet/udp_usrreq.c	optional inet
@@ -14,6 +14,10 @@
 + netinet/ip_auth.c	optional ipfilter inet
 + netinet/ip_proxy.c	optional ipfilter inet
 + netinet/ip_log.c	optional ipfilter inet
++ netinet/ip_scan.c	optional ipfilter inet
++ netinet/ip_sync.c	optional ipfilter inet
++ netinet/ip_pool.c	optional ipfilter_pool ipfilter inet
++ netinet/ip_rules.c	optional ipfilter_compiled ipfilter inet
   netiso/clnp_debug.c	optional iso
   netiso/clnp_er.c	optional iso
   netiso/clnp_frag.c	optional iso
diff --git a/contrib/ipfilter/FreeBSD/files.newconf.diffs b/contrib/ipfilter/FreeBSD/files.newconf.diffs
index cc7cf41..29aea54 100644
--- a/contrib/ipfilter/FreeBSD/files.newconf.diffs
+++ b/contrib/ipfilter/FreeBSD/files.newconf.diffs
@@ -2,7 +2,7 @@
 --- files.newconf	Sun Jun 25 02:19:10 1995
 ***************
 *** 161,166 ****
---- 161,174 ----
+--- 161,178 ----
   file	netinet/ip_input.c	inet
   file	netinet/ip_mroute.c	inet
   file	netinet/ip_output.c	inet
@@ -14,6 +14,10 @@
 + file	netinet/ip_proxy.c	ipfilter
 + file	netinet/ip_auth.c	ipfilter
 + file	netinet/ip_log.c	ipfilter
++ file	netinet/ip_scan.c	ipfilter
++ file	netinet/ip_sync.c	ipfilter
++ file	netinet/ip_pool.c	ipfilter_pool
++ file	netinet/ip_rules.c	ipfilter_compiled
   file	netinet/raw_ip.c	inet
   file	netinet/tcp_debug.c	inet
   file	netinet/tcp_input.c	inet
diff --git a/contrib/ipfilter/FreeBSD/files.oldconf.diffs b/contrib/ipfilter/FreeBSD/files.oldconf.diffs
index 55b526f..ed8aff9 100644
--- a/contrib/ipfilter/FreeBSD/files.oldconf.diffs
+++ b/contrib/ipfilter/FreeBSD/files.oldconf.diffs
@@ -2,7 +2,7 @@
 --- files.oldconf	Sun Apr 23 17:54:18 1995
 ***************
 *** 180,185 ****
---- 180,193 ----
+--- 180,197 ----
   netinet/tcp_timer.c	optional inet
   netinet/tcp_usrreq.c	optional inet
   netinet/udp_usrreq.c	optional inet
@@ -14,6 +14,10 @@
 + netinet/ip_proxy.c	optional ipfilter requires inet
 + netinet/ip_auth.c	optional ipfilter requires inet
 + netinet/ip_log.c	optional ipfilter requires inet
++ netinet/ip_scan.c	optional ipfilter requires inet
++ netinet/ip_sync.c	optional ipfilter requires inet
++ netinet/ip_pool.c	optional ipfilter_pool requires ipfilter
++ netinet/ip_rules.c	optional ipfilter_compiled requires ipfilter
   netiso/clnp_debug.c	optional iso
   netiso/clnp_er.c	optional iso
   netiso/clnp_frag.c	optional iso
diff --git a/contrib/ipfilter/FreeBSD/filez.diffs b/contrib/ipfilter/FreeBSD/filez.diffs
index 52492e8..9656006 100644
--- a/contrib/ipfilter/FreeBSD/filez.diffs
+++ b/contrib/ipfilter/FreeBSD/filez.diffs
@@ -9,11 +9,15 @@
 + file netinet/ip_fil.c		ipfilter
 + file netinet/fil.c		ipfilter
 + file netinet/ip_nat.c		ipfilter
-+ file netinet/ip_frag.c		ipfilter
-+ file netinet/ip_state.c		ipfilter
-+ file netinet/ip_proxy.c		ipfilter
-+ file netinet/ip_auth.c		ipfilter
++ file netinet/ip_frag.c	ipfilter
++ file netinet/ip_state.c	ipfilter
++ file netinet/ip_proxy.c	ipfilter
++ file netinet/ip_auth.c	ipfilter
 + file netinet/ip_log.c		ipfilter
++ file netinet/ip_scan.c	ipfilter
++ file netinet/ip_sync.c	ipfilter
++ file netinet/ip_pool.c	ipfilter_pool
++ file netinet/ip_rules.c	ipfilter_compiled
   file netiso/clnp_debug.c	iso
   file netiso/clnp_er.c	 	iso
   file netiso/clnp_frag.c	 	iso
diff --git a/contrib/ipfilter/FreeBSD/kinstall b/contrib/ipfilter/FreeBSD/kinstall
index ef2db54..2b67b9a 100755
--- a/contrib/ipfilter/FreeBSD/kinstall
+++ b/contrib/ipfilter/FreeBSD/kinstall
@@ -8,17 +8,17 @@ set confdir="$archdir/conf"
 
 if ( $dir =~ */FreeBSD ) cd ..
 echo -n "Installing "
-foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \
-	   ip_proxy.[ch] ip_auth.[ch] ip_*_pxy.c ip_compat.h ip_log.c)
+foreach i (ip_{auth,fil,frag,nat,pool,proxy,scan,state,sync}.[ch] fil.c \
+	   ip_*_pxy.c ip_compat.h ip_log.c )
 	echo -n "$i ";
 	cp $i /sys/netinet
 	chmod 644 /sys/netinet/$i
-	switch ( $i )
+	switch ($i)
 	case *.h:
 		/bin/cp $i /usr/include/netinet/$i
 		chmod 644 /usr/include/netinet/$i
-		breaksw
-	endsw
+		breaksw 
+	endsw   
 end
 echo ""
 grep iplopen $archdir/$karch/conf.c >& /dev/null