From owner-cvs-all Sat Jul 28 17:38:19 2001 Delivered-To: cvs-all@freebsd.org Received: from wantadilla.lemis.com (wantadilla.lemis.com [192.109.197.80]) by hub.freebsd.org (Postfix) with ESMTP id 1182337B405; Sat, 28 Jul 2001 17:38:15 -0700 (PDT) (envelope-from grog@lemis.com) Received: by wantadilla.lemis.com (Postfix, from userid 1004) id B05E26ACC4; Sun, 29 Jul 2001 10:08:13 +0930 (CST) Date: Sun, 29 Jul 2001 10:08:13 +0930 From: Greg Lehey To: Darren Reed Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_auth.h ip_compat.h ip_fil.c ip_fil.h ip_frag.c ip_frag.h ip_ftp_pxy.c ip_log.c ip_nat.c ip_nat.h ip_proxy.c ip_proxy.h ip_raudio_pxy.c ip_state.c ip_state.h ipl.h Message-ID: <20010729100813.C68202@wantadilla.lemis.com> References: <200107281158.f6SBwV351553@freefall.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <200107281158.f6SBwV351553@freefall.freebsd.org>; from darrenr@FreeBSD.org on Sat, Jul 28, 2001 at 04:58:31AM -0700 Organization: The FreeBSD Project Phone: +61-8-8388-8286 Fax: +61-8-8388-8725 Mobile: +61-418-838-708 WWW-Home-Page: http://www.FreeBSD.org/ X-PGP-Fingerprint: 6B 7B C3 8C 61 CD 54 AF 13 24 52 F8 6D A4 95 EF Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Saturday, 28 July 2001 at 4:58:31 -0700, Darren Reed wrote: > darrenr 2001/07/28 04:58:30 PDT > > Modified files: > sys/contrib/ipfilter/netinet fil.c ip_auth.c ip_auth.h > ip_compat.h ip_fil.c ip_fil.h > ip_frag.c ip_frag.h ip_ftp_pxy.c > ip_log.c ip_nat.c ip_nat.h > ip_proxy.c ip_proxy.h > ip_raudio_pxy.c ip_state.c > ip_state.h ipl.h > Log: > fix conflicts created by import Could you describe these "conflicts"? I estimate about 1000 lines of changes. Last time I looked at a commit like this, it consisted mainly of bug fixes. It would be nice to know what has been fixed, especially in a security-related product. Greg -- See complete headers for address and phone numbers To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message