Date: Tue, 23 Mar 2010 23:56:22 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r205570 - head/contrib/netcat Message-ID: <201003232356.o2NNuMVA027261@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Tue Mar 23 23:56:22 2010 New Revision: 205570 URL: http://svn.freebsd.org/changeset/base/205570 Log: Update metadata information as well as upgrade instructions. Modified: head/contrib/netcat/FREEBSD-upgrade head/contrib/netcat/FREEBSD-vendor Modified: head/contrib/netcat/FREEBSD-upgrade ============================================================================== --- head/contrib/netcat/FREEBSD-upgrade Tue Mar 23 23:46:28 2010 (r205569) +++ head/contrib/netcat/FREEBSD-upgrade Tue Mar 23 23:56:22 2010 (r205570) @@ -1,19 +1,14 @@ $FreeBSD$ -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. +Most of the instructions is outlined on FreeBSD wiki at: -delphij@FreeBSD.org - 21 Apr 2008 + 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 Modified: head/contrib/netcat/FREEBSD-vendor ============================================================================== --- head/contrib/netcat/FREEBSD-vendor Tue Mar 23 23:46:28 2010 (r205569) +++ head/contrib/netcat/FREEBSD-vendor Tue Mar 23 23:56:22 2010 (r205570) @@ -1,5 +1,5 @@ # $FreeBSD$ Project: netcat (aka src/usr.bin/nc in OpenBSD) ProjectURL: http://www.openbsd.org/ -Version: 4.6 +Version: 4.7 License: BSD
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201003232356.o2NNuMVA027261>