Re: git: 10491773d880 - main - security/openssh-portable: Upgrade to 9.2p1

On 2023-02-17 00:54, Bryan Drewery wrote:
> The branch main has been updated by bdrewery:
> 
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=10491773d88012fe81d9c039cbbba647bde9ebc9
> 
> commit 10491773d88012fe81d9c039cbbba647bde9ebc9
> Author:     Bryan Drewery <bdrewery@FreeBSD.org>
> AuthorDate: 2023-02-15 19:43:18 +0000
> Commit:     Bryan Drewery <bdrewery@FreeBSD.org>
> CommitDate: 2023-02-16 19:23:04 +0000
> 
>     security/openssh-portable: Upgrade to 9.2p1
> 
>     Changes: https://www.openssh.com/txt/release-9.2
> ---
>  security/openssh-portable/Makefile                 |  5 ++--
>  security/openssh-portable/distinfo                 | 10 +++----
>  security/openssh-portable/files/extra-patch-hpn    | 32 
> +++++++++++-----------
>  .../openssh-portable/files/extra-patch-hpn-compat  | 18 ++++++------
>  .../files/patch-platform-tracing.c                 | 21 --------------
>  security/openssh-portable/files/patch-ssh-agent.c  | 24 
> ++++++++--------
>  6 files changed, 45 insertions(+), 65 deletions(-)
> 
> diff --git a/security/openssh-portable/Makefile
> b/security/openssh-portable/Makefile
> index 1b31a37aa422..4c0c4a940024 100644
> --- a/security/openssh-portable/Makefile
> +++ b/security/openssh-portable/Makefile
> @@ -1,5 +1,5 @@
>  PORTNAME=	openssh
> -DISTVERSION=	9.1p1
> +DISTVERSION=	9.2p1
>  PORTREVISION=	0
>  PORTEPOCH=	1
>  CATEGORIES=	security
> @@ -108,7 +108,8 @@ 
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-hpn-gss-glue
>  .  endif
>  # - See https://sources.debian.org/data/main/o/openssh/ for which 
> subdir to
>  # pull from.
> -GSSAPI_DEBIAN_SUBDIR=	${DISTVERSION}-2
> +GSSAPI_DEBIAN_VERSION=	9.2p1
> +GSSAPI_DEBIAN_SUBDIR=	${GSSAPI_DEBIAN_VERSION:U${DISTVERSION}}-2
>  # - Debian does not use a versioned filename so we trick fetch to make 
> one for
>  # us with the ?<anything>=/ trick.
> 
> PATCH_SITES+=	https://sources.debian.org/data/main/o/openssh/1:${GSSAPI_DEBIAN_SUBDIR}/debian/patches/gssapi.patch?dummy=/:gsskex
> diff --git a/security/openssh-portable/distinfo
> b/security/openssh-portable/distinfo
> index 5b2a5590e2a5..fbd9733b60d3 100644
> --- a/security/openssh-portable/distinfo
> +++ b/security/openssh-portable/distinfo
> @@ -1,5 +1,5 @@
> -TIMESTAMP = 1675460254
> -SHA256 (openssh-9.1p1.tar.gz) =
> 19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288
> -SIZE (openssh-9.1p1.tar.gz) = 1838747
> -SHA256 (openssh-9.1p1-gsskex-all-20141021-debian-rh-20220203.patch) =
> 98202e8c36d7a2fd75b6247c22e44267f3812e83d8d22789f7ed1e142f4aa771
> -SIZE (openssh-9.1p1-gsskex-all-20141021-debian-rh-20220203.patch) = 
> 127232
> +TIMESTAMP = 1676575062
> +SHA256 (openssh-9.2p1.tar.gz) =
> 3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46
> +SIZE (openssh-9.2p1.tar.gz) = 1852380
> +SHA256 (openssh-9.2p1-gsskex-all-20141021-debian-rh-20220203.patch) =
> acf9b12d68eeeae047d1042954473f859c10a7c2a4b5d9dc54fcbbd5e30a3a58
> +SIZE (openssh-9.2p1-gsskex-all-20141021-debian-rh-20220203.patch) = 
> 131618
> diff --git a/security/openssh-portable/files/extra-patch-hpn
> b/security/openssh-portable/files/extra-patch-hpn
> index 907775d94642..1f25a207b00b 100644
> --- a/security/openssh-portable/files/extra-patch-hpn
> +++ b/security/openssh-portable/files/extra-patch-hpn
> @@ -131,9 +131,9 @@ diff -urN -x configure -x config.guess -x
> config.h.in -x config.sub work.clean/o
>  +	 (tasota@gmail.com) an NSF REU grant recipient for 2013.
>  +	 This work was financed, in part, by Cisco System, Inc., the 
> National
>  +         Library of Medicine, and the National Science Foundation.
> ---- work/openssh/channels.c.orig	2021-04-15 20:55:25.000000000 -0700
> -+++ work/openssh/channels.c	2021-04-28 14:35:20.732518000 -0700
> -@@ -220,6 +220,12 @@ static int rdynamic_connect_finish(struct ssh *, 
> Chann
> +--- channels.c.orig	2023-02-02 04:21:54.000000000 -0800
> ++++ channels.c	2023-02-03 10:45:34.136793000 -0800

Please excuse me, but is this mixed/inconsistent strip-prefixed (patch 
-pX) patch appropriate, i.e. other diffs in the file (extra-patch-hpn) 
need -p2, but this one is -p0 ?

Thanks!
-- 
Ashish SHUKLA | GPG: F682 CDCC 39DC 0FEA E116  20B6 C746 CFA9 E74F A4B0