From owner-cvs-all@FreeBSD.ORG Wed Mar 31 01:44:12 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7838616A4CE; Wed, 31 Mar 2004 01:44:12 -0800 (PST) Received: from arginine.spc.org (arginine.spc.org [195.206.69.236]) by mx1.FreeBSD.org (Postfix) with ESMTP id AE56643D60; Wed, 31 Mar 2004 01:44:11 -0800 (PST) (envelope-from bms@spc.org) Received: from localhost (localhost [127.0.0.1]) by arginine.spc.org (Postfix) with ESMTP id 7028365339; Wed, 31 Mar 2004 10:44:09 +0100 (BST) Received: from arginine.spc.org ([127.0.0.1]) by localhost (arginine.spc.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 46654-02; Wed, 31 Mar 2004 10:44:08 +0100 (BST) Received: from empiric.dek.spc.org (82-147-17-88.dsl.uk.rapidplay.com [82.147.17.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by arginine.spc.org (Postfix) with ESMTP id 4C4306530A; Wed, 31 Mar 2004 10:44:08 +0100 (BST) Received: by empiric.dek.spc.org (Postfix, from userid 1001) id 9635D612C; Wed, 31 Mar 2004 10:44:07 +0100 (BST) Date: Wed, 31 Mar 2004 10:44:07 +0100 From: Bruce M Simpson To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org Message-ID: <20040331094407.GA12038@empiric.dek.spc.org> Mail-Followup-To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org References: <200403310917.i2V9HT0b014839@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="G4iJoqBmSsgzjUCe" Content-Disposition: inline In-Reply-To: <200403310917.i2V9HT0b014839@repoman.freebsd.org> Subject: CVS MEISTERS: PLEASE READ [was Re: cvs commit: src/contrib/tcpdump - Imported sources] X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Mar 2004 09:44:12 -0000 --G4iJoqBmSsgzjUCe Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable WARNING: INCOMPLETE MERGE src/contrib/tcpdump is now under cvs_acls.pl protection. I have tested changes in a local repo ready to go, and I've left joe@ a voicemail asking if the restriction can be lifted. Unfortunately, whilst I have been able to perform the vendor branch import, I cannot resolve the conflicts until the restriction is lifted, at least in my case. (This is surely a bug in cvs_acls.pl -- I wasn't aware of the avail file until I stepped through why the commit to finish the tcpdump merge was failing). This will most likely mean tinderbox builds are broken until I can finish the merge. libpcap merge however appears to have gone successfully. BMS On Wed, Mar 31, 2004 at 01:17:29AM -0800, Bruce M Simpson wrote: > bms 2004/03/31 01:17:29 PST >=20 > FreeBSD src repository >=20 > src/contrib/tcpdump - Imported sources > Update of /home/ncvs/src/contrib/tcpdump > In directory repoman.freebsd.org:/tmp/cvs-serv14802 > =20 > Log Message: > Import tcpdump 3.8.3, from http://www.tcpdump.org/releases/tcpdump-3.8.= 3.tar.gz --G4iJoqBmSsgzjUCe Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Comment: '' iD8DBQFAapLmueUpAYYNtTsRAroDAJ9lWi7znu7+8HCidJYikuUpiNuoFACgotNj 47wSGJC4eSX8oelMJW0bCbM= =ImBV -----END PGP SIGNATURE----- --G4iJoqBmSsgzjUCe--