From nobody Mon Apr 27 04:19:07 2026 X-Original-To: dev-commits-ports-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 4g3r1818jPz6bg53 for ; Mon, 27 Apr 2026 04:19:08 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3r180Vwnz3v7b for ; Mon, 27 Apr 2026 04:19:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777263548; 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=9KIFsxRpGmnJhjHEpP1TsaHQDCj8sXToroQQXVX+NUc=; b=x1IHfUYOH0INuEYsNyhMnqvI4+fGsevgPKUEwG+xL27aYG/3QBndjWY+yxnwzktsGZ0XRb xfGSkczr54YvDUP5bPtubhTyLO79gXbaRqjRGU0I+/sltxXllnL238I8pSeKL7d9fOIl4d /zeKrpN7OolRkFe9v3kMlskgES6ScKzgNdv04LV4VzYzEstNcBHDmPShKUNnueXMlQkIBB 7c8l/dNtftkr4Cw3dhhYpfPdwe+0ORo6NPCIJPYMeehogO5FuH4ix0X/VX9IRQMiHRbWjY W/vlghnMuenYsARDOBVTkSsTQDK3fskFXWHr33NiQ0POLswOxQ6ASO1CMRv9WQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777263548; a=rsa-sha256; cv=none; b=PHwesfSH41Vo6YnWe9mXrBz34H3LMZ7zjsRuJDed2neSfZA424ICqAzZbDYXkEREtOP6i/ UgZrPEfLUjKTpLNTnUu4z8iqPN4TcP+WhZ743pVj1DRW39pLIbYEivz6hFTMxvGeZECqZU y6qvRYaxq0/4o2cpq/qc1taZa/ROxXoWVCGz7pzGDPDcWRV8Pg0BNFz1oBGKY0+QGmHQ6b /l7VeSmTI6HjRyzkHfflLkHBj/RROrSJTlC47+IGVw367AV01nz6GCIHzTAt0DffT/aSMM yiCt1wLbNjk+CX5BgJSw13auUWk5VcxuToa2By/PJY+BzUyFvlazgxfLe8eCdA== 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=1777263548; 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=9KIFsxRpGmnJhjHEpP1TsaHQDCj8sXToroQQXVX+NUc=; b=qEv31MCsQPckzgsYzKC0T/lmENHccyOfnHb123F1wA5nGeT+JclgeRLpYhDmSoMwdTDu31 TorVUPKdg9JaInwYrR/r2tlAk66cg/jJebQ5I5oNjN8+u3ze5Im9PbxBRUlTbouVLMRrAu ftljEPpikUDIxQu0QSIPJpiviPTq7qlcqCLyLcxmPRVlb/Ri0KkF9m2QV/BJfr1x9rhVLN fBYSh0IqC40WI1Db+Ow2ueDuQ0h3G3TI2ewi17oAS2a62LqASLaxAEv56OLZ/lRXkCq6Sz 5kgPoqAGAdQ+YdsWVmFuU3FJot8ijc6B5SFTcdeQ51eqjItax1ZI0WB8lTXTcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3r176mMlzrPq for ; Mon, 27 Apr 2026 04:19:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 18596 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 27 Apr 2026 04:19:07 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 294be7ad9ef5 - main - security/openssh-portable: Fix blacklistd/HPN glue patch. List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 294be7ad9ef5106b696d830e06b9f322bd79d6f5 Auto-Submitted: auto-generated Date: Mon, 27 Apr 2026 04:19:07 +0000 Message-Id: <69eee3bb.18596.5ea2869b@gitrepo.freebsd.org> The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=294be7ad9ef5106b696d830e06b9f322bd79d6f5 commit 294be7ad9ef5106b696d830e06b9f322bd79d6f5 Author: Bryan Drewery AuthorDate: 2026-04-27 04:09:18 +0000 Commit: Bryan Drewery CommitDate: 2026-04-27 04:19:00 +0000 security/openssh-portable: Fix blacklistd/HPN glue patch. Reported by: leres Fixes: 899a7de9a078 --- .../files/extra-patch-no-blocklistd-hpn-glue | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/security/openssh-portable/files/extra-patch-no-blocklistd-hpn-glue b/security/openssh-portable/files/extra-patch-no-blocklistd-hpn-glue index 1059f57cc88b..3b4609039580 100644 --- a/security/openssh-portable/files/extra-patch-no-blocklistd-hpn-glue +++ b/security/openssh-portable/files/extra-patch-no-blocklistd-hpn-glue @@ -1,9 +1,9 @@ ---- sshd-session.c.orig 2025-10-11 10:16:00.048273000 -0700 -+++ sshd-session.c 2025-10-11 10:16:02.937735000 -0700 -@@ -149,6 +149,12 @@ static int have_agent = 0; - /* Daemon's agent connection */ - int auth_sock = -1; - static int have_agent = 0; +--- sshd-auth.c.orig 2026-04-26 20:56:18.236716000 -0700 ++++ sshd-auth.c 2026-04-26 20:58:14.385157000 -0700 +@@ -167,6 +167,12 @@ static struct ssh_sandbox *box; + #ifndef HAVE_PLEDGE + static struct ssh_sandbox *box; + #endif + +/* + * This is compiled WITHOUT blocklistd support. This is done for patch @@ -11,10 +11,10 @@ + */ +#define BLACKLIST_NOTIFY(...) - /* - * Any really sensitive data in the application is contained in this -@@ -1275,8 +1281,10 @@ main(int ac, char **av) - } + /* XXX stub */ + int +@@ -812,8 +818,10 @@ do_ssh2_kex(struct ssh *ssh) + free(hkalgs); if ((r = kex_exchange_identification(ssh, -1, - options.version_addendum)) != 0) @@ -22,6 +22,6 @@ + BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, "Banner exchange"); sshpkt_fatal(ssh, r, "banner exchange"); + } + mm_sshkey_setcompat(ssh); /* tell monitor */ - ssh_packet_set_nonblocking(ssh); - + if ((ssh->compat & SSH_BUG_NOREKEY))