head	1.4;
access;
symbols
	RELENG_9_1_0_RELEASE:1.3.2.1.4.2
	RELENG_9_1:1.3.2.1.0.4
	RELENG_9_1_BP:1.3.2.1
	RELENG_8_3_0_RELEASE:1.2.2.2
	RELENG_8_3:1.2.2.2.0.6
	RELENG_8_3_BP:1.2.2.2
	RELENG_9_0_0_RELEASE:1.3.2.1.2.1
	RELENG_9_0:1.3.2.1.0.2
	RELENG_9_0_BP:1.3.2.1
	RELENG_9:1.3.0.2
	RELENG_9_BP:1.3
	RELENG_7_4_0_RELEASE:1.1.12.1
	RELENG_8_2_0_RELEASE:1.2.2.2
	RELENG_7_4:1.1.12.1.0.2
	RELENG_7_4_BP:1.1.12.1
	RELENG_8_2:1.2.2.2.0.4
	RELENG_8_2_BP:1.2.2.2
	RELENG_8_1_0_RELEASE:1.2.2.2
	RELENG_8_1:1.2.2.2.0.2
	RELENG_8_1_BP:1.2.2.2
	RELENG_7_3_0_RELEASE:1.1.24.1
	RELENG_7_3:1.1.0.24
	RELENG_7_3_BP:1.1
	RELENG_8_0_0_RELEASE:1.2.2.1.2.1
	RELENG_8_0:1.2.2.1.0.2
	RELENG_8_0_BP:1.2.2.1
	RELENG_8:1.2.0.2
	RELENG_8_BP:1.2
	RELENG_7_2_0_RELEASE:1.1.22.1
	RELENG_7_2:1.1.0.22
	RELENG_7_2_BP:1.1
	RELENG_7_1_0_RELEASE:1.1.20.1
	RELENG_6_4_0_RELEASE:1.1.18.1
	RELENG_7_1:1.1.0.20
	RELENG_7_1_BP:1.1
	RELENG_6_4:1.1.0.18
	RELENG_6_4_BP:1.1
	RELENG_7_0_0_RELEASE:1.1
	RELENG_6_3_0_RELEASE:1.1
	RELENG_7_0:1.1.0.16
	RELENG_7_0_BP:1.1
	RELENG_6_3:1.1.0.14
	RELENG_6_3_BP:1.1
	RELENG_7:1.1.0.12
	RELENG_7_BP:1.1
	RELENG_6_2_0_RELEASE:1.1
	RELENG_6_2:1.1.0.10
	RELENG_6_2_BP:1.1
	RELENG_5_5_0_RELEASE:1.1.2.1
	RELENG_5_5:1.1.2.1.0.4
	RELENG_5_5_BP:1.1.2.1
	RELENG_6_1_0_RELEASE:1.1
	RELENG_6_1:1.1.0.8
	RELENG_6_1_BP:1.1
	RELENG_6_0_0_RELEASE:1.1
	RELENG_6_0:1.1.0.6
	RELENG_6_0_BP:1.1
	RELENG_6:1.1.0.4
	RELENG_6_BP:1.1
	RELENG_5_4_0_RELEASE:1.1.2.1
	RELENG_5_4:1.1.2.1.0.2
	RELENG_5_4_BP:1.1.2.1
	RELENG_5:1.1.0.2;
locks; strict;
comment	@# @;


1.4
date	2012.11.17.01.48.54;	author svnexp;	state Exp;
branches;
next	1.3;

1.3
date	2010.03.23.23.56.22;	author delphij;	state Exp;
branches
	1.3.2.1;
next	1.2;

1.2
date	2008.04.21.18.37.08;	author delphij;	state Exp;
branches
	1.2.2.1;
next	1.1;

1.1
date	2005.02.06.15.26.44;	author delphij;	state Exp;
branches
	1.1.2.1
	1.1.4.1
	1.1.12.1
	1.1.18.1
	1.1.20.1
	1.1.22.1
	1.1.24.1;
next	;

1.3.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.3.2.1.2.1
	1.3.2.1.4.1;
next	1.3.2.2;

1.3.2.2
date	2012.11.17.11.36.08;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.3.2.1.2.2;

1.3.2.1.2.2
date	2012.11.17.08.36.08;	author svnexp;	state Exp;
branches;
next	;

1.3.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.3.2.1.4.2;

1.3.2.1.4.2
date	2012.11.17.08.46.58;	author svnexp;	state Exp;
branches;
next	;

