diff options
| author | delphij <delphij@FreeBSD.org> | 2010-03-23 23:56:22 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2010-03-23 23:56:22 +0000 |
| commit | 2cf63c604b439805c0475dbb5349a7c534c41843 (patch) | |
| tree | e4d45b0ef7c489844f06ad29c2a0bcecc4b6d242 /contrib/netcat | |
| parent | 5a3f07530107271a10e63d07977dcd797b82f8b0 (diff) | |
| download | FreeBSD-src-2cf63c604b439805c0475dbb5349a7c534c41843.zip FreeBSD-src-2cf63c604b439805c0475dbb5349a7c534c41843.tar.gz | |
Update metadata information as well as upgrade instructions.
Diffstat (limited to 'contrib/netcat')
| -rw-r--r-- | contrib/netcat/FREEBSD-upgrade | 27 | ||||
| -rw-r--r-- | contrib/netcat/FREEBSD-vendor | 2 |
2 files changed, 12 insertions, 17 deletions
diff --git a/contrib/netcat/FREEBSD-upgrade b/contrib/netcat/FREEBSD-upgrade index 5a52ebc..33f5ea2 100644 --- a/contrib/netcat/FREEBSD-upgrade +++ b/contrib/netcat/FREEBSD-upgrade @@ -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 diff --git a/contrib/netcat/FREEBSD-vendor b/contrib/netcat/FREEBSD-vendor index c808f5b..f540175 100644 --- a/contrib/netcat/FREEBSD-vendor +++ b/contrib/netcat/FREEBSD-vendor @@ -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 |
