From nobody Fri Sep 22 16:24:55 2023
X-Original-To: dev-commits-ports-main@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 4Rsd074KT7z4v5B0;
Fri, 22 Sep 2023 16:24:55 +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 4Rsd073bLpz4KWh;
Fri, 22 Sep 2023 16:24:55 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1695399895;
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=Va8hP2eTygtvHgvq69yPvuw//09wrz32o+JQ0yz5u2U=;
b=VmJi4cTBW8j8ollPwagsDzUF2WrfGpOxsvtwyOkeryaahfYuXkD7mSpiLBcxqnyQawCv0/
z1uQ06i8BZv14vmPdLo+Ddd3SUpig0wdUR6WH2V25/bK60mvQg2n4/Kcc5hMmTnXHE/1DO
IY09tr1iUS8nRm7E9PdR7yDCIvC7GtuWP4Tg6mH/gULs3aMVZZ+xv00QSaz9FFU9cbcEFS
y7l++qOhS2fUDKibkn8hWiV8LijlLLE2Kbo2SRdKx7BZv1tq7/z6l6pwfCDmrcSAoLm3yh
ozwuDxsmukAxilR8IT0QIkSEK7LufVdRv2KvBcZiP31weMshNsY+gvgQ4KBrEg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695399895; a=rsa-sha256; cv=none;
b=rcp7eZmnk05+RJhG193TPkbPCOjw/cxszYATgBekcZjG1L8xtbD3tXvq7/XmocWdFD8IjF
GiZtGFnOeL+VkhQt/JrpsWGB9LN67mdFYzUCUu/KDCA0WdtSAibPCVLS20Cmeym7I6iVXM
kZbPTO3SzuNP0oXGgHKC0iwf01hCbIfLpbFFvgc8XgY82JQqYUKojPV6499B47q1psjFRD
yw9L2qxplmVWfIQNcZm9eGkhmwT5Kk6wHbuKmRqKVKYSyo/we7y2htpn/8bYoUlipWm51O
skugJGb5k7C/kmacz4xBw1AIYIlbCKjYAGoBt3JfJVqaQDdSoAe7WsWZIG1xeg==
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=1695399895;
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=Va8hP2eTygtvHgvq69yPvuw//09wrz32o+JQ0yz5u2U=;
b=q4jMYocJa3SZDS+OPtqQGteDS0QdJf6hqWB4OdfVszQwbn/VQw3NuoIGcWqWlt+Kj/ckuo
7aPrIEnv+b80b70Whb+akOQOXcbLS3uQiiMQqhtqqLhcpko4/OwjSfRrxY17LXMyiCdgf4
ESdz/Rov0H4y4VL3ZkDytdq20EFU90IkvSmbIMMWUdvc92xMXoX3rw6WZditp+sLlVzgtN
EI/MXMQIkOWQtYHEsi7M0FUYWoHzgaxOLsGzXTCpk97FLHEa1MFcLyMOkDl3mmUYufq6Ai
IEdLJ50Bz67W8ZbS6aciiL0NtViVZCZgebNR6yEJwrHEP3cGmyxSL6iukq+T6Q==
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 4Rsd072dWSzTWx;
Fri, 22 Sep 2023 16:24:55 +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 38MGOtBU096887;
Fri, 22 Sep 2023 16:24:55 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MGOtCw096884;
Fri, 22 Sep 2023 16:24:55 GMT
(envelope-from git)
Date: Fri, 22 Sep 2023 16:24:55 GMT
Message-Id: <202309221624.38MGOtCw096884@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Mateusz Piotrowski <0mp@FreeBSD.org>
Subject: git: 3bd9ddb0b557 - main - security/openssh-portable: Fix
build with KERB_GSSAPI set
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-main@freebsd.org
X-BeenThere: dev-commits-ports-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: 0mp
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 3bd9ddb0b5576371b0dcda72c173fe348a3dcbd9
Auto-Submitted: auto-generated
The branch main has been updated by 0mp:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3bd9ddb0b5576371b0dcda72c173fe348a3dcbd9
commit 3bd9ddb0b5576371b0dcda72c173fe348a3dcbd9
Author: Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2023-09-21 11:32:59 +0000
Commit: Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2023-09-22 16:23:04 +0000
security/openssh-portable: Fix build with KERB_GSSAPI set
PR: 273052
Reported by: brd
Approved by: maintainer timeout
Tested by: wollman
Sponsored by: Klara Inc.
---
security/openssh-portable/Makefile | 13 ++++++-------
security/openssh-portable/distinfo | 4 +++-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index ef84fd31a92c..70d027db63a2 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -1,6 +1,6 @@
PORTNAME= openssh
DISTVERSION= 9.3p2
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= security
MASTER_SITES= OPENBSD/OpenSSH/portable
@@ -101,22 +101,21 @@ 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.2p1
-GSSAPI_DEBIAN_SUBDIR= ${GSSAPI_DEBIAN_VERSION:U${DISTVERSION}}-2
+GSSAPI_DEBIAN_VERSION= 9.4p1
+GSSAPI_DEBIAN_SUBDIR= ${GSSAPI_DEBIAN_VERSION:U${DISTVERSION}}-1
# - 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
# Bump this when updating the patch location
-GSSAPI_UPDATE_DATE= 20220203
-#GSSAPI_DISTVERSION= 9.0p1
-PATCHFILES+= openssh-${GSSAPI_DISTVERSION:U${DISTVERSION}}-gsskex-all-20141021-debian-rh-${GSSAPI_UPDATE_DATE}.patch:-p1:gsskex
+GSSAPI_DISTVERSION= 9.4p1
+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
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gssapi-kexgsss.c
diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo
index e8cbc8a8fa43..244080affd21 100644
--- a/security/openssh-portable/distinfo
+++ b/security/openssh-portable/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1689788774
+TIMESTAMP = 1695396338
SHA256 (openssh-9.3p2.tar.gz) = 200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8
SIZE (openssh-9.3p2.tar.gz) = 1835850
+SHA256 (openssh-9.4p1-gsskex-all-debian-rh-9.4p1.patch) = 9492c1db4307aa3fe6e12d77fff01376bf275af2980ae55b926a505aae9e9b14
+SIZE (openssh-9.4p1-gsskex-all-debian-rh-9.4p1.patch) = 131674