From nobody Tue Feb 08 00:32:46 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E2E6A19B3D5D; Tue, 8 Feb 2022 00:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jt3rG5yQDz3l2V; Tue, 8 Feb 2022 00:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644280366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8X+KIRsYROgZQu40TTb39/GZuPyzbmpDTdZEiJ1tP+s=; b=tPCZGGRq6Gt94YBdSsgBpe34iXeV1T9eR2qa6PI1z59SwjOR49p2gmBjyQOkDTwZp6hD1C a8xDonLltgHhSSjNAbGJHg9wWIcy8YonnYBx2h6AMYmLIJ5Y3oxTVqJBWe6Nfr7DiZT3WP f3PXcNRTFJs/KJjTiEGiTg8XFinE85wLXQGt6sEfKesn0NJvvXydK7ZalR0iuhf9ptYDbz MJsuluTvaTkQmxzE4Idp65Zy8mC/u5OygdxJRQq7DvcPzJbi7tpdTtml1cpSah5aXRcwr9 nhrvYtZ0skyOOpVHkHHZqWg33srwoLC1NSi/OvsudmxVLdneKSc43zIrWpIXWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD2827C19; Tue, 8 Feb 2022 00:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2180WkOv045448; Tue, 8 Feb 2022 00:32:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2180WkSD045447; Tue, 8 Feb 2022 00:32:46 GMT (envelope-from git) Date: Tue, 8 Feb 2022 00:32:46 GMT Message-Id: <202202080032.2180WkSD045447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: e3c87ef0194d - stable/13 - openssh: sync update document with main List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e3c87ef0194d82a22af69cebdc24771ffc3b366b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644280366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8X+KIRsYROgZQu40TTb39/GZuPyzbmpDTdZEiJ1tP+s=; b=HBYkzCXoYrSNuY+DocV11f4XtH7ov+1gRHW91HciprqdWKzf/f4F/bdLqYEdtybBVFI8tm 32x+OWMXQin4vc6ydDntJ8X92bUMefsbnUBQ1RUP0J/C7517xGgPts78eUTu2LxMo3dPWm 6398hIdRGxKQOwX8LYTUv6b9okLN1ywLxQUE7k2Or7Im7gDYhp0Xk2tcigDnfWyICq02qH RqbK0yK7Cvq4qKspUkH5aDaGPWUtQuNvIkSVltEM42feoiNY9wtES790FPc1YG4nnIKNL4 XjGk42za7dHkOqnk4OxHtB0YetU8nbQTMMvXKDqTh7I1DLue0D8AerdNsqh7Vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644280366; a=rsa-sha256; cv=none; b=BoQ4ADnaN0p2w1JyTctmgCxZSvF9CtRjcVFCLmB4em1bo1kRkyo8u6eHdxXRbtMp1hewat TVPISqdEvVRy/lA0DJaJtkeI37om4kZSR86LhbYCOrbPZogeO2iwP2OYADXPO5NALmanUh ztKIPwAyHjHTJJlz9fZjoLfRHNu5aNu/8Dlgx+xBS6Ep0q8cbTXdvXv7sdbUwEwURtRFvD 0+aD7DgSDQmZ18uAkVQpIMfbK+eMWbtVy0+2u3gF1X4PDhhbOyYR5CWAU19+vpCcpEZPYV CEiwgzaLdNUJ6TUOSDIFSpRjk9Qcx4uVYhrQCEAfKAY4yH0qxwrgmpyGwxMBHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e3c87ef0194d82a22af69cebdc24771ffc3b366b commit e3c87ef0194d82a22af69cebdc24771ffc3b366b Author: Ed Maste AuthorDate: 2021-02-22 19:03:28 +0000 Commit: Ed Maste CommitDate: 2022-02-08 00:32:14 +0000 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) --- crypto/openssh/FREEBSD-upgrade | 22 ++++++++++++++++++---- 1 file 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