diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-12-17 05:44:11 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-12-17 05:44:11 +0800 |
| commit | 114db6863b8b394190af5e7650bc04c4861f6c2d (patch) | |
| tree | f4cc02a4811d6dde7bcbec9fbb631dbb7e5aed92 /security/openssh-portable | |
| parent | 4212b47522d0732691fb955c1c20df82a1478dfe (diff) | |
| download | freebsd-ports-gnome-114db6863b8b394190af5e7650bc04c4861f6c2d.tar.gz freebsd-ports-gnome-114db6863b8b394190af5e7650bc04c4861f6c2d.tar.zst freebsd-ports-gnome-114db6863b8b394190af5e7650bc04c4861f6c2d.zip | |
- Unbreak KERB_GSSAPI option by using Debian's patch.
I am serving the patch exactly as-is from their site. Obtained from:
http://sources.debian.net/data/main/o/openssh/1:6.7p1-3/debian/patches/gssapi.patch
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 14 | ||||
| -rw-r--r-- | security/openssh-portable/distinfo | 4 |
2 files changed, 8 insertions, 10 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 6cd6937fa065..fcda09ceef19 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -41,7 +41,7 @@ OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE TCP_WRAPPERS_DESC= tcp_wrappers support BSM_DESC= OpenBSM Auditing -KERB_GSSAPI_DESC= Kerberos/GSSAPI patch (req: GSSAPI) [BROKEN] +KERB_GSSAPI_DESC= Kerberos/GSSAPI patch (req: GSSAPI) HPN_DESC= HPN-SSH patch [BROKEN] LDNS_DESC= SSHFP/LDNS support X509_DESC= x509 certificate patch @@ -79,10 +79,11 @@ X509_PATCHFILES= ${PORTNAME}-6.7p1+x509-${X509_VERSION}.diff.gz:-p1:x509 SCTP_PATCHFILES= ${PORTNAME}-6.7p1-sctp-2496.patch.gz:-p1 SCTP_CONFIGURE_WITH= sctp -# 6.6 patch taken from http://www.stacken.kth.se/~haba/ which was originally -# based on 5.7 patch at http://www.sxw.org.uk/computing/patches/ -KERB_GSSAPI_PATCHFILES= openssh-6.6p1-gsskex-all-20140318.patch.gz:-p1:gsskex -#KERB_GSSAPI_PATCH_SITES=http://www.stacken.kth.se/~haba/:gsskex +# 6.7 patch taken from +# http://sources.debian.net/data/main/o/openssh/1:6.7p1-3/debian/patches/gssapi.patch +# which was originally based on 5.7 patch from +# http://www.sxw.org.uk/computing/patches/ +KERB_GSSAPI_PATCHFILES= openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz:-p1:gsskex MIT_LIB_DEPENDS= libkrb5.so.3:${PORTSDIR}/security/krb5 HEIMDAL_LIB_DEPENDS= libkrb5.so.26:${PORTSDIR}/security/heimdal @@ -131,9 +132,6 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-sshd-utmp-size .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER} BROKEN= HPN does not apply yet. Use security/openssh-portable66 .endif -.if ${PORT_OPTIONS:MKERB_GSSAPI} -BROKEN= KERB_GSSAPI does not apply yet. Use security/openssh-portable66 -.endif .if ${PORT_OPTIONS:MX509} . if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER} diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo index d14c5b0da11d..cc60474999e8 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -4,8 +4,8 @@ SHA256 (openssh-6.6.1p1-hpnssh14v2.diff.gz) = b7f5bd22f1c0bacd41fc4884aeb19bba46 SIZE (openssh-6.6.1p1-hpnssh14v2.diff.gz) = 24473 SHA256 (openssh-6.7p1+x509-8.2.diff.gz) = 85acfcd560b40d4533b82a4e3f443b7137b377868bab424dacdf00581c83240f SIZE (openssh-6.7p1+x509-8.2.diff.gz) = 241798 -SHA256 (openssh-6.6p1-gsskex-all-20140318.patch.gz) = 9436c03ba46cdda8753f8957816a9832fd04e1244992ba8e729968c93682a236 -SIZE (openssh-6.6p1-gsskex-all-20140318.patch.gz) = 24299 +SHA256 (openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz) = 9a361408269a542d28dae77320f30e94a44098acdbbbc552efb0bdeac6270dc8 +SIZE (openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz) = 25825 SHA256 (openssh-lpk-6.3p1.patch.gz) = d2a8b7da7acebac2afc4d0a3dffe8fca2e49900cf733af2e7012f2449b3668e1 SIZE (openssh-lpk-6.3p1.patch.gz) = 17815 SHA256 (openssh-6.7p1-sctp-2496.patch.gz) = ec2b6aa8a6d65a2c11d4453a25294ae5082e7ed7c9f418ec081f750bfba022db |