d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update metadata information as well as upgrade instructions.

Browse Source
This commit is contained in:
Xin LI 2010-03-23 23:56:22 +00:00
parent b41169fdce
commit d6655439ed
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=205570
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
contrib/netcat/FREEBSD-upgrade
View File

@ -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

2
contrib/netcat/FREEBSD-vendor
View File

@ -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