Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Aug 2024 03:36:10 GMT
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7ba88c964b6e - main - security/openssh-portable: fix missing include for sshd.c
Message-ID:  <202408170336.47H3aAiL002311@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=7ba88c964b6e5724eec462021d984da3989e6a08

commit 7ba88c964b6e5724eec462021d984da3989e6a08
Author:     Nikola Knezevic <nikola@knezevic.ch>
AuthorDate: 2024-08-14 08:44:05 +0000
Commit:     Bryan Drewery <bdrewery@FreeBSD.org>
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;



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