From nobody Fri Feb 17 18:08:30 2023 X-Original-To: dev-commits-ports-all@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 4PJKYs5LXtz3rFL4; Fri, 17 Feb 2023 18:08:33 +0000 (UTC) (envelope-from ashish@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PJKYs4tXtz3s1T; Fri, 17 Feb 2023 18:08:33 +0000 (UTC) (envelope-from ashish@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676657313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k9DknMBdf1zzNoITQuSIW5RF77UTTIu0yvBrIkoY74E=; b=abVKMiNeHoLl3Bjet5oPQYAFGcJvTO9rcZwuiDnakDzV2Wg3hy/P/UzzwMqBvrTnYOPDZC ufVQIsbKgpURdOYTW7vQUn+VEGPghwXj+mo+LFn64KvP0ILUSso0U6638JQKE9FckcLS/T VGXIELEfASR08qfGr6kuca9u18FOurocC7wCOIpxmbLlYoY8gsfnqF0PYSgu/pyffzfIGB 5fWWHKOsSvHiSU+4KT1bt94dkdniunOsHWrKET2ChI+UFTlDmrrCVAEZlNAH+YXWOWVKFV 79fnaiNtzK08SmTq1RyTwQcsxAjUyhHChhC3bug8PUW0jX0oVoco1Eb1v46JyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676657313; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k9DknMBdf1zzNoITQuSIW5RF77UTTIu0yvBrIkoY74E=; b=M6rMOUqqWZv73CgEi094mpTp3fbiNQwvCqye/PpkfwNIdERYkfTMoyl1NgyPgzBs4TqWCZ u1NsNRYA21JVF83DJT6XfF6lQ47RzR6oXuXTcEvqJRii3Cbsu0S9pUVpaMp+lh48Q4GQAR /f4AuEZPh7kNj8+N4VyEQo36o1YZDiadoRGwvE3TM/pNeGukDu+TDkcChFI+VRBB+n+Di/ 4/M6WazhVQOC5xfvJEcgMI/zkjTfpo0DyNO9JFlz7z1Pidi+Tz27cXD0Y3k7ysdt9egGKV sb1hv7b41FHhpCpzoDoqVTLE6YFpoOtInLgc8OlZt0ZvSrAAal2iC6d3m1AYhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676657313; a=rsa-sha256; cv=none; b=msU/GOTzJFEQPBeQS0nhKurTaEUOOgo5OVKCIPYvfvDAZFcTDvTdi5c7g1wdCkruTcKO+I ZRpTXJUiog+z4fAXLTvcwzn/nOjwnggD53FwBcVtxu6rEYT8omTROLeUuLu9Ym/l5SP51i WCsUx8E2xj//FIXi8GP7xmNyJttk0AdBsQtF0gfSiS5M8eLmzIiak1XSkNkFeaICyfI6er I6AiRTF4Jn09tTgMJzrWd156xaTrS7eYtewXOTB/PGp3oLKw1OkN+BHDCoayStSOK03fMQ 0jXa1GnVIizCVj4CVLVNB17lFG6japjt/q0zwcwii+6JUNHmt0Fft1zBKR96nA== Received: from email.lostca.se (anamika.lostca.se [IPv6:2a01:4f9:3b:505c::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: ashish/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4PJKYs0LNwznmb; Fri, 17 Feb 2023 18:08:32 +0000 (UTC) (envelope-from ashish@FreeBSD.org) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Fri, 17 Feb 2023 23:38:30 +0530 From: Ashish SHUKLA To: Bryan Drewery Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 10491773d880 - main - security/openssh-portable: Upgrade to 9.2p1 In-Reply-To: <202302161924.31GJOLrG002193@gitrepo.freebsd.org> References: <202302161924.31GJOLrG002193@gitrepo.freebsd.org> User-Agent: Roundcube Webmail/1.4.13 Message-ID: <20c01fb43103eb3a6148651ce7cf8418@members.fsf.org> X-Sender: ashish@FreeBSD.org Organization: The FreeBSD Project X-ThisMailContainsUnwantedMimeParts: N 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 > AuthorDate: 2023-02-15 19:43:18 +0000 > Commit: Bryan Drewery > 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 ?=/ 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