Revive userland stuff for ipfilter.

Also fixes:
PR:		7791

11 files changed, 150 insertions, 0 deletions

diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile
new file mode 100644
index 0000000..9056cf0
--- /dev/null
+++ b/sbin/ipf/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
+
+PROG=	ipf
+MAN4=	ipf.4
+MAN5=	ipf.5
+MAN8=	ipf.8
+SRCS=	ipf.c parse.c opt.c facpri.c
+CFLAGS+=-DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../contrib/ipfilter
+
+.include <bsd.prog.mk>
diff --git a/sbin/ipfstat/Makefile b/sbin/ipfstat/Makefile
new file mode 100644
index 0000000..e506180
--- /dev/null
+++ b/sbin/ipfstat/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
+
+PROG=	ipfstat
+MAN8=	ipfstat.8
+SRCS=	fils.c parse.c opt.c kmem.c facpri.c
+CFLAGS+=-DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+
+.include <bsd.prog.mk>
diff --git a/sbin/ipmon/Makefile b/sbin/ipmon/Makefile
new file mode 100644
index 0000000..96cffcf
--- /dev/null
+++ b/sbin/ipmon/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
+
+PROG=	ipmon
+MAN8=	ipmon.8
+SRCS=	ipmon.c
+
+CFLAGS+=-DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+
+.include <bsd.prog.mk>
diff --git a/sbin/ipnat/Makefile b/sbin/ipnat/Makefile
new file mode 100644
index 0000000..8eed3a4
--- /dev/null
+++ b/sbin/ipnat/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
+
+PROG=	ipnat
+MAN1=	ipnat.1
+MAN4=	ipnat.4
+MAN5=	ipnat.5
+SRCS=	ipnat.c kmem.c natparse.c
+CFLAGS+=-DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/ipfstat/Makefile b/usr.sbin/ipfstat/Makefile
new file mode 100644
index 0000000..e506180
--- /dev/null
+++ b/usr.sbin/ipfstat/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
+
+PROG=	ipfstat
+MAN8=	ipfstat.8
+SRCS=	fils.c parse.c opt.c kmem.c facpri.c
+CFLAGS+=-DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/ipftest/Makefile b/usr.sbin/ipftest/Makefile
new file mode 100644
index 0000000..f3255fa
--- /dev/null
+++ b/usr.sbin/ipftest/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../sys/netinet \
+	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
+
+PROG=	ipftest
+MAN1=	ipftest.1
+SRCS=	opt_ipfilter.h \
+	ipt.c parse.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
+
+CFLAGS+=-DIPL_NAME=\"/dev/ipl\" -I- -I${.OBJDIR} -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+
+CLEANFILES+=	opt_ipfilter.h
+
+opt_ipfilter.h:	Makefile
+	echo "#define IPFILTER 1" > opt_ipfilter.h
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/ipmon/Makefile b/usr.sbin/ipmon/Makefile
new file mode 100644
index 0000000..96cffcf
--- /dev/null
+++ b/usr.sbin/ipmon/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
+
+PROG=	ipmon
+MAN8=	ipmon.8
+SRCS=	ipmon.c
+
+CFLAGS+=-DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/ipnat/Makefile b/usr.sbin/ipnat/Makefile
new file mode 100644
index 0000000..8eed3a4
--- /dev/null
+++ b/usr.sbin/ipnat/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/ipfilter ${.CURDIR}/../../contrib/ipfilter/man
+
+PROG=	ipnat
+MAN1=	ipnat.1
+MAN4=	ipnat.4
+MAN5=	ipnat.5
+SRCS=	ipnat.c kmem.c natparse.c
+CFLAGS+=-DIPL_NAME=\"/dev/ipl\" -I- -I${.CURDIR}/../../sys/netinet -I${.CURDIR}/../../sys -I${.CURDIR}/../../contrib/ipfilter
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/ipresend/Makefile b/usr.sbin/ipresend/Makefile
new file mode 100644
index 0000000..8a9d8b2
--- /dev/null
+++ b/usr.sbin/ipresend/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
+	${.CURDIR}/../../contrib/ipfilter
+
+PROG=	ipresend
+MAN1=	ipresend.1
+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
+
+CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
+	-I- -I${.CURDIR}/../../sys/netinet \
+	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
+	-I${.CURDIR}/../../contrib/ipfilter
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/ipsend/Makefile b/usr.sbin/ipsend/Makefile
new file mode 100644
index 0000000..75a45b3
--- /dev/null
+++ b/usr.sbin/ipsend/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
+	${.CURDIR}/../../contrib/ipfilter/iplang \
+	${.CURDIR}/../../contrib/ipfilter
+
+PROG=	ipsend
+MAN1=	ipsend.1
+MAN5=	ipsend.5
+SRCS=	ipsend.c ip.c ipsopt.c sbpf.c sock.c 44arp.c iplang_y.y iplang_l.l \
+	y.tab.h
+
+CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
+	-I- -I. -I${.CURDIR}/../../sys/netinet \
+	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
+	-I${.CURDIR}/../../contrib/ipfilter/iplang \
+	-I${.CURDIR}/../../contrib/ipfilter
+
+DPADD=	${LIBL}
+LDADD=	-ll
+
+.include <bsd.prog.mk>
diff --git a/usr.sbin/iptest/Makefile b/usr.sbin/iptest/Makefile
new file mode 100644
index 0000000..f296945
--- /dev/null
+++ b/usr.sbin/iptest/Makefile
@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+.PATH:	${.CURDIR}/../../contrib/ipfilter/ipsend \
+	${.CURDIR}/../../contrib/ipfilter
+
+PROG=	iptest
+MAN1=	iptest.1
+SRCS=	iptest.c iptests.c ip.c sbpf.c 44arp.c sock.c
+
+CFLAGS+=-DDOSOCKET -DIPL_NAME=\"/dev/ipl\" \
+	-I- -I${.CURDIR}/../../sys/netinet \
+	-I${.CURDIR}/../../contrib/ipfilter/ipsend \
+	-I${.CURDIR}/../../contrib/ipfilter
+
+.include <bsd.prog.mk>