Attachment 192801 Details for Bug 226789 – Patch to security/openssh-portable to unbreak KERB_GSSAPI

[patch] Patch to security/openssh-portable to unbreak KERB_GSSAPI

openssh-portable-gssapi.patch (text/plain), 2.18 KB, created by Rick on 2018-04-25 12:03:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rick

Created: 2018-04-25 12:03:27 UTC

Size: 2.18 KB

patch

obsolete

>Index: security/openssh-portable/Makefile
>===================================================================
>--- security/openssh-portable/Makefile	(revision 468221)
>+++ security/openssh-portable/Makefile	(working copy)
>@@ -80,7 +80,9 @@
> 
> .include <bsd.port.pre.mk>
> 
>-PATCH_SITES+=		http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex
>+#PATCH_SITES+=		http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex
>+PATCH_SITES+=		http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn \
>+			http://sources.debian.net/data/main/o/openssh/1:7.7p1-2/debian/patches/:gsskex
> 
> # X509 patch includes TCP Wrapper support already
> .if ${PORT_OPTIONS:MX509}
>@@ -89,7 +91,7 @@
> 
> # Must add this patch before HPN due to conflicts
> .if ${PORT_OPTIONS:MKERB_GSSAPI}
>-BROKEN=	KERB_GSSAPI No patch for ${DISTVERSION} yet.
>+#BROKEN=	KERB_GSSAPI No patch for ${DISTVERSION} yet.
> # Patch from:
> # http://sources.debian.net/data/main/o/openssh/1:7.4p1-5/debian/patches/gssapi.patch
> # which was originally based on 5.7 patch from
>@@ -99,7 +101,8 @@
> # Needed glue for applying HPN patch without conflict
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-hpn-gss-glue
> .  endif
>-PATCHFILES+=	openssh-7.4p1-gsskex-all-20141021-debian-rh-20161228.patch.gz:-p1:gsskex
>+#PATCHFILES+=	openssh-7.4p1-gsskex-all-20141021-debian-rh-20161228.patch.gz:-p1:gsskex
>+PATCHFILES+=	gssapi.patch:-p1:gsskex
> .endif
> 
> # http://www.psc.edu/index.php/hpn-ssh https://github.com/rapier1/hpn-ssh https://github.com/rapier1/openssh-portable
>Index: security/openssh-portable/distinfo
>===================================================================
>--- security/openssh-portable/distinfo	(revision 468221)
>+++ security/openssh-portable/distinfo	(working copy)
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1522788732
>+TIMESTAMP = 1524589531
> SHA256 (openssh-7.7p1.tar.gz) = d73be7e684e99efcd024be15a30bffcbe41b012b2f7b3c9084aed621775e6b8f
> SIZE (openssh-7.7p1.tar.gz) = 1536900
>-SHA256 (openssh-7.7p1+x509-11.3.diff.gz) = 57be0d0028863f1f690b8b4ccae7583c0f8dd8ed2c688a912b25832bf7f9b185
>-SIZE (openssh-7.7p1+x509-11.3.diff.gz) = 488467
>+SHA256 (gssapi.patch) = 8e0a9cfab242ecc7ba9001eada44313718bfc1d94a9f212341d10d1145eecc7c
>+SIZE (gssapi.patch) = 100645

Actions: View | Diff

Attachments on bug 226789: 192801 | 192802