9 files changed, 0 insertions, 361 deletions
diff --git a/contrib/ipfilter/FreeBSD-2.2/files.diffs b/contrib/ipfilter/FreeBSD-2.2/files.diffs
deleted file mode 100644
index 2ada3fa..0000000
--- a/contrib/ipfilter/FreeBSD-2.2/files.diffs
+++ /dev/null
@@ -1,24 +0,0 @@
-*** files.orig	Tue Sep  9 16:58:40 1997
---- files	Sat Apr  4 10:52:58 1998
-***************
-*** 222,227 ****
---- 222,240 ----
-  netinet/tcp_timer.c	optional inet
-  netinet/tcp_usrreq.c	optional inet
-  netinet/udp_usrreq.c	optional inet
-+ netinet/ip_fil.c	optional ipfilter inet
-+ netinet/fil.c		optional ipfilter inet
-+ netinet/ip_nat.c	optional ipfilter inet
-+ netinet/ip_frag.c	optional ipfilter inet
-+ netinet/ip_state.c	optional ipfilter inet
-+ netinet/ip_proxy.c	optional ipfilter inet
-+ netinet/mlf_ipl.c	optional ipfilter inet
-+ netinet/ip_auth.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 inet
-+ netinet/ip_rules.c	optional ipfilter_compiled ipfilter inet
-  netipx/ipx.c		optional ipx
-  netipx/ipx_cksum.c	optional ipx
-  netipx/ipx_input.c	optional ipx
diff --git a/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs b/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs
deleted file mode 100644
index 82599f1..0000000
--- a/contrib/ipfilter/FreeBSD-2.2/files.newconf.diffs
+++ /dev/null
@@ -1,24 +0,0 @@
-*** files.newconf.orig	Sun Jun 25 02:17:29 1995
---- files.newconf	Sun Jun 25 02:19:10 1995
-***************
-*** 161,166 ****
---- 161,179 ----
-  file	netinet/ip_input.c	inet
-  file	netinet/ip_mroute.c	inet
-  file	netinet/ip_output.c	inet
-+ 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_log.c	ipfilter
-+ file	netinet/mlf_ipl.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-2.2/in_proto.c.diffs b/contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs
deleted file mode 100644
index c2822d3..0000000
--- a/contrib/ipfilter/FreeBSD-2.2/in_proto.c.diffs
+++ /dev/null
@@ -1,16 +0,0 @@
-*** /sys/netinet/in_proto.c.orig	Sat May 24 13:42:26 1997
---- /sys/netinet/in_proto.c	Sat May 24 13:42:36 1997
-***************
-*** 89,94 ****
---- 89,99 ----
-  void	eoninput(), eonctlinput(), eonprotoinit();
-  #endif /* EON */
-  
-+ #if defined(IPFILTER) && !defined(IPFILTER_LKM)
-+ void	iplinit();
-+ #define	ip_init	iplinit
-+ #endif
-+ 
-  extern	struct domain inetdomain;
-  
-  struct protosw inetsw[] = {
diff --git a/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs b/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs
deleted file mode 100644
index c2b2b15..0000000
--- a/contrib/ipfilter/FreeBSD-2.2/ip_input.c.diffs
+++ /dev/null
@@ -1,32 +0,0 @@
-*** /sys/netinet/ip_input.c.orig	Sat May 24 13:37:16 1997
---- /sys/netinet/ip_input.c	Sat May 24 13:38:58 1997
-***************
-*** 74,79 ****
---- 74,82 ----
-  #ifdef IPFIREWALL
-  #include <netinet/ip_fw.h>
-  #endif
-+ #if defined(IPFILTER_LKM) || defined(IPFILTER)
-+ int	(*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **));
-+ #endif
-  
-  int rsvp_on = 0;
-  static int ip_rsvp_on;
-***************
-*** 310,315 ****
---- 313,327 ----
-  	 * - Wrap: fake packet's addr/port <unimpl.>
-  	 * - Encapsulate: put it in another IP and send out. <unimp.>
-   	 */
-+ #if defined(IPFILTER_LKM) || defined(IPFILTER)
-+ 	if (fr_checkp) {
-+ 		struct mbuf *m1 = m;
-+ 
-+ 		if ((*fr_checkp)(ip, hlen, m->m_pkthdr.rcvif, 0, &m1) || !m1)
-+ 			return;
-+ 		ip = mtod(m = m1, struct ip *);
-+ 	}
-+ #endif
-  
-  #ifdef COMPAT_IPFW
-  	if (ip_fw_chk_ptr) {
diff --git a/contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs b/contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs
deleted file mode 100644
index ff5ae0a..0000000
--- a/contrib/ipfilter/FreeBSD-2.2/ip_output.c.diffs
+++ /dev/null
@@ -1,67 +0,0 @@
-*** /sys/netinet/ip_output.c.orig	Sat May 24 14:07:24 1997
---- /sys/netinet/ip_output.c	Sat May 24 15:00:29 1997
-***************
-*** 67,72 ****
---- 67,76 ----
-  #else
-  #undef COMPAT_IPFW
-  #endif
-+ #if defined(IPFILTER_LKM) || defined(IPFILTER)
-+ extern	int	(*fr_checkp) __P((struct ip *, int, struct ifnet *, int, struct mbuf **));
-+ #endif
-+ 
-  
-  u_short ip_id;
-  
-***************
-*** 75,81 ****
-  	__P((struct ifnet *, struct mbuf *, struct sockaddr_in *));
-  static int	ip_getmoptions
-  	__P((int, struct ip_moptions *, struct mbuf **));
-! static int	ip_optcopy __P((struct ip *, struct ip *));
-  static int	ip_pcbopts __P((struct mbuf **, struct mbuf *));
-  static int	ip_setmoptions
-  	__P((int, struct ip_moptions **, struct mbuf *));
---- 79,85 ----
-  	__P((struct ifnet *, struct mbuf *, struct sockaddr_in *));
-  static int	ip_getmoptions
-  	__P((int, struct ip_moptions *, struct mbuf **));
-! int	ip_optcopy __P((struct ip *, struct ip *));
-  static int	ip_pcbopts __P((struct mbuf **, struct mbuf *));
-  static int	ip_setmoptions
-  	__P((int, struct ip_moptions **, struct mbuf *));
-***************
-*** 338,343 ****
---- 342,356 ----
-  	 * - Wrap: fake packet's addr/port <unimpl.>
-  	 * - Encapsulate: put it in another IP and send out. <unimp.>
-  	 */ 
-+ #if defined(IPFILTER_LKM) || defined(IPFILTER)
-+ 	if (fr_checkp) {
-+ 		struct mbuf *m1 = m;
-+ 
-+ 		if ((error = (*fr_checkp)(ip, hlen, ifp, 1, &m1)) || !m1)
-+ 			goto done;
-+ 		ip = mtod(m = m1, struct ip *);
-+ 	}
-+ #endif
-  
-  #ifdef COMPAT_IPFW
-          if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, ifp, IP_NAT_OUT)) {
-***************
-*** 559,565 ****
-   * Copy options from ip to jp,
-   * omitting those not copied during fragmentation.
-   */
-! static int
-  ip_optcopy(ip, jp)
-  	struct ip *ip, *jp;
-  {
---- 574,580 ----
-   * Copy options from ip to jp,
-   * omitting those not copied during fragmentation.
-   */
-! int
-  ip_optcopy(ip, jp)
-  	struct ip *ip, *jp;
-  {
diff --git a/contrib/ipfilter/FreeBSD-2.2/kinstall b/contrib/ipfilter/FreeBSD-2.2/kinstall
deleted file mode 100755
index 5a4368e..0000000
--- a/contrib/ipfilter/FreeBSD-2.2/kinstall
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/csh -f
-#
-set dir=`pwd`
-set karch=`uname -m`
-if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch"
-if ( -d /sys/$karch ) set archdir="/sys/$karch"
-set confdir="$archdir/conf"
-
-if ( $dir =~ */FreeBSD* ) cd ..
-echo -n "Installing "
-foreach i (ip_{auth,fil,frag,nat,pool,proxy,scan,state,sync}.[ch] fil.c \
-	   ip_*_pxy.c mlf_ipl.c ipl.h ip_compat.h ip_log.c)
-	echo -n "$i ";
-	cp $i /sys/netinet
-	chmod 644 /sys/netinet/$i
-	switch ($i)
-	case *.h:
-		/bin/cp $i /usr/include/netinet/$i
-		chmod 644 /usr/include/netinet/$i
-		breaksw 
-	endsw   
-end
-echo ""
-echo "Copying /usr/include/osreldate.h to /sys/sys"
-cp /usr/include/osreldate.h /sys/sys
-echo "Patching ip_input.c, ip_output.c and in_proto.c"
-cat FreeBSD-2.2/ip_{in,out}put.c.diffs FreeBSD-2.2/in_proto.c.diffs | \
-(cd /sys/netinet; patch)
-
-if ( -f /sys/conf/files.newconf ) then
-	echo "Patching /sys/conf/files.newconf"
-	cat FreeBSD-2.2/files.newconf.diffs | (cd /sys/conf; patch)
-	echo "Patching /sys/conf/files"
-	cat FreeBSD-2.2/files.diffs | (cd /sys/conf; patch)
-endif
-if ( -f /sys/conf/files.oldconf ) then
-	echo "Patching /sys/conf/files.oldconf"
-	cat FreeBSD-2.2/files.oldconf.diffs | (cd /sys/conf; patch)
-	echo "Patching /sys/conf/files"
-	cat FreeBSD-2.2/filez.diffs | (cd /sys/conf; patch)
-endif
-
-set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1`
-echo -n "Kernel configuration to update [$config] "
-set newconfig=$<
-if ( "$newconfig" != "" ) then
-	set config="$confdir/$newconfig"
-else
-	set newconfig=$config
-endif
-echo "Re-config'ing $newconfig..."
-if ( -f $confdir/$newconfig ) then
-	mv $confdir/$newconfig $confdir/$newconfig.bak
-endif
-if ( -d $archdir/../compile/$newconfig ) then
-	set bak=".bak"
-	set dot=0
-	while ( -d $archdir/../compile/${newconfig}.${bak} )
-		set bak=".bak.$dot"
-		set dot=`expr 1 + $dot`
-	end
-	mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.${bak}
-endif
-awk '{print $0;if($2=="INET"){print"options IPFILTER"}}' \
-	$confdir/$newconfig.bak > $confdir/$newconfig
-echo 'You will now need to run "config" and build a new kernel.'
-exit 0
diff --git a/contrib/ipfilter/FreeBSD-2.2/minstall b/contrib/ipfilter/FreeBSD-2.2/minstall
deleted file mode 100755
index 832b68e..0000000
--- a/contrib/ipfilter/FreeBSD-2.2/minstall
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/csh -f
-#
-set dir=`pwd`
-set karch=`uname -m`
-if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch"
-if ( -d /sys/$karch ) set archdir="/sys/$karch"
-set confdir="$archdir/conf"
-
-if ( $dir =~ */FreeBSD-2.2 ) cd ..
-echo "Patching ip_input.c, ip_output.c and in_proto.c"
-cat FreeBSD-2.2/ip_{in,out}put.c.diffs FreeBSD-2.2/in_proto.c.diffs |  \
-(cd /sys/netinet; patch)
-
-set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1`
-echo -n "Kernel configuration to update [$config] "
-set newconfig=$<
-if ( "$newconfig" != "" ) then
-	set config="$confdir/$newconfig"
-else
-	set newconfig=$config
-endif
-echo "Re-config'ing $newconfig..."
-if ( -f $confdir/$newconfig ) then
-	mv $confdir/$newconfig $confdir/$newconfig.bak
-endif
-if ( -d $archdir/../compile/$newconfig ) then
-	set bak=".bak"
-	set dot=0
-	while ( -d $archdir/../compile/${newconfig}${bak} )
-		set bak=".bak."$dot
-		set dot=`expr 1 + $dot`
-	end
-	mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}$bak
-endif
-awk '{print $0;if($2=="INET"){print"options IPFILTER_LKM\noptions IPFILTER_LOG"}}' \
-	$confdir/$newconfig.bak > $confdir/$newconfig
-echo 'You will now need to run "config" and build a new kernel.'
-exit 0
diff --git a/contrib/ipfilter/FreeBSD-2.2/unkinstall b/contrib/ipfilter/FreeBSD-2.2/unkinstall
deleted file mode 100755
index 1955f5c..0000000
--- a/contrib/ipfilter/FreeBSD-2.2/unkinstall
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/csh -f
-#
-set dir=`pwd`
-set karch=`uname -m`
-if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch"
-if ( -d /sys/$karch ) set archdir="/sys/$karch"
-set confdir="$archdir/conf"
-
-if ( $dir =~ */FreeBSD* ) cd ..
-echo -n "Uninstalling "
-foreach i (ip_fil.[ch] ip_nat.[ch] ip_frag.[ch] ip_state.[ch] fil.c \
-	   ip_auth.[ch] ip_proxy.[ch] ip_ftp_pxy.c ip_compat.h ip_log.c \
-	    mlf_ipl.c ipl.h)
-	echo -n "$i ";
-	/bin/rm -f /sys/netinet/$i
-end
-echo ""
-echo "Unpatching ip_input.c, ip_output.c and in_proto.c"
-cat FreeBSD-2.2/ip_{in,out}put.c.diffs FreeBSD-2.2/in_proto.c.diffs | \
-(cd /sys/netinet; patch -R)
-
-if ( -f /sys/conf/files.newconf ) then
-	echo "Unpatching /sys/conf/files.newconf"
-	cat FreeBSD-2.2/files.newconf.diffs | (cd /sys/conf; patch -R)
-	echo "Unpatching /sys/conf/files"
-	cat FreeBSD-2.2/files.diffs | (cd /sys/conf; patch -R)
-endif
-if ( -f /sys/conf/files.oldconf ) then
-	echo "Unpatching /sys/conf/files.oldconf"
-	cat FreeBSD-2.2/files.oldconf.diffs | (cd /sys/conf; patch -R)
-	echo "Unpatching /sys/conf/files"
-	cat FreeBSD-2.2/filez.diffs | (cd /sys/conf; patch -R)
-endif
-
-set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1`
-echo -n "Kernel configuration to update [$config] "
-set newconfig=$<
-if ( "$newconfig" != "" ) then
-	set config="$confdir/$newconfig"
-else
-	set newconfig=$config
-endif
-if ( -f $confdir/$newconfig ) then
-	mv $confdir/$newconfig $confdir/$newconfig.bak
-endif
-if ( -d $archdir/../compile/$newconfig ) then
-	set bak=".bak"
-	set dot=0
-	while ( -d $archdir/../compile/${newconfig}.${bak} )
-		set bak=".bak.$dot"
-		set dot=`expr 1 + $dot`
-	end
-	mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.${bak}
-endif
-egrep -v IPFILTER $confdir/$newconfig.bak > $confdir/$newconfig
-echo 'You will now need to run "config" and build a new kernel.'
-exit 0
diff --git a/contrib/ipfilter/FreeBSD-2.2/unminstall b/contrib/ipfilter/FreeBSD-2.2/unminstall
deleted file mode 100755
index 07aaac0..0000000
--- a/contrib/ipfilter/FreeBSD-2.2/unminstall
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/csh -f
-#
-set dir=`pwd`
-set karch=`uname -m`
-if ( -d /sys/arch/$karch ) set archdir="/sys/arch/$karch"
-if ( -d /sys/$karch ) set archdir="/sys/$karch"
-set confdir="$archdir/conf"
-
-if ( $dir =~ */FreeBSD* ) cd ..
-echo "Unpatching ip_input.c, ip_output.c and in_proto.c"
-cat FreeBSD-2.2/ip_{in,out}put.c.diffs FreeBSD-2.2/in_proto.c.diffs |  \
-(cd /sys/netinet; patch -R)
-
-set config=`(cd $confdir; /bin/ls -1t [0-9A-Z_]*) | head -1`
-echo -n "Kernel configuration to update [$config] "
-set newconfig=$<
-if ( "$newconfig" != "" ) then
-	set config="$confdir/$newconfig"
-else
-	set newconfig=$config
-endif
-if ( -f $confdir/$newconfig ) then
-	mv $confdir/$newconfig $confdir/$newconfig.bak
-endif
-if ( -d $archdir/../compile/$newconfig ) then
-	set bak=".bak"
-	set dot=0
-	while ( -d $archdir/../compile/${newconfig}.${bak} )
-		set bak=".bak.$dot"
-		set dot=`expr 1 + $dot`
-	end
-	mv $archdir/../compile/$newconfig $archdir/../compile/${newconfig}.$bak
-endif
-grep -v IPFILTER $confdir/$newconfig.bak > $confdir/$newconfig
-echo 'You will now need to run "config" and build a new kernel.'
-exit 0