Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Feb 2025 23:42:32 GMT
From:      Ed Maste <emaste@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 79979aa44d1b - main - ssh: Remove reference to now-upstreamed patch
Message-ID:  <202502202342.51KNgWpj023054@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=79979aa44d1b7fd5d04fd574ba8702f76c81c80c

commit 79979aa44d1b7fd5d04fd574ba8702f76c81c80c
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2025-02-20 23:40:52 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2025-02-20 23:41:14 +0000

    ssh: Remove reference to now-upstreamed patch
    
    Our class-based login restrictions patch was merged upstream in commit
    c276672fc0e9 ("Class-imposed login restrictions").
    
    Sponsored by:   The FreeBSD Foundation
---
 crypto/openssh/FREEBSD-upgrade | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index ef05c55a37e3..2d0a4e61289b 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -154,28 +154,21 @@
    counting; the agent will automatically exit when the last client
    disconnects.
 
-7) Class-based login restrictions (27ceebbc2402)
-
-   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) Blocklist integration
+7) Blocklist integration
 
    We include blocklist (https://github.com/zoulasc/blocklist) in FreeBSD,
    and ssh is patched to report login failures to it.
 
-9) Paths
+8) Paths
 
    A number of paths are changed to match FreeBSD's configuration (e.g.,
    using /usr/local/ instead of /uxr/X11R6/).
 
-10) Retired patches
+9) Retired patches
 
    We no longer have client-side VersionAddendum.
 
-11) PrintLastLog bugfix
+10) PrintLastLog bugfix
 
    Upstream's autoconf sets DISABLE_LASTLOG if the system does not have
    lastlog.ll_line, but uses it to disable the PrintLastLog configuration



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502202342.51KNgWpj023054>