From nobody Fri Feb 03 21:42:17 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 4P7pyx2Zd3z3kmQV; Fri, 3 Feb 2023 21:42:17 +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 4P7pyx28Xwz3hQt; Fri, 3 Feb 2023 21:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675460537; 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=3RxpI1g+Fc6nt+CyiL64va4ycgMsnQ9SQFxfnWRaWgE=; b=Q9+FSt7ryU6cPZOxJi2Qt4+/3rCDfZ3ko8WVyIajSLpxY6GRjqnKJhCk5fLAjX1wnnVKh8 UoACQmuS4wkSZ8gsNTAR4uxmY8u919HOqCb+XfStxWxpC3TNP5KLT/BwhPwZIOzgcFmW42 WV11M/VJriEDFR8JOk/XzLzNUHsFw/R82MHJMTu/QEzSIRY9fkq8sGqRRBPqe3YpI5MJ9V VK52r8Ej/UveJ4tkgMGINst+AqObyfhG3yGwvEeNw/gqZmiwvhPJuV6gD2cakvtYhpjdkX QAkGJS7zR4FErI6u9VEldU6Qo7JZofRJPhfFwj7lTUQ9PtcQAXiBQX2Q/veUDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675460537; 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=3RxpI1g+Fc6nt+CyiL64va4ycgMsnQ9SQFxfnWRaWgE=; b=STi3yr2unaTWI6G89sB36xHHcDCRyB/RHCvNx0Mceacqa7heGArYXT6mpWeFArHWj3Ch1M lR/OzvPnEA7F882VTMlFSomSaYzzuJV5zCzs50eqUd6eNsMtfh88LBgVQK4wrpZYTr5xta jyBHAvAIGLiZYavduBN07TpHyMwcyIWbO5susWZspbwDQfPPVJPAODuehxnZvJPZyhPb5Z KDCO0NzfIXJKAgElmmeR5qyXianEtYtA/KW3OPKLCPCSf0OJscy+wQv5oF4BUign414uXj RuP3beCHmXVq2x0rJXPnqHTysfrE9l8oAaZovkCKdnFQg8PSsnDc2bkowtcw1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675460537; a=rsa-sha256; cv=none; b=xLtq+lJY2J7KH08eMklmXdqtaFvB7Boafw5ITXKNCM9dDQ8422+4UGD6UZuwDdod8yQj3f 8dnPLbeyP7iM0XlQo5oma9wwJ0d5RXcwvY8UgQzcQvwUyfrRPpmRrgSk1HQzyLNj6aQHWV H/X6q96a7bQ6bhzOG1gqTNBlmh4HyXhqMdN4f8EJw/UoVLVK0OX2rDqp3UvnF5aw6A4VK+ oBoxImJ7+Mle3GgtqVLZ2azF0GQ7gf1N3/SkSWRPkKCduPDV+/iWbjxCerp2ZXQjGmjrRT XaxsS83zmalbf/PZtnHtcNKRYvsWQIt/s2pIuRHF9Fgs7HTZC2QwDPVp6q1RhQ== 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 4P7pyx1FVlzq0W; Fri, 3 Feb 2023 21:42:17 +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 313LgHMg025539; Fri, 3 Feb 2023 21:42:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 313LgHrD025538; Fri, 3 Feb 2023 21:42:17 GMT (envelope-from git) Date: Fri, 3 Feb 2023 21:42:17 GMT Message-Id: <202302032142.313LgHrD025538@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: c56b161c9359 - main - security/openssh-portable: Fix GSSAPI build for 9.1 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: c56b161c93596d2c1c52fc24f7b7e17f5bd040b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/ports/commit/?id=c56b161c93596d2c1c52fc24f7b7e17f5bd040b8 commit c56b161c93596d2c1c52fc24f7b7e17f5bd040b8 Author: Bryan Drewery AuthorDate: 2023-02-03 21:41:36 +0000 Commit: Bryan Drewery CommitDate: 2023-02-03 21:42:13 +0000 security/openssh-portable: Fix GSSAPI build for 9.1 --- 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 14cb3a8f970a..1b31a37aa422 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -101,14 +101,14 @@ 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_SUBDIR= ${DISTVERSION}-1 +GSSAPI_DEBIAN_SUBDIR= ${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 diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo index 1dffd1baac8a..5b2a5590e2a5 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1664898976 +TIMESTAMP = 1675460254 SHA256 (openssh-9.1p1.tar.gz) = 19f85009c7e3e23787f0236fbb1578392ab4d4bf9f8ec5fe6bc1cd7e8bfdd288 SIZE (openssh-9.1p1.tar.gz) = 1838747 -SHA256 (openssh-9.0p1-gsskex-all-20141021-debian-rh-20220203.patch) = d2f4c7bb1bc33540605a3bb0c9517d7b4ed2f5d77c24f7afcd64891be59f4ed2 -SIZE (openssh-9.0p1-gsskex-all-20141021-debian-rh-20220203.patch) = 127245 +SHA256 (openssh-9.1p1-gsskex-all-20141021-debian-rh-20220203.patch) = 98202e8c36d7a2fd75b6247c22e44267f3812e83d8d22789f7ed1e142f4aa771 +SIZE (openssh-9.1p1-gsskex-all-20141021-debian-rh-20220203.patch) = 127232