From nobody Fri Mar 07 15:25:11 2025 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 4Z8VTh4fFWz5pTxd; Fri, 07 Mar 2025 15:25:12 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z8VTh1BmSz3KND; Fri, 07 Mar 2025 15:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741361112; 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=j6beplug1NJ/xO32ieCqIONRHkmUp7+g1svnTZisDHU=; b=j6dYUCljv+TP4riittCd91HPPHnn+FONsyZRG2HXbrfd12xY+217oV3IBF7/sGe1Sw9ttS ow56duMgnKZyDfNJ7AnoDAk5mgU1/7a/MbYyO6TKvRRrVdYxM4hEXjN7+4XcxtbDsQF8CW kANHUXslZGJVffLY8TthGinwvy/4qjGTS6Eil3CyH6v7tT6zRQJvCXuXK2suqXuXzC73VQ qE7vD46J/hJIaAIAJanXsJVXPBR/8vOlEqRwWXjnERFpupJqVK/DzuHxe7EAdS0Gar2Vj6 9VzI6VLwY2JzIlq0XuOjBLUWxwYuNrN1u2XLGyy6j7zmmvbaU4EKXYcCGlFSiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741361112; a=rsa-sha256; cv=none; b=ksHlrer1BSqxjSW6kqT3q7m0A8/lGdrgjIT24DBysiL59CAQb6WcB+YrTij9MfZmOAQ+IF JNKSpPnyouhIkgmuhp+It/nCRnReW2G8I48lLmTr5xUW50WXrx4Hn2f1QuE7n3tzMVYTn7 9u1Wru6nTSanmbC90C2q9cjjXQ4nDSPYy2EuctGN8sQhAlvYXAqcaFRjSPZuEUP/n3PKUx GsjD+B+0KYs3+V2Tx90vqNh/qyftyqVSapJ5c/LvL8+Pry4iREuTJUavAzqxgaWhE20D+q XpaLwBzi2EavXOy9OjLPS3Nrc6H73Y+MIyFMfLvIJGJ0hWsfW9z1g9WjmBnlBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741361112; 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=j6beplug1NJ/xO32ieCqIONRHkmUp7+g1svnTZisDHU=; b=pNrqgTlFrxzr/LUdR1f1BolPNZ6rInIHJLwKNckDGBxfLRG8n8hG160pD4qNFhY1gPbmB7 gfCwBz0ZALLiSMoq4jU2nB4yPxVN0ykliE/6iqFPgBesBOHLA38kaWQn0oRTXllVwKGsG7 Clcui1HRzSdcvhiTraLdsTxQnyTso2Ru2UeL0CwWEBqBHuRdFHQoTIU2HrmEbMm9jBVs1I LWuStFSFiMvTjdkbzeGzRy63OOEmsY4bZHiyuGz57jj0l5Ss3Y/WQHJoxcLVkdpF7ivTXf 2j+No3wy1CUuxJyeN8QYLezt3qMI9p3qyQtHnDFl+oCb2A0UKlNNB4oAKi0NfA== 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 4Z8VTh0Dhbzjth; Fri, 07 Mar 2025 15:25:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 527FPBTe003044; Fri, 7 Mar 2025 15:25:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 527FPBoj003041; Fri, 7 Mar 2025 15:25:11 GMT (envelope-from git) Date: Fri, 7 Mar 2025 15:25:11 GMT Message-Id: <202503071525.527FPBoj003041@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: d2e7a078ba6e - stable/14 - ssh: Remove reference to now-upstreamed patch 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: d2e7a078ba6ef5ccb0c2f6149d77a0eaec5421ea Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d2e7a078ba6ef5ccb0c2f6149d77a0eaec5421ea commit d2e7a078ba6ef5ccb0c2f6149d77a0eaec5421ea Author: Ed Maste AuthorDate: 2025-02-20 23:40:52 +0000 Commit: Ed Maste CommitDate: 2025-03-07 15:24:59 +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 (cherry picked from commit 79979aa44d1b7fd5d04fd574ba8702f76c81c80c) --- 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 2950731c7401..efea4cda77b4 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -154,29 +154,22 @@ 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, but we recognize and ignore the configuration options to avoid breaking existing configurations. -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