Date: Wed, 19 Jul 2000 13:17:26 -0700 From: Kent Stewart <kstewart@urx.com> To: Arjan de Vet <Arjan.deVet@adv.iae.nl> Cc: cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/netinet fil.c ip_auth.c ip_fil.c ip_fil.hip_frag.c ip_ftp_pxy.c ip_log.c ip_nat.c ip_nat.h ip_rcmd_pxy.cip_state.c ip_state.h ipl.h Message-ID: <39760CD6.FEC30572@urx.com> References: <200007191438.HAA34890@freefall.freebsd.org> <20000719201244.EABEC22E3@adv.iae.nl>
next in thread | previous in thread | raw e-mail | index | archive | help
Arjan de Vet wrote: > > In article <3975F60D.3B7FDAE8@urx.com> you write: > > >Ip_state.c and ip_nat.c are killing a 4.1-rc buildworld the error > >message is > > [...] > > Although Darren tried to merge 3.4.8 into stable there are still a lot > of differences between current and stable w.r.t. ipfilter. > > I've done > > cd /usr/src/contrib/ipfilter > cvs update -rRELENG_4 > cvs update -jv3_3_8 -jv3-4-8 > > and will see how far I get in resolving conflicts and updating > sys/netinet. I have it up on my system. One thing is noticeable and that is GETUNIT has multi-multi-definitions. Only one of them has two arguments. That was as far as I had got. Good luck on the conflicts. So far, I haven't seen anyone else complain. Kent > > Arjan > > -- > Arjan de Vet, Eindhoven, The Netherlands <Arjan.deVet@adv.iae.nl> > URL: http://www.iae.nl/users/devet/ for PGP key: finger devet@iae.nl -- Kent Stewart Richland, WA mailto:kbstew99@hotmail.com http://kstewart.urx.com/kstewart/index.html FreeBSD News http://daily.daemonnews.org/ Bomber dropping fire retardant in front of Hanford Wild fire. http://kstewart.urx.com/kstewart/bomber.jpg To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?39760CD6.FEC30572>