Date: Tue, 26 Dec 2023 13:11:49 -0800 From: Craig Leres <leres@freebsd.org> To: Gordon Tetlow <gordon@FreeBSD.org>, ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: Re: git: 277b9fe50d9e - main - security/openssh-portable: Update to 9.6p1 Message-ID: <62df1bfe-6cfa-4bf4-a49b-2acae89a7c13@freebsd.org> In-Reply-To: <202312262051.3BQKpOmO096153@gitrepo.freebsd.org> References: <202312262051.3BQKpOmO096153@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 12/26/23 12:51, Gordon Tetlow wrote: > The branch main has been updated by gordon: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=277b9fe50d9e7f7b21eb2f3b052f8ea22a3d77d2 > > commit 277b9fe50d9e7f7b21eb2f3b052f8ea22a3d77d2 > Author: Gordon Tetlow <gordon@FreeBSD.org> > AuthorDate: 2023-12-26 20:49:13 +0000 > Commit: Gordon Tetlow <gordon@FreeBSD.org> > CommitDate: 2023-12-26 20:49:13 +0000 > > security/openssh-portable: Update to 9.6p1 > > Approved by: bdrewery > Differential Revision: https://reviews.freebsd.org/D43132 > --- > security/openssh-portable/Makefile | 7 +++---- > security/openssh-portable/distinfo | 8 +++----- > .../openssh-portable/files/extra-patch-hpn-compat | 16 +++++++-------- > security/openssh-portable/files/patch-ssh-agent.c | 24 +++++++++++----------- > security/openssh-portable/files/patch-ssh_config | 17 --------------- > 5 files changed, 26 insertions(+), 46 deletions(-) This doesn't build for me, looks like some patchsets (e.g. HPN) need updating? I have FIDO_U2F, HPN, LDNS, and PAM enabled (no kerberos). Craig zinc 9 @ make ===> License OPENSSH accepted by the user ===> openssh-portable-9.6.p1_1,1 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by openssh-portable-9.6.p1_1,1 for building ===> Extracting for openssh-portable-9.6.p1_1,1 => SHA256 Checksum OK for openssh-9.6p1.tar.gz. ===> Patching for openssh-portable-9.6.p1_1,1 ===> Applying extra patch /usr/ports/security/openssh-portable/files/extra-patch-ldns ===> Applying extra patch /usr/ports/security/openssh-portable/files/extra-patch-pam-sshd_config ===> Applying extra patch /usr/ports/security/openssh-portable/files/extra-patch-hpn with -p2 3 out of 3 hunks failed--saving rejects to clientloop.c.rej 1 out of 3 hunks failed--saving rejects to kex.c.rej 1 out of 1 hunks failed--saving rejects to version.h.rej ===> FAILED Applying extra patch /usr/ports/security/openssh-portable/files/extra-patch-hpn with -p2 *** Error code 1 Stop. make: stopped in /usr/ports/security/openssh-portable
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?62df1bfe-6cfa-4bf4-a49b-2acae89a7c13>