From nobody Mon Mar 7 23:03:41 2022 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 B06A41A0D38E; Mon, 7 Mar 2022 23:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KCDXY4PZjz4fQc; Mon, 7 Mar 2022 23:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646694221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4t5cif1pbCnU0EzjyLFheynPU6YqvLO/UCmw3i4hC04=; b=cmITLzWztxA0zHd5v9ywCmIDto6/FSiiiwpFkRATb318ardIsxN83jztg97nKrCK5E8Tgl kNoNxJKuwt97/0GuuYhcGUqslurwcEADZYKLfNucZJm14cEEATUSbU54uqzgItax/yPlgX OuD4WZulSHZZoWRzO5iN4NeqKr2pU183M8Ls/CHMXWlwCkllvPYsofYheyPFfkxDbLYpXT EiGnuRVfqx0OUHscO3+bhMTP46mFwnPbtmYerf1PuWLXy/Ro27s55HSBzezeoTeEdGoCbD nJrxT4zPsZpE4U3E/EBfGCBQPPIfCDCfuXzI64XUw2IY0NLUCxPAf5oZYm3qLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 77031116C0; Mon, 7 Mar 2022 23:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 227N3fD7068002; Mon, 7 Mar 2022 23:03:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 227N3fh1068001; Mon, 7 Mar 2022 23:03:41 GMT (envelope-from git) Date: Mon, 7 Mar 2022 23:03:41 GMT Message-Id: <202203072303.227N3fh1068001@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bryan Drewery Subject: git: df3a937145b1 - main - security/openssh-portable: Fix fetching gssapi patch 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=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: df3a937145b1bef1b3c08515dc6619b12654415f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646694221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4t5cif1pbCnU0EzjyLFheynPU6YqvLO/UCmw3i4hC04=; b=KM6yQnGOPeGJuElZNXKL8Y6xxxB0zhaFop5LSLJtwrV9lr8aVMcW1HjXBF++IKJ6xwWeRa G8fpPubuyRcLLJex8WKK8MNyX+AOpeRO1M3P4wF7H76Ww3jyzihwPLyOqJ/y57C7L+I/6c 0jpc2TD10saYbZsS25zb4UwJvCHa9/b99Jkzc2WD+WZjQtufpWD9wXmDaYxpBSJVwWC7WJ pjfsacjiPSluRkob2Ued4E/F8o9SDyoipiaVHTpaeUt8Qi4zent8LvUDU5PozEeiPzTYbm vr+1rElvTgGGck97EEihbrC/YrTZMZmK1qIX/pdXI1Kk5jXY6FRo6ZiezK+MKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646694221; a=rsa-sha256; cv=none; b=Qis3Sw/iUdQXg5w82NdCfSvptkWb8KOhvqq/aVEVU2RjPwLWpl+Pb5QNRvoayYbUub+Wda pH6HwMnKGi7RljKHSi2kFIsdrZ5iP0+B0tJ6GqTslCljpbiyf+oozv7XhXf6qPxxgRyk/o NZuqnl5/tJ7pS7qzwkm1lfHIpbW+X2ExGtSLb8PcNPujY2G0w49al03NaKDJSi4Iso8yM2 I7vwRdfUDbzHQK4ACr3DRj2B2aO+kls6LoQRrp9SsCLGMvOElIFgtIX/vHcXQJcAom7BYt e58MpUu829KbiAfslsMpSwO+L+ho0A/HnIFiW1qLmJZSDd4rwD1m4aFiSb8e9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=df3a937145b1bef1b3c08515dc6619b12654415f commit df3a937145b1bef1b3c08515dc6619b12654415f Author: Bryan Drewery AuthorDate: 2022-03-07 22:45:37 +0000 Commit: Bryan Drewery CommitDate: 2022-03-07 22:46:42 +0000 security/openssh-portable: Fix fetching gssapi patch - Mirror it - Update to latest Debian location --- security/openssh-portable/Makefile | 4 ++-- security/openssh-portable/distinfo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 8a5f71adabf9..defef139f14e 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -109,12 +109,12 @@ 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_SUBDIR= ${DISTVERSION}-3 # - 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 # Bump this when updating the patch location -GSSAPI_UPDATE_DATE= 20200607 +GSSAPI_UPDATE_DATE= 20220203 PATCHFILES+= openssh-${DISTVERSION}-gsskex-all-20141021-debian-rh-${GSSAPI_UPDATE_DATE}.patch:-p1:gsskex EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-auth2-gss.c EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgssc.c diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo index 3d0367adc20e..ce6fca4fb0fd 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1646332316 +TIMESTAMP = 1646692898 SHA256 (openssh-8.9p1.tar.gz) = fd497654b7ab1686dac672fb83dfb4ba4096e8b5ffcdaccd262380ae58bec5e7 SIZE (openssh-8.9p1.tar.gz) = 1820282 -SHA256 (openssh-8.9p1-gsskex-all-20141021-debian-rh-20200607.patch) = 0e53e7d26c54713afdb6bca7c6034ab1b2b35483270feaa5e7665ceda9867f16 -SIZE (openssh-8.9p1-gsskex-all-20141021-debian-rh-20200607.patch) = 127245 +SHA256 (openssh-8.9p1-gsskex-all-20141021-debian-rh-20220203.patch) = 0e53e7d26c54713afdb6bca7c6034ab1b2b35483270feaa5e7665ceda9867f16 +SIZE (openssh-8.9p1-gsskex-all-20141021-debian-rh-20220203.patch) = 127245