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

Add a note about deleted files in OpenSSH upgrade instructions

Browse Source
This commit is contained in:
Ed Maste 2020-02-25 22:15:25 +00:00
parent f55185bcd8
commit 99b201c331
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crypto/openssh/FREEBSD-upgrade
View File

@ -46,6 +46,11 @@
$ svn merge -cNNNNNN \^/vendor-crypto/openssh/dist . $ svn merge -cNNNNNN \^/vendor-crypto/openssh/dist .
A number of files have been deleted from FreeBSD's copy of ssh,
including rendered man pages (which have a .0 extension). When
svn prompts for these deleted files during the merge, choose 'r'
(leaving them deleted).
0A) Resolve conflicts. Remember to bump the version addendum in 0A) Resolve conflicts. Remember to bump the version addendum in
version.h, and update the default value in ssh{,d}_config and version.h, and update the default value in ssh{,d}_config and
ssh{,d}_config.5. ssh{,d}_config.5.