From nobody Wed Jan 24 01:41:03 2024 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 4TKRW32KB9z576gj; Wed, 24 Jan 2024 01:41:03 +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 4TKRW31vD7z4DLR; Wed, 24 Jan 2024 01:41:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706060463; 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=dYwvAjiDwy/WgzMYAdCjPJGleawD5WMCODdHiCFxpeE=; b=eOgTWHIXwjCd8RRfVw0KuWtMOlU0SnPjTRRb0PTwGsYui3m/3WdHt2X2KE3LVm08N36y5c tROWtppPD2EGqASpD7+P7399mmJ16FY/cX5maIsgshuDxu9DYBwL/Qf5r2mq7HxKlyjF1U tos6nYrw+vFVfoaGQT0eisvCYdlgsfIrb87EAJhOfIKnvILXSGSuxM9cg9JBM3ZCpDVO9W 4NVppxjwRtxZ88kw9cYV2NXSG2PpUbjltGsIaM307h81grqQP0hIG7zzkjaN9x47ZwnSlw dXshDeDuSF9eNe6P9hWZB4FgKT7M2UmnC0jTSd3qgOpnAqF6Mg6MUoI3+kPKJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706060463; 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=dYwvAjiDwy/WgzMYAdCjPJGleawD5WMCODdHiCFxpeE=; b=s3xEVTUGL8umvdBBSBM3Hn4BesHZPBsq5iQAEOIM2xSA3SKucu248GPzlXDcWOZBfBwqyF i1e/xyChrkjR2VkRE03+OGoG8ZBJGlI021ZUbcho4Rlnf6V94JJY5izsUGLpjlIBQEGFBw BzokuT82hSVAl66Pf/SuvZkl22ILFpblk2mUWTikI/E9XAoVIsveeXQtLHRDsqKs0aIt9A EKuEFaUbQLP11ChqntVJJoBRdFfdepdiX4SLX7QPrbtWKKau971ocqWA0B9VIuoqRRLAQ4 0AKAAS3DWJwUcUARqNoWO8zoE2RALLDEVDCfA7BbTMvXZfxIK+RJaX6+6Cf+OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706060463; a=rsa-sha256; cv=none; b=NMwwvM0dRjuVRSMyY4o2K16sGWHfpvv9sKEeq7hQTUTkuqgGjIRHXoRAMH155eF/RFCCjr bTXIMjR7nyUHY5pb/vuCzv6j7/8pgA2WhSIJdQPOq+qgi8ZPc/1uQnuWUzJrhZ/2GFkaYJ l2clhWb+AVWHIgrDmCJcQ3Zjanp31V9CbrCQhTHr6LNPSiUGzgppn2P9rs++j0bvfVoDO6 yr/gNtPODUVhFTN63/sQKnRLrlVfdlOu69q5KoBpuQyivD63GW/pdOGA2ZSfPKsy/zVcQB vpqhDiERIwLsSoH2j4hZ2z7X9f/dCfK4VXD8hPSF5kK0OCqkwLUi0cQHSBFZsA== 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 4TKRW3111gzvKB; Wed, 24 Jan 2024 01:41:03 +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 40O1f3FC080474; Wed, 24 Jan 2024 01:41:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40O1f3IR080471; Wed, 24 Jan 2024 01:41:03 GMT (envelope-from git) Date: Wed, 24 Jan 2024 01:41:03 GMT Message-Id: <202401240141.40O1f3IR080471@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: bb65ffae9e93 - main - security/openssh-portable: Fix KERB_GSSAPI build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: bdrewery X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb65ffae9e937ddb7f11c9cf683d98be502dcfc5 Auto-Submitted: auto-generated The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=bb65ffae9e937ddb7f11c9cf683d98be502dcfc5 commit bb65ffae9e937ddb7f11c9cf683d98be502dcfc5 Author: Bryan Drewery AuthorDate: 2024-01-24 01:27:44 +0000 Commit: Bryan Drewery CommitDate: 2024-01-24 01:40:42 +0000 security/openssh-portable: Fix KERB_GSSAPI build --- 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