From owner-cvs-all Wed Jul 19 13:13: 9 2000 Delivered-To: cvs-all@freebsd.org Received: from news.IAEhv.nl (news.IAE.nl [194.151.64.4]) by hub.freebsd.org (Postfix) with ESMTP id 93A5C37C031 for ; Wed, 19 Jul 2000 13:12:58 -0700 (PDT) (envelope-from Arjan.deVet@adv.iae.nl) Received: (from uucp@localhost) by news.IAEhv.nl (8.9.1/8.9.1) with IAEhv.nl id WAA09156; Wed, 19 Jul 2000 22:12:56 +0200 (MET DST) Received: by adv.iae.nl (Postfix, from userid 100) id EABEC22E3; Wed, 19 Jul 2000 22:12:44 +0200 (CEST) To: kstewart@urx.com 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 X-Newsgroups: list.freebsd.cvs.all In-Reply-To: <3975F60D.3B7FDAE8@urx.com> References: <200007191438.HAA34890@freefall.freebsd.org> Organization: Eindhoven, the Netherlands Cc: cvs-all@freebsd.org Message-Id: <20000719201244.EABEC22E3@adv.iae.nl> Date: Wed, 19 Jul 2000 22:12:44 +0200 (CEST) From: Arjan.deVet@adv.iae.nl (Arjan de Vet) Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG 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. Arjan -- Arjan de Vet, Eindhoven, The Netherlands URL: http://www.iae.nl/users/devet/ for PGP key: finger devet@iae.nl To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message