From nobody Thu Feb 20 23:42:32 2025 X-Original-To: dev-commits-src-main@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 4YzVDT2RLMz5pb70; Thu, 20 Feb 2025 23:42:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YzVDT18qhz3wrh; Thu, 20 Feb 2025 23:42:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740094953; 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=/tBnHPrrdFFfyx2hLutlOOka5V3g90ARAWCIVvFF4D0=; b=oi89Ogw183Pmfx8bMsjVngNjXAerjnaG5EGqcv1sr6VQKh2/vhTfxNYJXd9rVbwGreLrZY GC0uxGN3MvUgB1lMZGSLaLEtrUJL/ORszIJMeVhc18eOhXSU8uS9I95/t44jrv1KpOyZ2R X/4v37S0K3Z/iY6Jg37d87SagBUeMIriqbxZxQUcGFh7i6MSqxLQk6gFT3tCS3LD+hhbh1 bxHmbDISHOmfGjsJFyf7WpCyc+vDefA5B9kGx2pL5nyQsEn/b++0207NJD74M0I9iOvEIE Z/HSBOTutSzO2GiHs1bXQwb1lQVFVR9gJDSe8eY4e7fCcFNmx1mgNI669a5THw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740094953; a=rsa-sha256; cv=none; b=AuuBHqe1SSgP5JHCze33fSdRfvWbxod2Q8t/rvAeDo/FTlGXWr0SNM9CQHWbwbrwzECKqW h411VUgQkQHLMdrj0HClPPkzB/xJ54D/Gc3Qtl7OQK5GNdXExSEPFO/dgI/zp28TAY/rTi 8eYJ7PJSLoXD5eUlPDo7SaRhXolSP3kARokTKlW1Alfp1s61juMPtGvk0k7tpv+SuBKfVG fBu+mJBVWSseb0u+O9TQUcRZM8i3eZzkVD903VPwQPgolNgHc56ZMqtxRMC3OQvxGHcijl fGWEIUYTY0hDfQ502tEeN/sc/b4EdHtO1WhjdKUBCKyXV1mdWtgAelrBqvG5vw== 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=1740094953; 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=/tBnHPrrdFFfyx2hLutlOOka5V3g90ARAWCIVvFF4D0=; b=rfGP+/CyJzrLzXzBCyqpBFNJo4eZ7d6K66Jf97tBq4YeonVkiLi8gHdzBTZQKnwj4sSbd/ xaspoe9q56QOFM22LKfWy1YwH0KyXNTrBtP0Pk5OOYca0NhkvjWRTAX6u7/Wvy80rBkmlV 8w5xhw5i8I/mvIurBOQ90786IJGszmYpjEU7Bg9JIanmu8zj4fikrNdWd48+vQ3YftVz8G eA5EGWQx2JxKrwMqC+3N5xTV6c0Sk0T2YbLk8xr4SNwH5zLG3PAbfDk3/KXr0B1Io/wvDc EHERcMV/29yi2kk0JrVOoq1eD3QexnbsbDsJzG/1tsnSE+0uK/UDPoOJGC5HNw== 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 4YzVDT06XHz1CVn; Thu, 20 Feb 2025 23:42:33 +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 51KNgWUZ023057; Thu, 20 Feb 2025 23:42:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51KNgWpj023054; Thu, 20 Feb 2025 23:42:32 GMT (envelope-from git) Date: Thu, 20 Feb 2025 23:42:32 GMT Message-Id: <202502202342.51KNgWpj023054@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 79979aa44d1b - main - ssh: Remove reference to now-upstreamed patch List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 79979aa44d1b7fd5d04fd574ba8702f76c81c80c Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=79979aa44d1b7fd5d04fd574ba8702f76c81c80c commit 79979aa44d1b7fd5d04fd574ba8702f76c81c80c Author: Ed Maste AuthorDate: 2025-02-20 23:40:52 +0000 Commit: Ed Maste 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