aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2024-01-24 01:27:44 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2024-01-24 01:40:42 +0000
commitbb65ffae9e937ddb7f11c9cf683d98be502dcfc5 (patch)
treeb9a167e1b43eadb67953a5d87734219ca627f5b9
parent8099c6d33d7690d53b135eedab5043fb9589a1ea (diff)
downloadports-bb65ffae9e937ddb7f11c9cf683d98be502dcfc5.tar.gz
ports-bb65ffae9e937ddb7f11c9cf683d98be502dcfc5.zip
security/openssh-portable: Fix KERB_GSSAPI build
-rw-r--r--security/openssh-portable/Makefile6
-rw-r--r--security/openssh-portable/distinfo4
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 ?<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 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