NetBSD master CVS tree commits

[source%NetBSD.ORG@localhost]

mjacob
Tue May 27 17:13:54 PDT 1997
Update of /cvsroot/src/lib/libarch/alpha
In directory netbsd1:/var/slash-tmp/cvs-serv16522

Added Files:
        Makefile 
Log Message:
A stub makefile has to hang around (as far as *I* can tell) for makes to
continue to work.


thorpej
Tue May 27 17:17:26 PDT 1997
Update of /cvsroot/src/sys/netinet
In directory netbsd1:/var/slash-tmp/cvs-serv17395

Modified Files:
        fil.c ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_frag.h 
        ip_ftp_pxy.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h 
        ip_state.c ip_state.h 
Log Message:
Resolve conflicts from merge of 3.2a7, take 2.  Also, eliminate some
silly differences between the NetBSD copy of the code and the
vendor branch, keeping only those which are necessary.  Of those
differences that currently exist, several "portability to NetBSD"
issues, which will be fed back to the ipfilter author.