FREEBSD-upgrade (9b7eddfeed465d4062dbad178261b806e97d6b62) FREEBSD-upgrade (c755a7cc1edea3875ae6910226e0bee0f0edb170)
1 FreeBSD maintainer's guide to OpenSSH-portable
2 ==============================================
3
4 These instructions assume you have a clone of the FreeBSD git repo
5 main branch in src/freebsd/main, and will store vendor trees under
6 src/freebsd/vendor/. In addition, this assumes there is a "freebsd"
7 origin pointing to git(repo).freebsd.org/src.git.
8

--- 52 unchanged lines hidden (view full) ---

61 $ git subtree merge -P crypto/openssh vendor/openssh
62
63 A number of files have been deleted from FreeBSD's copy of ssh,
64 including rendered man pages (which have a .0 extension). When
65 git prompts for these deleted files during the merge, choose 'd'
66 (leaving them deleted).
67
6810) Resolve conflicts. Remember to bump the version addendum in
1 FreeBSD maintainer's guide to OpenSSH-portable
2 ==============================================
3
4 These instructions assume you have a clone of the FreeBSD git repo
5 main branch in src/freebsd/main, and will store vendor trees under
6 src/freebsd/vendor/. In addition, this assumes there is a "freebsd"
7 origin pointing to git(repo).freebsd.org/src.git.
8

--- 52 unchanged lines hidden (view full) ---

61 $ git subtree merge -P crypto/openssh vendor/openssh
62
63 A number of files have been deleted from FreeBSD's copy of ssh,
64 including rendered man pages (which have a .0 extension). When
65 git prompts for these deleted files during the merge, choose 'd'
66 (leaving them deleted).
67
6810) Resolve conflicts. Remember to bump the version addendum in
69 version.h, and update the default value in ssh{,d}_config and
70 ssh{,d}_config.5.
69 version.h, and update the default value in sshd_config and
70 sshd_config.5.
71
7211) Diff against the vendor branch:
73
74 $ git diff --diff-filter=M vendor/openssh/X.YpZ HEAD:crypto/openssh
75
76 Review the diff for any unexpected changes.
77
7812) Run the configure script:

--- 105 unchanged lines hidden --- 		71
7211) Diff against the vendor branch:
73
74 $ git diff --diff-filter=M vendor/openssh/X.YpZ HEAD:crypto/openssh
75
76 Review the diff for any unexpected changes.
77
7812) Run the configure script:

--- 105 unchanged lines hidden ---