Remove ipf. Darren Reed has interpreted his (old, new, whichever)

licence in a way that makes ipf not free according to the rules we
established over 5 years ago, at www.openbsd.org/goals.html (and those
same basic rules govern the other *BSD projects too).  Specifically,
Darren says that modified versions are not permitted.  But software
which OpenBSD uses and redistributes must be free to all (be they
people or companies), for any purpose they wish to use it, including
modification, use, peeing on, or even integration into baby mulching
machines or atomic bombs to be dropped on Australia.  Furthermore, we
know of a number of companies using ipf with modification like us, who
are now in the same situation, and we hope that some of them will work
with us to fill this gap that now exists in OpenBSD (temporarily, we
hope).

2 files changed, 2 insertions, 83 deletions

diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile
index 0dcea02bed8..c413c406549 100644
--- a/share/man/man4/Makefile
+++ b/share/man/man4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.162 2001/05/14 09:32:36 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.163 2001/05/30 02:12:10 deraadt Exp $
 
 MAN=	aac.4 ac97.4 adv.4 aha.4 ahb.4 ahc.4 aic.4 ami.4 amphy.4 an.4 \
 	aria.4 ast.4 \
@@ -11,7 +11,7 @@ MAN=	aac.4 ac97.4 adv.4 aha.4 ahb.4 ahc.4 aic.4 ami.4 amphy.4 an.4 \
 	eso.4 ess.4 exphy.4 fd.4 fdc.4 fpa.4 \
 	fms.4 fxp.4 gdt.4 gre.4 hifn.4 hsq.4 auich.4 icmp.4 icsphy.4 \
 	idp.4 iha.4 ifmedia.4 \
-	inet.4 inphy.4 iophy.4 ip.4 ipl.4 ipsec.4 isa.4 isapnp.4 ises.4 iso.4 \
+	inet.4 inphy.4 iophy.4 ip.4 ipsec.4 isa.4 isapnp.4 ises.4 iso.4 \
 	isp.4 \
 	ksyms.4 kue.4 lkm.4 lmc.4 lo.4 lxtphy.4 maestro.4 midi.4 mii.4 \
 	mtdphy.4 \
diff --git a/share/man/man4/ipl.4 b/share/man/man4/ipl.4
deleted file mode 100644
index f897e591288..00000000000
--- a/share/man/man4/ipl.4
+++ /dev/null
@@ -1,81 +0,0 @@
-.\"	$OpenBSD: ipl.4,v 1.9 2000/04/13 19:59:40 kjell Exp $
-.\"
-.TH IPL 4
-.SH NAME
-ipl \- IP packet log device
-.SH DESCRIPTION
-The \fBipl\fP pseudo device's purpose is to provide an easy way to gather
-packet headers of packets you wish to log.  If a packet header is to be
-logged, the entire header is logged (including any IP options \- TCP/UDP
-options are not included when it calculates header size) or not at all.
-The packet contents are also logged after the header.  If the log reader
-is busy or otherwise unable to read log records, upto IPLLOGSIZE (8192 is the
-default) bytes of data are stored.
-.PP
-Prepending every packet header logged is a structure containing information
-relevant to the packet following and why it was logged.  The structure's
-format is as follows:
-.LP
-.nf
-/*
- * Log structure.  Each packet header logged is prepended by one of these.
- * Following this in the log records read from the device will be an ipflog
- * structure which is then followed by any packet data.
- */
-typedef struct iplog    {
-        u_long  ipl_sec;
-        u_long  ipl_usec;
-        u_int   ipl_len;
-        u_int   ipl_count;
-        size_t  ipl_dsize;
-        struct  iplog   *ipl_next;
-} iplog_t;
-
-
-typedef struct  ipflog  {
-#if (defined(NetBSD) && (NetBSD <= 1991011) && (NetBSD >= 199603))
-        u_char  fl_ifname[IFNAMSIZ];
-#else
-        u_int   fl_unit;
-        u_char  fl_ifname[4];
-#endif
-        u_char  fl_plen;        /* extra data after hlen */
-        u_char  fl_hlen;        /* length of IP headers saved */
-        u_short fl_rule;        /* assume never more than 64k rules, total */
-        u_32_t  fl_flags;
-} ipflog_t;
-
-.fi
-.PP
-When reading from the \fBipl\fP device, it is necessary to call read(2) with
-a buffer big enough to hold at least 1 complete log record - reading of partial
-log records is not supported.
-.PP
-If the packet contents is more then 128 bytes when \fBlog body\fP is used,
-then only 128 bytes of the packet contents is logged.
-.PP
-Although it is only possible to read from the \fBipl\fP device, opening it
-for writing is required when using an ioctl which changes any kernel data.
-.PP
-The ioctls which are loaded with this device can be found under \fBipf(4)\fP.
-The ioctls which are for use with logging and don't affect the filter are:
-.LP
-.nf
-        ioctl(fd, SIOCIPFFB, int *)
-        ioctl(fd, FIONREAD, int *)
-.fi
-.PP
-The SIOCIPFFB ioctl flushes the log buffer and returns the number of bytes
-flushed.  FIONREAD returns the number of bytes currently used for storing
-log data.  If IPFILTER_LOG is not defined when compiling, SIOCIPFFB is not
-available and FIONREAD will return but not do anything.
-.PP
-There is currently no support for non-blocking IO with this device, meaning
-all read operations should be considered blocking in nature (if there is no
-data to read, it will sleep until some is made available).
-.SH SEE ALSO
-ipf(4)
-.SH BUGS
-Packet headers are dropped when the internal buffer (static size) fills.
-.SH FILES
-/dev/ipl