Date: Tue, 26 Dec 2023 13:25:55 -0800 From: Gordon Tetlow <gordon@tetlows.org> To: Craig Leres <leres@freebsd.org> Cc: Gordon M Tetlow <gordon@FreeBSD.org>, "ports-committers@freebsd.org" <ports-committers@FreeBSD.org>, "dev-commits-ports-all@freebsd.org" <dev-commits-ports-all@FreeBSD.org>, "dev-commits-ports-main@freebsd.org" <dev-commits-ports-main@FreeBSD.org> Subject: Re: git: 277b9fe50d9e - main - security/openssh-portable: Update to 9.6p1 Message-ID: <985C8519-5D1D-4275-A716-9DA1F76ADFC8@tetlows.org> In-Reply-To: <62df1bfe-6cfa-4bf4-a49b-2acae89a7c13@freebsd.org> References: <202312262051.3BQKpOmO096153@gitrepo.freebsd.org> <62df1bfe-6cfa-4bf4-a49b-2acae89a7c13@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On Dec 26, 2023, at 1:11 PM, Craig Leres <leres@freebsd.org> wrote: >=20 > 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=3D277b9fe50d9e7f7b21eb2f3b052f8e= a22a3d77d2 >> 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(-) >=20 > 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). >=20 > Craig >=20 > zinc 9 @ make > =3D=3D=3D> License OPENSSH accepted by the user > =3D=3D=3D> openssh-portable-9.6.p1_1,1 depends on file: = /usr/local/sbin/pkg - found > =3D=3D=3D> Fetching all distfiles required by = openssh-portable-9.6.p1_1,1 for building > =3D=3D=3D> Extracting for openssh-portable-9.6.p1_1,1 > =3D> SHA256 Checksum OK for openssh-9.6p1.tar.gz. > =3D=3D=3D> Patching for openssh-portable-9.6.p1_1,1 > =3D=3D=3D> Applying extra patch = /usr/ports/security/openssh-portable/files/extra-patch-ldns > =3D=3D=3D> Applying extra patch = /usr/ports/security/openssh-portable/files/extra-patch-pam-sshd_config > =3D=3D=3D> 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 > =3D=3D=3D> FAILED Applying extra patch = /usr/ports/security/openssh-portable/files/extra-patch-hpn with -p2 > *** Error code 1 >=20 > Stop. > make: stopped in /usr/ports/security/openssh-portable Sorry for that. At the moment, I=E2=80=99m not sure HPN is in the cards. = I=E2=80=99ve marked the port as broken with HPN is selected. Gordon
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?985C8519-5D1D-4275-A716-9DA1F76ADFC8>