From nobody Sat Aug 17 03:36:10 2024 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 4Wm4Jp5B0Yz5V5KC; Sat, 17 Aug 2024 03:36:10 +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 4Wm4Jp2QD6z4pXH; Sat, 17 Aug 2024 03:36:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723865770; 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=AOIX3aM3UPhBpm8O0Li6l1jL84bZUgoS+GzNyWO2TTU=; b=Wg2an/VIExVgJG7uH9dJOSuGG92X7M3sBQS9ZzCQXPTLx+LFCMoBuDdCdZWOj9971Rz3DJ jvRRiyK656n2jBCCQpvawzkl9beNZGauveyCEVzRHoZS0RdvRJssVBCXJF4rNSAk6D6+hT B+G2Kr7X70B2EBgR8NQih2/zsMN+heLIh25qTijt2qcNtpe6pDrhx/oRSc1hOmt55csHGx xp44razgpuKnfzTRPbDCWPyi60/8MXQw/5boTjNBe7zte2M3iWtAWNasrsh7vcFhwwivly W2jcrLvZQr7jOs16gTRe9KmxA1m24fqxP9wXXhGzweW56X3/saEfyW8fNi4wGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723865770; a=rsa-sha256; cv=none; b=pxyUz7WRiI1gwCgMOxecFYAmnz9Z/pXrWcXJefE3qD3yFhtxHKZuYdH4fylrPz0mLEdtqm Cl9rqq8+09yQeaYi06asaN7NbLdaRrr/wCfzAQJfR3sPJizhRAqunLT92/B4LleDfyGOjp h9btW0rOvAtzwS2M1ynYEFMNSgoMPPrv/pKJgIlUzlsH13EAyARZ38Rg5K9Sauc5WzvCpP li58PNyS2Ct2XoBy+MsDxiTGWChR8nlYxMuxacO94kpLsyAkzFUwp8hwN3GVsioSyFCk4n QJaPgo5i1vutHTHF+B5uPheX7gTtg3y7APO/K842bco0MIKAy6BktPdzrCohfw== 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=1723865770; 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=AOIX3aM3UPhBpm8O0Li6l1jL84bZUgoS+GzNyWO2TTU=; b=CvA2SXVw7zP4aXrEgA9k62Z8EJadwkLR1yZfAfz4sLNBt3FLtnEBb0podga5MPm72tiwU5 ZBElLGtm9JVcW8IbojRimV9FtdS23vFeL2eCaVTE/7mpt0qw/iXfVced0NoR2JyWnCH/2v c/5+KNPyj9+HSiVp4/8hrc45Wg9MfgDGXOLp+3Ib5k1q5QFJUrijAjv1wPdaNu1XSwS5So ZOqCETt+Gwb4KSJNxvAR76uf5swzW2lc64Csc7dYFQY+E7uO5+acU5mMyjS+zaVLMYQQ/7 lei1cl4+kEYe6HbmFQO/wkK5ib4ozJujuqQPNdOKMYWbHQW2dtO+mIbgU9PkHQ== 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 4Wm4Jp1T9HzYqf; Sat, 17 Aug 2024 03:36:10 +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 47H3aAZ2002314; Sat, 17 Aug 2024 03:36:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47H3aAiL002311; Sat, 17 Aug 2024 03:36:10 GMT (envelope-from git) Date: Sat, 17 Aug 2024 03:36:10 GMT Message-Id: <202408170336.47H3aAiL002311@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: 7ba88c964b6e - main - security/openssh-portable: fix missing include for sshd.c 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: 7ba88c964b6e5724eec462021d984da3989e6a08 Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=7ba88c964b6e5724eec462021d984da3989e6a08 commit 7ba88c964b6e5724eec462021d984da3989e6a08 Author: Nikola Knezevic AuthorDate: 2024-08-14 08:44:05 +0000 Commit: Bryan Drewery CommitDate: 2024-08-17 03:31:32 +0000 security/openssh-portable: fix missing include for sshd.c This patch adds a missing include for `channels.h`. It is needed, as later in the file there is a call to `channel_set_hpn`, which is declared in `channels.h`. Some ISO C99 compilers may complain about implicit function declaration. --- security/openssh-portable/Makefile | 2 +- security/openssh-portable/files/extra-patch-hpn | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index cdaad70b4195..482ed3798104 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -1,6 +1,6 @@ PORTNAME= openssh DISTVERSION= 9.8p1 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= OPENBSD/OpenSSH/portable diff --git a/security/openssh-portable/files/extra-patch-hpn b/security/openssh-portable/files/extra-patch-hpn index bede23fdb4bf..c41368af72fb 100644 --- a/security/openssh-portable/files/extra-patch-hpn +++ b/security/openssh-portable/files/extra-patch-hpn @@ -1172,6 +1172,16 @@ diff -urN -x configure -x config.guess -x config.h.in -x config.sub work.clean/o ssh_remote_ipaddr(ssh), ssh_remote_port(ssh), --- work/openssh/sshd.c.orig 2024-06-30 21:36:28.000000000 -0700 +++ work/openssh/sshd.c 2024-07-01 14:03:40.471948000 -0700 +@@ -75,6 +75,9 @@ + #include "log.h" + #include "sshbuf.h" + #include "misc.h" ++#ifdef HPN_ENABLED ++#include "channels.h" ++#endif + #include "servconf.h" + #include "compat.h" + #include "digest.h" @@ -742,6 +742,10 @@ listen_on_addrs(struct listenaddr *la) int ret, listen_sock; struct addrinfo *ai;