Update to reflect changes since the last version.

This commit is contained in:
Dag-Erling Smørgrav 2004-01-07 11:51:18 +00:00
parent a04e3d6c30
commit e2fb0b2a6b
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=124213

View File

@ -14,17 +14,23 @@
3) Remove trash:
$ eval "rm -rvf $(tr '[:space:]' ' ' </usr/src/crypto/openssh/FREEBSD-Xlist)"
$ tail +2 /usr/src/crypto/openssh/FREEBSD-Xlist |
while read glob ; do eval "rm -rvf $glob" ; done
Make sure that took care of everything, and if it didn't, make sure
to update FREEBSD-Xlist so you won't miss it the next time.
to update FREEBSD-Xlist so you won't miss it the next time. A good
way to do this is to run a test import and see if any new files
show up:
$ cvs -n import src/crypto/openssh OPENSSH x | grep \^N
4) Import the sources:
$ cvs import src/crypto/openssh OPENSSH OpenSSH_X_YpZ
5) Resolve conflicts. Remember to bump the version number and
addendum in version.h.
addendum in version.h, and update the default value in
ssh{,d}_config and ssh{,d}_config.5.
6) Generate configure and config.h.in:
@ -40,8 +46,7 @@
Note that we don't want to configure OpenSSH for Kerberos using
configure since we have to be able to turn it on or off depending
on the value of MAKE_KERBEROS[45]. Our Makefiles take care of
this.
on the value of NO_KERBEROS. Our Makefiles take care of this.
8) Commit the resulting config.h. Make sure you don't accidentally
commit any other files created by autoconf, autoheader or