From owner-cvs-src-old@FreeBSD.ORG  Fri Dec 19 23:00:39 2008
Return-Path: <owner-cvs-src-old@FreeBSD.ORG>
Delivered-To: cvs-src-old@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABB93106564A
	for <cvs-src-old@freebsd.org>; Fri, 19 Dec 2008 23:00:39 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E2CC8FC22
	for <cvs-src-old@freebsd.org>; Fri, 19 Dec 2008 23:00:39 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBJN0doY096656
	for <cvs-src-old@freebsd.org>; Fri, 19 Dec 2008 23:00:39 GMT
	(envelope-from delphij@repoman.freebsd.org)
Received: (from svn2cvs@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBJN0d90096655
	for cvs-src-old@freebsd.org; Fri, 19 Dec 2008 23:00:39 GMT
	(envelope-from delphij@repoman.freebsd.org)
Message-Id: <200812192300.mBJN0d90096655@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to
	delphij@repoman.freebsd.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 19 Dec 2008 23:00:23 +0000 (UTC)
To: cvs-src-old@freebsd.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/contrib/netcat FREEBSD-vendor nc.1 netcat.c
X-BeenThere: cvs-src-old@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: **OBSOLETE** CVS commit messages for the src tree
	<cvs-src-old.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src-old>
List-Post: <mailto:cvs-src-old@freebsd.org>
List-Help: <mailto:cvs-src-old-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src-old>,
	<mailto:cvs-src-old-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Dec 2008 23:00:39 -0000

delphij     2008-12-19 23:00:23 UTC

  FreeBSD src repository

  Modified files:
    contrib/netcat       FREEBSD-vendor nc.1 netcat.c 
  Log:
  SVN rev 186343 on 2008-12-19 23:00:23Z by delphij
  
  Merge nc(1) from OpenBSD 4.4.  While there, rename our '-O' (no
  tcp options) to '--no-tcpopt' in order to resolve a comflicit
  with OpenBSD's -O semantics.
  
  Revision  Changes    Path
  1.2       +2 -2      src/contrib/netcat/FREEBSD-vendor
  1.11      +12 -4     src/contrib/netcat/nc.1
  1.9       +52 -14    src/contrib/netcat/netcat.c