From nobody Tue Mar 19 16:12:49 2024 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 4TzcFY3q0Rz5DljH; Tue, 19 Mar 2024 16:12:49 +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 4TzcFY2xwWz4SDW; Tue, 19 Mar 2024 16:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710864769; 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=Nu+HawN+Grj5dYc4nDCBSVzlmrJdvVYAnZp9sfG3V64=; b=UMMX9OdGK5JU8Mn4VtptlwVTpnIHunsrBsuFf3AAMW30J/SF9miF+4K3kwnLzbQr7lFaNi +XkxmkCEYtsgsVkS6uLoiL5SwNbFp8lFkBWWizCMW3fEu6py2K0xoMlUD3lF/DlLWISN0a /RBDY2T5m6F3JPm0EkF2B+hnvgF8Pefka71gE+0dI8ujlRynsjj8hgACB8qFNWHWF9hK2s yKThEUSCaeo1QkfPsr9q6JcuthcfB7oYZ5cDk9P++uKtf69vSW7183rhMnDUoQNwxJgvp3 7fJj9dckdfXoCXYFZ9tZO+Ipz0hyhM2is6wa78dOuhqSxWfoclkPpP4wvdg80w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710864769; a=rsa-sha256; cv=none; b=XSX9ypPFNGoJWXwgzth5ArBw+13457sSm1coFzJCCm+4JDcNk0ifFVMv0UAvxo+2a6kfKX 5Mao8u6xKYeVaAmrWwuGpvqm/Jh7F0Dw3XuqIBCAAnLEL30Jy3ECJ2M5DXw0a2zSY4yHqE c3iiOpxWLoFOHXCVKr0BAAGxyHLl983dP847/shU5PVj/HSnT34fpiAq9tIzcrSu34ve8n 1y74HGSMqqopFbv68M9PE0hzriW6HA9aQ887XZPY8xQ988aK5gusbyFX/TPmtGL6sD2L71 +bZwpBWqTpHqLyDvE3CIJENIzXPjI5UeQUM20qh5cEx8+eDDGp1i8RX3GZsl3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710864769; 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=Nu+HawN+Grj5dYc4nDCBSVzlmrJdvVYAnZp9sfG3V64=; b=vfZXWWgA8bRze1NytpVJsNDSiHG3qy/w7PEeELmviJVMTv9kc2AT+wqDF/9E6I8z1H+Hls +eyVWavwJ0Zo1CwaMWf6C0QhOGVCmbkmbv6D+pSvtDWVZ9C5xV1pCCECxQlKVlwae8tDGc MO5vUg877SlnTRH7v0dN2XIIbe3wMZYz/DKeFAulHnRcroUJ3fZW0gvMe7t/DN3Xvuu4pp oied0TOLeD8uw9YwK36O3EGCQHW7a18hZzo3wk0OGSAVHDj0Ld82m6mdxwCdDDA1n0whhy 24JE8aKS/FHObs5yfyDP7ZwWVKPamhgJYT0m7prqzETfJx4YbSNw4QQ1/4iNIg== 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 4TzcFY2YDczFKF; Tue, 19 Mar 2024 16:12:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42JGCnN7069638; Tue, 19 Mar 2024 16:12:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42JGCnYd069635; Tue, 19 Mar 2024 16:12:49 GMT (envelope-from git) Date: Tue, 19 Mar 2024 16:12:49 GMT Message-Id: <202403191612.42JGCnYd069635@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: 146b99934bee - main - security/openssh-portable: Update to 9.7p1 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: 146b99934bee58941565cab519517ce52d167a8e Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=146b99934bee58941565cab519517ce52d167a8e commit 146b99934bee58941565cab519517ce52d167a8e Author: Bryan Drewery AuthorDate: 2024-03-19 16:12:07 +0000 Commit: Bryan Drewery CommitDate: 2024-03-19 16:12:46 +0000 security/openssh-portable: Update to 9.7p1 Changes: https://www.openssh.com/txt/release-9.7 --- security/openssh-portable/Makefile | 10 +++++----- security/openssh-portable/distinfo | 10 +++++----- security/openssh-portable/files/extra-patch-gssapi-auth2-gss.c | 8 -------- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 0fc53a49df7b..ccf46bb23850 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -1,6 +1,6 @@ PORTNAME= openssh -DISTVERSION= 9.6p1 -PORTREVISION= 2 +DISTVERSION= 9.7p1 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= OPENBSD/OpenSSH/portable @@ -109,13 +109,13 @@ 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_VERSION= 9.6p1 -GSSAPI_DEBIAN_SUBDIR= ${GSSAPI_DEBIAN_VERSION:U${DISTVERSION}}-3 +GSSAPI_DEBIAN_VERSION= 9.7p1 +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 # Bump this when updating the patch location -GSSAPI_DISTVERSION= 9.4p1 +GSSAPI_DISTVERSION= 9.7p1 PATCHFILES+= openssh-${GSSAPI_DISTVERSION:U${DISTVERSION}}-gsskex-all-debian-rh-${GSSAPI_DISTVERSION}.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 72841b271ab9..6d5d064d68be 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1706059638 -SHA256 (openssh-9.6p1.tar.gz) = 910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c -SIZE (openssh-9.6p1.tar.gz) = 1857862 -SHA256 (openssh-9.4p1-gsskex-all-debian-rh-9.4p1.patch) = 03a32678a96cfd274482378d0d2889709018c403e40207b8d5dca41b7e9941bd -SIZE (openssh-9.4p1-gsskex-all-debian-rh-9.4p1.patch) = 131920 +TIMESTAMP = 1710784635 +SHA256 (openssh-9.7p1.tar.gz) = 490426f766d82a2763fcacd8d83ea3d70798750c7bd2aff2e57dc5660f773ffd +SIZE (openssh-9.7p1.tar.gz) = 1848766 +SHA256 (openssh-9.7p1-gsskex-all-debian-rh-9.7p1.patch) = 30d9652a18851c0b7a80b8f07d70adc3a77267b656f784c9e89cb93171f22210 +SIZE (openssh-9.7p1-gsskex-all-debian-rh-9.7p1.patch) = 131397 diff --git a/security/openssh-portable/files/extra-patch-gssapi-auth2-gss.c b/security/openssh-portable/files/extra-patch-gssapi-auth2-gss.c index 3f9694c8d466..68170a9f8e79 100644 --- a/security/openssh-portable/files/extra-patch-gssapi-auth2-gss.c +++ b/security/openssh-portable/files/extra-patch-gssapi-auth2-gss.c @@ -9,11 +9,3 @@ { Authctxt *authctxt = ssh->authctxt; int r, authenticated = 0; -@@ -373,6 +373,7 @@ input_gssapi_mic(int type, u_int32_t plen, struct ssh - - Authmethod method_gsskeyex = { - "gssapi-keyex", -+ NULL, - userauth_gsskeyex, - &options.gss_authentication - };