CVS MEISTERS: PLEASE READ [was Re: cvs commit: src/contrib/tcpdump - Imported sources]

[Bruce M Simpson]

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
> 
>   FreeBSD src repository
> 
>   src/contrib/tcpdump - Imported sources
>   Update of /home/ncvs/src/contrib/tcpdump
>   In directory repoman.freebsd.org:/tmp/cvs-serv14802
>   
>   Log Message:
>   Import tcpdump 3.8.3, from http://www.tcpdump.org/releases/tcpdump-3.8.3.tar.gz
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 167 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/cvs-src/attachments/20040331/59bd12a5/attachment.bin