Attachment 244011 Details for Bug 273052 – patch

[patch] patch

gssapi.patch (text/plain), 2.52 KB, created by Brad Davis on 2023-08-10 17:57:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Davis

Created: 2023-08-10 17:57:54 UTC

Size: 2.52 KB

patch

obsolete

>diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
>index ef84fd31a9..c4eed6002c 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,22 @@ 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.3p2
>+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_UPDATE_DATE=	20220203
>+GSSAPI_DISTVERSION=	9.3p2
>+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 e8cbc8a8fa..0bdc4d30b9 100644
>--- a/security/openssh-portable/distinfo
>+++ b/security/openssh-portable/distinfo
>@@ -1,3 +1,5 @@
>-TIMESTAMP = 1689788774
>+TIMESTAMP = 1690578195
> SHA256 (openssh-9.3p2.tar.gz) = 200ebe147f6cb3f101fd0cdf9e02442af7ddca298dffd9f456878e7ccac676e8
> SIZE (openssh-9.3p2.tar.gz) = 1835850
>+SHA256 (openssh-9.3p2-gsskex-all-debian-rh-9.3p2.patch) = 3232a8aa5ed128d429d97065338a57998fd9e244dfaab24aa1b2461a291f1d77
>+SIZE (openssh-9.3p2-gsskex-all-debian-rh-9.3p2.patch) = 131674

Actions: View | Diff

Attachments on bug 273052: 244011