Attachment 231316 Details for Bug 259909 – Patch to unbreak GSSAPI

Patch to unbreak GSSAPI

file_259909.txt (text/plain), 1.83 KB, created by Rick Miller on 2022-01-25 16:26:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rick Miller

Created: 2022-01-25 16:26:02 UTC

Size: 1.83 KB

patch

obsolete

>diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
>index b77a243d16cf..a854fb04e518 100644
>--- a/security/openssh-portable/Makefile
>+++ b/security/openssh-portable/Makefile
>@@ -100,7 +100,7 @@ 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
>@@ -114,7 +114,6 @@ PATCH_SITES+=       https://sources.debian.org/data/main/o/openssh/1:${GSSAPI_DEBIAN_S
> # Bump this when updating the patch location
> GSSAPI_UPDATE_DATE=    20200607
> PATCHFILES+=   openssh-${DISTVERSION}-gsskex-all-20141021-debian-rh-${GSSAPI_UPDATE_DATE}.patch:-p1:gsskex
>-EXTRA_PATCHES+=        ${FILESDIR}/extra-patch-gssapi-sshconnect2.c
> EXTRA_PATCHES+=        ${FILESDIR}/extra-patch-gssapi-kexgssc.c
> EXTRA_PATCHES+=        ${FILESDIR}/extra-patch-gssapi-kexgsss.c
> .endif
>diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo
>index f08db16ada6a..d84dd2fbfad5 100644
>--- a/security/openssh-portable/distinfo
>+++ b/security/openssh-portable/distinfo
>@@ -1,3 +1,5 @@
>-TIMESTAMP = 1634059537
>+TIMESTAMP = 1643115587
> SHA256 (openssh-8.8p1.tar.gz) = 4590890ea9bb9ace4f71ae331785a3a5823232435161960ed5fc86588f331fe9
> SIZE (openssh-8.8p1.tar.gz) = 1815060
>+SHA256 (openssh-8.8p1-gsskex-all-20141021-debian-rh-20200607.patch) = f9266f351d061d3e01fc5f884b35d3bf39d9b412ae5dce830345f4495377a4a7
>+SIZE (openssh-8.8p1-gsskex-all-20141021-debian-rh-20200607.patch) = 127186

Actions: View

Attachments on bug 259909: 231316