Date: Sat, 4 Sep 2021 21:55:12 -0400 From: Ed Maste <emaste@freebsd.org> To: FreeBSD Hackers <freebsd-hackers@freebsd.org> Subject: Re: OpenSSH 8.7p1 update for the base system Message-ID: <CAPyFy2DjdYFRjcFJxZoW4P9pcKZJWjo%2BJXtEtexiXkOUwKkv3g@mail.gmail.com> In-Reply-To: <CAPyFy2A390kS_C3g=Y9QhQcJ06z_FKUxXsNvi9g2CdWF24pukg@mail.gmail.com> References: <CAPyFy2A390kS_C3g=Y9QhQcJ06z_FKUxXsNvi9g2CdWF24pukg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 4 Sept 2021 at 11:59, Ed Maste <emaste@freebsd.org> wrote: > > I'm preparing to update OpenSSH in the FreeBSD base system to 8.7p1, > and am sharing an initial patch for testing. ... > Also as a diff against main: > https://people.freebsd.org/~emaste/openssh/FreeBSD-base-openssh-8.7p1-20210904-114623.diff It turns out there is a renamed file that confuses patch. If you've applied this patch you should be able to rectify it by running: mv crypto/openssh/openbsd-compat/realpath.c \ crypto/openssh/sftp-realpath.c If you haven't applied the patch yet I've regenerated it. with --no-renames, here: https://people.freebsd.org/~emaste/openssh/FreeBSD-base-openssh-8.7p1-20210904-215057.diff
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2DjdYFRjcFJxZoW4P9pcKZJWjo%2BJXtEtexiXkOUwKkv3g>