From nobody Tue Dec 26 21:25:55 2023 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 4T079h3m19z55YkW for ; Tue, 26 Dec 2023 21:26:00 +0000 (UTC) (envelope-from gordon@tetlows.org) Received: from mr85p00im-ztdg06021201.me.com (mr85p00im-ztdg06021201.me.com [17.58.23.189]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4T079h1gyqz3XyX for ; Tue, 26 Dec 2023 21:26:00 +0000 (UTC) (envelope-from gordon@tetlows.org) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tetlows.org; s=sig1; t=1703625958; bh=dU805UD4Kv2ZG+8evzC/RGxOLVhVtQWUqHAqWZNyMV4=; h=Content-Type:Mime-Version:Subject:From:Date:Message-Id:To; b=WoKlrdZb8pM31fzR4RDCYBFTtQuYznhctwQMvROJBC3qwcj08C4cJvXmFsIetlIJT VBIxK3zjZdI5olhmHQsREzrludcza9Y0kwj32QBFaYUTnyF7CuJ/BwIrWwrA/8vGDV Hzve8oLFefzdZVcMWEsPqUa5Rr3e41iTBtVN18vjc420XcOxMvF0CDgMCh/qD3P66R Zd9VumPybzeZhS22x4CgxyDVinTiYOGG01eTFpjdhyW+3tpZdrmaeHEGZcdr5HcsjI z1X87r2m7hHxlK87kHU4OynDmTxqP27hvFjpf61XPPRF9f+mXz78nelA0Ylz3Zv4qW vPT+fzjnYUE2w== Received: from smtpclient.apple (mr38p00im-dlb-asmtp-mailmevip.me.com [17.57.152.18]) by mr85p00im-ztdg06021201.me.com (Postfix) with ESMTPSA id 0675F32006F; Tue, 26 Dec 2023 21:25:57 +0000 (UTC) Content-Type: text/plain; charset=utf-8 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: 277b9fe50d9e - main - security/openssh-portable: Update to 9.6p1 From: Gordon Tetlow In-Reply-To: <62df1bfe-6cfa-4bf4-a49b-2acae89a7c13@freebsd.org> Date: Tue, 26 Dec 2023 13:25:55 -0800 Cc: Gordon M Tetlow , "ports-committers@freebsd.org" , "dev-commits-ports-all@freebsd.org" , "dev-commits-ports-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <985C8519-5D1D-4275-A716-9DA1F76ADFC8@tetlows.org> References: <202312262051.3BQKpOmO096153@gitrepo.freebsd.org> <62df1bfe-6cfa-4bf4-a49b-2acae89a7c13@freebsd.org> To: Craig Leres X-Mailer: Apple Mail (2.3731.700.6) X-Proofpoint-GUID: KpnsIdHnS_XixE-fNpS0hmTBZevud8j6 X-Proofpoint-ORIG-GUID: KpnsIdHnS_XixE-fNpS0hmTBZevud8j6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-12-26_12,2023-12-26_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 suspectscore=0 spamscore=0 mlxscore=0 malwarescore=0 bulkscore=0 adultscore=0 phishscore=0 clxscore=1030 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2308100000 definitions=main-2312260164 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:714, ipnet:17.58.16.0/20, country:US] X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4T079h1gyqz3XyX > On Dec 26, 2023, at 1:11 PM, Craig Leres 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 >> AuthorDate: 2023-12-26 20:49:13 +0000 >> Commit: Gordon Tetlow >> 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