*** Makefile.orig	Mon Jun  2 07:48:06 1997
--- Makefile	Mon Jun  2 07:48:36 1997
***************
*** 129,132 ****
--- 129,134 ----
  install-bsd: bsd
  	(cd BSD/$(DCPU); $(MAKE) "TOP=../.." install)
+ install-bsdi: bsdi
+ 	(cd BSD/$(DCPU); $(MAKE) "TOP=../.." install-bsdi)
  install-sunos4: solaris
  	(cd SunOS4; $(MAKE) "TOP=.." install)
*** BSD/Makefile.orig	Thu Jan 30 21:40:12 1997
--- BSD/Makefile	Mon Jun  2 07:46:47 1997
***************
*** 178,179 ****
--- 178,192 ----
  	-$(INSTALL) -cs -g wheel -m 755 -o root ipnat ipftest $(SBINDEST)
  	(cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP))
+ 
+ install-bsdi:
+ 	-$(CP) $(TOP)/ip_fil.h /usr/include/netinet/ip_fil.h
+ 	-$(CHMOD) 444 /usr/include/netinet/ip_fil.h
+ 	-if [ -d $(LKMDIR) ] ; then \
+ 		cp if_ipl.o $(LKMDIR); \
+ 	fi
+ 	-$(INSTALL) -cs -g wheel -m 755 -o root ipfstat ipf $(SBINDEST)
+ 	-$(INSTALL) -cs -g wheel -m 755 -o root ipmon ipftest $(BINDEST)
+ 	-$(INSTALL) -cs -g wheel -m 755 -o root ipftest ipftest $(BINDEST)
+ 	-$(INSTALL) -cs -g wheel -m 755 -o root ipf ipftest $(SBINDEST)
+ 	-$(INSTALL) -cs -g wheel -m 755 -o root ipnat ipftest $(SBINDEST)
+ 	(cd $(TOP)/man; make INSTALL=$(INSTALL) MANDIR=$(MANDIR) install; cd $(TOP))
*** BSDOS/kinstall.orig	Fri Jan 10 00:14:46 1997
--- BSDOS/kinstall	Mon Jun  2 07:24:50 1997
***************
*** 1,8 ****
  #!/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"
  
--- 1,9 ----
  #!/bin/csh -f
  #
+ set SYSDIR=/usr/home/sakane/ipfil/sys
  set dir=`pwd`
  set karch=`uname -m`
! if ( -d $SYSDIR/arch/$karch ) set archdir="$SYSDIR/arch/$karch"
! if ( -d $SYSDIR/$karch ) set archdir="$SYSDIR/$karch"
  set confdir="$archdir/conf"
  
***************
*** 12,17 ****
  		   fil.c ip_compat.h)
  		echo -n "$i ";
! 		cp $i /sys/netinet
! 		chmod 664 /sys/netinet/$i
  	end
  	echo ""
--- 13,18 ----
  		   fil.c ip_compat.h)
  		echo -n "$i ";
! 		cp $i $SYSDIR/netinet
! 		chmod 664 $SYSDIR/netinet/$i
  	end
  	echo ""
***************
*** 20,28 ****
  endif
  echo "Patching ip_input.c and ip_output.c"
! cat BSDOS/ip_{in,out}put.c.diffs | (cd /sys/netinet; patch)
  
! if ( -f /sys/conf/files ) then
! 	echo "Patching /sys/conf/files"
! 	cat BSDOS/files.diffs | (cd /sys/conf; patch)
  endif
  
--- 21,29 ----
  endif
  echo "Patching ip_input.c and ip_output.c"
! cat BSDOS/ip_{in,out}put.c.diffs | (cd $SYSDIR/netinet; patch)
  
! if ( -f $SYSDIR/conf/files ) then
! 	echo "Patching $SYSDIR/conf/files"
! 	cat BSDOS/files.diffs | (cd $SYSDIR/conf; patch)
  endif
  
***************
*** 44,48 ****
  endif
  if ($0 =~ *kinstall) then
! 	awk '{print $0;if($2=="INET"){print"options IPFILTER"}}}' \
  		$confdir/$newconfig.bak > $confdir/$newconfig
  endif
--- 45,49 ----
  endif
  if ($0 =~ *kinstall) then
! 	awk '{print $0;if($2=="INET"){print"options IPFILTER"}}' \
  		$confdir/$newconfig.bak > $confdir/$newconfig
  endif
*** man/Makefile.orig	Fri Jan 10 00:14:52 1997
--- man/Makefile	Mon Jun  2 08:59:35 1997
***************
*** 9,12 ****
--- 9,14 ----
  
  install:
+ 	for d in man1 man4 man5 man8 ;\
+ 	do if [ ! -d $(MANDIR)/$d ] ; then mkdir $(MANDIR)/$d; fi ; done
  	$(INSTALL) -m 0644 -c -o root -g bin ipf.1 $(MANDIR)/man1
  	$(INSTALL) -m 0644 -c -o root -g bin ipftest.1 $(MANDIR)/man1
*** ipft_td.c.orig	Fri Jan 10 00:14:44 1997
--- ipft_td.c	Tue Jun  3 18:18:09 1997
***************
*** 124,133 ****
  	bzero(&pkt, sizeof(pkt));
  
! 	if ((n = sscanf(lbuf, "%s > %s: %s", src, dst, misc)) != 3)
! 		if ((n = sscanf(lbuf, "%s %s > %s: %s",
! 				time, src, dst, misc)) != 4)
! 			if ((n = sscanf(lbuf, "%s %s: %s > %s: %s",
! 					link1, link2, src, dst, misc)) != 5) {
! 				n = sscanf(lbuf, "%s %s %s: %s > %s: %s",
  					   time, link1, link2, src, dst, misc);
  				if (n != 6)
--- 124,137 ----
  	bzero(&pkt, sizeof(pkt));
  
! 	/* -nqt */
! 	if ((n = sscanf(lbuf, "%[.0-9] > %[.0-9]: %[^\\]", src, dst, misc)) != 3)
! 		/* -nq, -nqtt */
! 		if ((n = sscanf(lbuf, "%[.:0-9] %[.0-9] > %[.0-9]: %[^\\]",
! 				        time, src, dst, misc)) != 4)
! 			/* -nqte */
! 			if ((n = sscanf(lbuf, "%[:0-9a-fx] %[:0-9a-fx] %*d: %[.0-9] > %[.0-9]: %[^\\]",
! 					        link1, link2, src, dst, misc)) != 5) {
! 				/* -nte */
! 				n = sscanf(lbuf, "%[.:0-9] %[:0-9a-fx] %[:0-9a-fx] %*d: %[.0-9] > %[.0-9]: %[^\\]",
  					   time, link1, link2, src, dst, misc);
  				if (n != 6)
***************
*** 181,184 ****
--- 185,189 ----
  	}
  	slen = ip->ip_hl + extra + ip->ip_len;
+ 	bcopy((char *)&pkt, buf, slen);
  	return slen;
  }