1.2.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.2.2.1.2.1;
next	1.2.2.2;

1.2.2.2
date	2010.04.22.00.28.49;	author delphij;	state dead;
branches;
next	;

1.2.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

1.1.2.1
date	2005.02.13.07.35.07;	author delphij;	state Exp;
branches;
next	;

1.1.4.1
date	2012.11.17.07.38.52;	author svnexp;	state Exp;
branches;
next	;

1.1.12.1
date	2010.03.23.23.09.38;	author delphij;	state dead;
branches;
next	;

1.1.18.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.1.20.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.1.22.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.1.24.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;


desc
@@


1.4
log
@Switching exporter and resync
@
text
@$FreeBSD: head/contrib/netcat/FREEBSD-upgrade 205570 2010-03-23 23:56:22Z delphij $

Most of the instructions is outlined on FreeBSD wiki at:

	http://wiki.freebsd.org/SubversionPrimer/VendorImports

nc(1) is very small and most of code are just copied as-is from OpenBSD.  With a
few exceptions:

 * --no-tcpopt: Local feature specific to FreeBSD.
 * -V: We use FIB to map what OpenBSD do for "rdomain"
 * -E, -e: These are mostly self contained IPsec extensions

delphij@@FreeBSD.org - Mar 23, 2010
@


1.3
log
@SVN rev 205570 on 2010-03-23 23:56:22Z by delphij

Update metadata information as well as upgrade instructions.
@
text
@d1 1
a1 1
$FreeBSD$
@


1.3.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.3.2.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d1 1
a1 1
$FreeBSD: stable/9/contrib/netcat/FREEBSD-upgrade 205570 2010-03-23 23:56:22Z delphij $
@


1.3.2.1.4.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.3.2.1.4.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/9.1/contrib/netcat/FREEBSD-upgrade 205570 2010-03-23 23:56:22Z delphij $
@


1.3.2.1.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.3.2.1.2.2
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: releng/9.0/contrib/netcat/FREEBSD-upgrade 205570 2010-03-23 23:56:22Z delphij $
@


1.2
log
@Update instructions to match recent practices
@
text
@d3 1
a3 15
1. Export from OpenBSD's nc(1) into an empty directory (say "v-nc").
2. while read pattern; do rm ${pattern} ; done < FREEBSD-Xlist
3. Checkout our contrib/netcat to another directory (say "f-nc"),
   with -rOPENBSD, and usr.bin/nc to its ../../
4. copy the files from v-nc to f-nc
5. do cvs up -A in f-nc
6. If there is conflicits, try to resolve them.
7. do build in f-nc/../../usr.bin/nc
8. If everything seems ok, do the actual import in v-nc:
	cvs -n import src/contrib/netcat OPENBSD OPENBSD_<release>
   Everything appears be Ok? Do:
	cvs import src/contrib/netcat OPENBSD OPENBSD_<release>
   (note: recently we import from OpenBSD's release branches
    rather than importing -HEAD snapshots)
9. Resolve the conflicits with the patchset obtained in step 6.
d5 10
a14 1
delphij@@FreeBSD.org - 21 Apr 2008
@


1.2.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.2.2.2
log
@SVN rev 207040 on 2010-04-22 00:28:49Z by delphij

MFC: netcat 4.7.
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.2.2.1 2009/08/03 08:13:06 kensmith Exp $
@


1.2.2.1.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.1
log
@Add instructions about upgrading netcat(1).
@
text
@d12 1
a12 1
	cvs -n import src/contrib/netcat OPENBSD OPENBSD_<date>
d14 3
a16 1
	cvs import src/contrib/netcat OPENBSD OPENBSD_<date>
d19 1
a19 1
delphij@@FreeBSD.org - 06 Feb 2005
@


1.1.4.1
log
@Switch importer
@
text
@d1 1
a1 1
$FreeBSD: stable/6/contrib/netcat/FREEBSD-upgrade 141399 2005-02-06 15:26:44Z delphij $
@


1.1.12.1
log
@SVN rev 205563 on 2010-03-23 23:09:38Z by delphij

MFC: nc from OpenBSD 4.6.
@
text
@d1 1
a1 1
$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.1 2005/02/06 15:26:44 delphij Exp $
@


1.1.24.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.1.22.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.1.20.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.1.18.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.1.2.1
log
@MFC:	Import of OpenBSD's nc(1)
@
text
@@

