From nobody Wed Jan 24 01:42:31 2024 X-Original-To: dev-commits-ports-branches@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 4TKRXl2k8Zz576fF; Wed, 24 Jan 2024 01:42:31 +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 4TKRXl2Hlsz4FCK; Wed, 24 Jan 2024 01:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706060551; 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=x7w7VhUaE//Jb7cvRCylILxaE8iD9Bpg5DMk7LSzyYo=; b=fDwcKM52mpefr1hy4rSNVckZcQhET8uLD4LcfAe9bQNDcPL/HGmhM14/EEN2mW3Khwwg7h 7J/XJZ1+WYzTDCccITrN/5gGliLDuPz3AHJjaTNaA4NA127tcXEGw9LUZ6HhmBHedObVmj Xv1VGO1xixjZIARjZchkLZULPNab/CVgbXvC5Sd0H5jYMqydJpAbSJxVDSN04DRfQuHd/+ Z54fw/j24lkvo5DIU4BhIJdLJd+BVyBmFzIekrKJFB4jMoRJBb3lXCFpxhuxCzuJkZDnZg 5b3/rQX35Zj63Bl+D2VMi1xm5rSsEoQplLpEe2eTI68RZNOlHFnANhBIjT2R/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706060551; 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=x7w7VhUaE//Jb7cvRCylILxaE8iD9Bpg5DMk7LSzyYo=; b=uON8Kme2yRFQlTG21yJH4PnZVyzK0YzIJx53aeZpbKRtJjhVfqDN97GoPgQC4NFkatPYN7 kjpF18LvQfnDupl3+3FdzVv9hthB/voeShSlrXLUNTozOWUS7EKZW/6YO//8eT0X9Y8eWA IhYvmSZMdrG8iDptCRkMPplHw34eCWR4vqsoS8nT3DZz0NVahvP3ZxEZmtpFDHQDd8MtEP QI+Sz2lWnkyU6CIfsh8xwXB3TyqiqJSv8dUsgFdx2KQ3f9A7C0rxCLdBNyx/i5ekVDGAK3 HIhVl0gGk5B76qeCU4G16cebkCQTV0NuI3TcE18PxVD2CJJaavkvmQqXVc1TDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706060551; a=rsa-sha256; cv=none; b=FqaQmN+34sdRf0vO0E/Ob+EgaYkUVEQQt8ZX/qqv1XOolOuOoaQ1Fdr2ZO7gmKSIoAfG5U nknlACgJuKMZMXN7LQ4FWOnlylzMOC8JBT3QVXQ1HCqWrIfSf/ag0XiIiorkSN98YA6zLi tiQHJmJvFDhX7A6gYYMCTY6AuX5DnhBEUX97E4Uod7dej0XeRlOq7Nwicmzl6n4CCclWGo owZJKpurJVheOP8VG6Yx29LlZhf/JABXSEB8DGGNTmNMPsSxCInNwbdkS5gHYqKBhboRi8 KBJgS5nsmCxTB1cJ6SylWaulW+f40ZJ5soYhuRASBdDXeUpyLQ8IR3h65IinBg== 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 4TKRXl16W5zvjN; Wed, 24 Jan 2024 01:42:31 +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 40O1gVAY083294; Wed, 24 Jan 2024 01:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O1gVYe083277; Wed, 24 Jan 2024 01:42:31 GMT (envelope-from git) Date: Wed, 24 Jan 2024 01:42:31 GMT Message-Id: <202401240142.40O1gVYe083277@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bryan Drewery Subject: git: 0bcc1286080f - 2024Q1 - security/openssh-portable: Fix KERB_GSSAPI build List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2024Q1 X-Git-Reftype: branch X-Git-Commit: 0bcc1286080f4460d9bb143e043320b111860abf Auto-Submitted: auto-generated The branch 2024Q1 has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=0bcc1286080f4460d9bb143e043320b111860abf commit 0bcc1286080f4460d9bb143e043320b111860abf Author: Bryan Drewery AuthorDate: 2024-01-24 01:27:44 +0000 Commit: Bryan Drewery CommitDate: 2024-01-24 01:42:25 +0000 security/openssh-portable: Fix KERB_GSSAPI build (cherry picked from commit bb65ffae9e937ddb7f11c9cf683d98be502dcfc5) --- security/openssh-portable/Makefile | 6 +++--- security/openssh-portable/distinfo | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 62456cfd89f5..f81f604ddf54 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -101,15 +101,15 @@ PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,hpn,gsskex # Must add this patch before HPN due to conflicts .if ${PORT_OPTIONS:MKERB_GSSAPI} || ${FLAVOR:U} == gssapi -BROKEN= KERB_GSSAPI No patch for ${DISTVERSION} yet. +#BROKEN= KERB_GSSAPI No patch for ${DISTVERSION} yet. . if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MNONECIPHER} # Needed glue for applying HPN patch without conflict 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.4p1 -GSSAPI_DEBIAN_SUBDIR= ${GSSAPI_DEBIAN_VERSION:U${DISTVERSION}}-1 +GSSAPI_DEBIAN_VERSION= 9.6p1 +GSSAPI_DEBIAN_SUBDIR= ${GSSAPI_DEBIAN_VERSION:U${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 diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo index 8f546e9ce2c5..72841b271ab9 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1703034264 +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