aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2023-02-03 21:41:36 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2023-02-03 21:42:13 +0000
commitc56b161c93596d2c1c52fc24f7b7e17f5bd040b8 (patch)
tree79ee4addf0b5c1973c3dbef9b4ce9f8c965bbfdd
parentd0f64f7b1145129fb906f17d115191f3f0c6d81d (diff)
downloadports-c56b161c93596d2c1c52fc24f7b7e17f5bd040b8.tar.gz
ports-c56b161c93596d2c1c52fc24f7b7e17f5bd040b8.zip
security/openssh-portable: Fix GSSAPI build for 9.1
-rw-r--r--security/openssh-portable/Makefile4
-rw-r--r--security/openssh-portable/distinfo6
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 ?<anything>=/ 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