diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2021-02-22 19:03:28 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2022-02-08 00:32:14 +0000 |
| commit | e3c87ef0194d82a22af69cebdc24771ffc3b366b (patch) | |
| tree | 6df8f3540a4d22220715260f814fdb91d5852ac5 | |
| parent | 14da1cc7ad76d7ff21e38dfd7ea288d0fea62410 (diff) | |
openssh: sync update document with main
(cherry picked from commit 519496a5985549d2935cf296a709b1e726b1b5e5)
(cherry picked from commit 576b477ba41c9916fae3a83e6b4dd98c682a0c2f)
(cherry picked from commit 35a034250896584a63204f60fa57e6eddca049ac)
(cherry picked from commit f3fd88507489f6b80402ab7a0fb195ca9c708334)
(cherry picked from commit b645ee1815daf96ee9512633b55c423bc897b244)
(cherry picked from commit 438fd19dc327400e5fbcebfcb9fe9361b317e791)
| -rw-r--r-- | crypto/openssh/FREEBSD-upgrade | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 0a62d6fa1e2c..ed750a77fcb2 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -39,6 +39,13 @@ $ git tag -a -m "Tag OpenSSH X.YpZ" vendor/openssh/X.YpZ + At this point the vendor branch can be pushed to the FreeBSD repo via: + + $ git push freebsd vendor/openssh + + (It could also be pushed later on, along with the merge to main, but + pushing now allows others to collaborate.) + 08) Check out head and run the pre-merge script, which strips our RCS tags from files that have them: @@ -96,7 +103,12 @@ something significant changes or if ssh_namespace.h is out of whack. -12) Commit, and hunker down for the inevitable storm of complaints. +12) Update nanobsd's copies of the ssh config files: + + tools/tools/nanobsd/rescue/Files/etc/ssh/ssh_config + tools/tools/nanobsd/rescue/Files/etc/ssh/sshd_config + +13) Commit, and hunker down for the inevitable storm of complaints. @@ -161,10 +173,12 @@ counting; the agent will automatically exit when the last client disconnects. -7) Class-based login restrictions +7) Class-based login restrictions (27ceebbc2402) - We've added code to auth2.c to enforce the host.allow, host.deny, - times.allow and times.deny login class capabilities. + We've added code to auth.c to enforce the host.allow, host.deny, + times.allow and times.deny login class capabilities, based on an + upstream submission from + https://github.com/openssh/openssh-portable/pull/262. 8) HPN |