[src/trunk]: src/usr.sbin/ipf Update for IP Filter 3.4.1

[veego <veego%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8b7021828b33
branches:  trunk
changeset: 485698:8b7021828b33
user:      veego <veego%NetBSD.org@localhost>
date:      Wed May 03 11:40:53 2000 +0000

description:
Update for IP Filter 3.4.1

diffstat:

 usr.sbin/ipf/Makefile          |  4 ++--
 usr.sbin/ipf/Makefile.inc      |  3 ++-
 usr.sbin/ipf/ipf/Makefile      |  4 ++--
 usr.sbin/ipf/ipfs/Makefile     |  6 ++++++
 usr.sbin/ipf/ipfstat/Makefile  |  4 ++--
 usr.sbin/ipf/ipftest/Makefile  |  7 +++++--
 usr.sbin/ipf/ipnat/Makefile    |  4 ++--
 usr.sbin/ipf/ipresend/Makefile |  5 +++--
 usr.sbin/ipf/ipsend/Makefile   |  4 ++--
 usr.sbin/ipf/iptest/Makefile   |  4 ++--
 10 files changed, 28 insertions(+), 17 deletions(-)

diffs (128 lines):

diff -r 403eec3d8903 -r 8b7021828b33 usr.sbin/ipf/Makefile
--- a/usr.sbin/ipf/Makefile     Wed May 03 11:40:15 2000 +0000
+++ b/usr.sbin/ipf/Makefile     Wed May 03 11:40:53 2000 +0000
@@ -1,5 +1,5 @@
-#      $NetBSD: Makefile,v 1.6 1997/11/23 23:14:34 veego Exp $
+#      $NetBSD: Makefile,v 1.7 2000/05/03 11:40:53 veego Exp $
 
-SUBDIR=        ipf ipfstat ipftest ipmon ipnat ipresend ipsend iptest rules
+SUBDIR=        ipf ipfstat ipfs ipftest ipmon ipnat ipresend ipsend iptest rules
 
 .include <bsd.subdir.mk>
diff -r 403eec3d8903 -r 8b7021828b33 usr.sbin/ipf/Makefile.inc
--- a/usr.sbin/ipf/Makefile.inc Wed May 03 11:40:15 2000 +0000
+++ b/usr.sbin/ipf/Makefile.inc Wed May 03 11:40:53 2000 +0000
@@ -1,6 +1,7 @@
-#      $NetBSD: Makefile.inc,v 1.6 1999/12/12 11:29:55 veego Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2000/05/03 11:40:54 veego Exp $
 
 CPPFLAGS+=-I${.CURDIR}/../../../sys -I${.CURDIR}/../../../sys/netinet
+CPPFLAGS+=-DUSE_INET6
 
 .PATH: ${.CURDIR}/../../../dist/ipf \
        ${.CURDIR}/../../../dist/ipf/man
diff -r 403eec3d8903 -r 8b7021828b33 usr.sbin/ipf/ipf/Makefile
--- a/usr.sbin/ipf/ipf/Makefile Wed May 03 11:40:15 2000 +0000
+++ b/usr.sbin/ipf/ipf/Makefile Wed May 03 11:40:53 2000 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.11 1999/12/12 11:29:58 veego Exp $
+#      $NetBSD: Makefile,v 1.12 2000/05/03 11:40:54 veego Exp $
 
 PROG=  ipf
-SRCS=  ipf.c parse.c facpri.c opt.c
+SRCS=  ipf.c parse.c common.c opt.c facpri.c
 MAN=   ipf.8 ipf.4 ipf.5 ipl.4
 MLINKS=        ipl.4 ipfilter.4 ipf.5 ipf.conf.5
 
diff -r 403eec3d8903 -r 8b7021828b33 usr.sbin/ipf/ipfs/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/usr.sbin/ipf/ipfs/Makefile        Wed May 03 11:40:53 2000 +0000
@@ -0,0 +1,6 @@
+#      $NetBSD: Makefile,v 1.1 2000/05/03 11:40:55 veego Exp $
+
+PROG=  ipfs
+MAN=   ipfs.8
+
+.include <bsd.prog.mk>
diff -r 403eec3d8903 -r 8b7021828b33 usr.sbin/ipf/ipfstat/Makefile
--- a/usr.sbin/ipf/ipfstat/Makefile     Wed May 03 11:40:15 2000 +0000
+++ b/usr.sbin/ipf/ipfstat/Makefile     Wed May 03 11:40:53 2000 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.12 1999/12/12 11:30:04 veego Exp $
+#      $NetBSD: Makefile,v 1.13 2000/05/03 11:40:55 veego Exp $
 
 PROG=  ipfstat
-SRCS=  kmem.c fils.c opt.c parse.c facpri.c
+SRCS=  fils.c parse.c kmem.c opt.c facpri.c common.c
 MAN=   ipfstat.8
 
 .include <bsd.prog.mk>
diff -r 403eec3d8903 -r 8b7021828b33 usr.sbin/ipf/ipftest/Makefile
--- a/usr.sbin/ipf/ipftest/Makefile     Wed May 03 11:40:15 2000 +0000
+++ b/usr.sbin/ipf/ipftest/Makefile     Wed May 03 11:40:53 2000 +0000
@@ -1,7 +1,10 @@
-#      $NetBSD: Makefile,v 1.14 1999/12/12 11:30:06 veego Exp $
+#      $NetBSD: Makefile,v 1.15 2000/05/03 11:40:55 veego Exp $
 
 PROG=  ipftest
-SRCS=  ipt.c ipft_sn.c ipft_ef.c ipft_td.c ipft_pc.c opt.c ipft_tx.c misc.c ip_frag.c ip_state.c ip_nat.c ipft_hx.c ip_fil.c fil.c parse.c facpri.c ip_proxy.c ip_auth.c natparse.c
+SRCS=  ipt.c parse.c common.c fil.c ipft_sn.c ipft_ef.c ipft_td.c \
+       ipft_pc.c opt.c ipft_tx.c misc.c ip_frag.c ip_state.c \
+       ip_nat.c ip_proxy.c ip_auth.c ipft_hx.c ip_fil.c \
+       natparse.c facpri.c
 MAN=   ipftest.1
 CPPFLAGS+=-I${.CURDIR}/../../../dist/ipf
 
diff -r 403eec3d8903 -r 8b7021828b33 usr.sbin/ipf/ipnat/Makefile
--- a/usr.sbin/ipf/ipnat/Makefile       Wed May 03 11:40:15 2000 +0000
+++ b/usr.sbin/ipf/ipnat/Makefile       Wed May 03 11:40:53 2000 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.14 1999/12/12 11:30:16 veego Exp $
+#      $NetBSD: Makefile,v 1.15 2000/05/03 11:40:56 veego Exp $
 
 PROG=  ipnat
-SRCS=  kmem.c ipnat.c natparse.c
+SRCS=  ipnat.c kmem.c natparse.c common.c
 MAN=   ipnat.8 ipnat.4 ipnat.5
 MLINKS=        ipnat.5 ipnat.conf.5
 
diff -r 403eec3d8903 -r 8b7021828b33 usr.sbin/ipf/ipresend/Makefile
--- a/usr.sbin/ipf/ipresend/Makefile    Wed May 03 11:40:15 2000 +0000
+++ b/usr.sbin/ipf/ipresend/Makefile    Wed May 03 11:40:53 2000 +0000
@@ -1,7 +1,8 @@
-#      $NetBSD: Makefile,v 1.13 1999/12/12 11:30:17 veego Exp $
+#      $NetBSD: Makefile,v 1.14 2000/05/03 11:40:56 veego Exp $
 
 PROG=  ipresend
-SRCS=  ipresend.c ip.c resend.c opt.c ipft_ef.c ipft_hx.c ipft_sn.c ipft_td.c ipft_tx.c sbpf.c 44arp.c ipft_pc.c
+SRCS=  ipresend.c ip.c resend.c ipft_ef.c ipft_hx.c ipft_pc.c ipft_sn.c \
+       ipft_td.c ipft_tx.c opt.c sbpf.c sock.c 44arp.c
 MAN=   ipresend.1
 
 CPPFLAGS+=-I${.CURDIR}/../../../dist/ipf
diff -r 403eec3d8903 -r 8b7021828b33 usr.sbin/ipf/ipsend/Makefile
--- a/usr.sbin/ipf/ipsend/Makefile      Wed May 03 11:40:15 2000 +0000
+++ b/usr.sbin/ipf/ipsend/Makefile      Wed May 03 11:40:53 2000 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.12 1999/12/12 11:30:19 veego Exp $
+#      $NetBSD: Makefile,v 1.13 2000/05/03 11:40:56 veego Exp $
 
 PROG=  ipsend
-SRCS=  ipsend.c ip.c ipsopt.c 44arp.c sbpf.c iplang_l.l iplang_y.y
+SRCS=  ipsend.c ip.c ipsopt.c iplang_l.l iplang_y.y sbpf.c sock.c 44arp.c
 YHEADER=1
 LDADD= -ll
 DPADD= ${LIBL}
diff -r 403eec3d8903 -r 8b7021828b33 usr.sbin/ipf/iptest/Makefile
--- a/usr.sbin/ipf/iptest/Makefile      Wed May 03 11:40:15 2000 +0000
+++ b/usr.sbin/ipf/iptest/Makefile      Wed May 03 11:40:53 2000 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.12 1999/12/12 11:30:31 veego Exp $
+#      $NetBSD: Makefile,v 1.13 2000/05/03 11:40:56 veego Exp $
 
 PROG=  iptest
-SRCS=  iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
+SRCS=  iptest.c iptests.c ip.c sbpf.c sock.c 44arp.c
 MAN=   iptest.1
 CPPFLAGS+=-I${.CURDIR}/../../../dist/ipf