diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-04-11 11:38:15 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-04-11 11:38:15 +0800 |
| commit | 0f0302c3479679b0ac004d8a143e2e9e68e111e0 (patch) | |
| tree | f7b233e98162a5800940812c6e92e344d851600f /security | |
| parent | e5c12eb1fd9b5480bda4b7414381539d0b2de545 (diff) | |
| download | freebsd-ports-gnome-0f0302c3479679b0ac004d8a143e2e9e68e111e0.tar.gz freebsd-ports-gnome-0f0302c3479679b0ac004d8a143e2e9e68e111e0.tar.zst freebsd-ports-gnome-0f0302c3479679b0ac004d8a143e2e9e68e111e0.zip | |
- Update GSS API Key Exchange patch with working version.
PR: ports/183006
Submitted by: Garrett Wollman (via email)
Tested by: Garrett Wollman
Diffstat (limited to 'security')
| -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 1840ce832156..777b4c6baf6c 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -3,6 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.6p1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} @@ -87,9 +88,10 @@ X509_PATCHFILES= ${PORTNAME}-6.6p1+x509-${X509_VERSION}.diff.gz:-p1:x509 SCTP_PATCHFILES= ${PORTNAME}-6.6p1-sctp-2329.patch.gz SCTP_CONFIGURE_WITH= sctp -# Adapated from 5.7 patch at http://www.sxw.org.uk/computing/patches/ -KERB_GSSAPI_PATCHFILES= openssh-6.5p1-gsskex-all-20110125.patch.gz - +# 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 MIT_LIB_DEPENDS= libkrb5.so.3:${PORTSDIR}/security/krb5 HEIMDAL_LIB_DEPENDS= libkrb5.so.26:${PORTSDIR}/security/heimdal @@ -103,10 +105,6 @@ BSM_CONFIGURE_ON= --with-audit=bsm .include <bsd.port.pre.mk> -.if ${PORT_OPTIONS:MKERB_GSSAPI} -BROKEN= KERB_GSSAPI Patch is not updated for 6.5 and upstream has not been active since 2001. -.endif - # http://www.psc.edu/index.php/hpn-ssh .if ${PORT_OPTIONS:MHPN} || ${PORT_OPTIONS:MAES_THREADED} || ${PORT_OPTIONS:MNONECIPHER} PORTDOCS+= HPN-README @@ -122,7 +120,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-hpn-no-hpn . endif .endif -PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn +PATCH_SITES+= http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex .if ${OSVERSION} >= 900000 CONFIGURE_LIBS+= -lutil diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo index 955a51cee7d8..bdcac54dc38f 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -4,8 +4,8 @@ SHA256 (openssh-6.6p1-hpnssh14v2.diff.gz) = 2a1b34dc3bf922e12cbca687e57b1fad2a0b SIZE (openssh-6.6p1-hpnssh14v2.diff.gz) = 24469 SHA256 (openssh-6.6p1+x509-7.9.diff.gz) = 463473f75c1dc250ea4eda21f2c79df6f0b479ea499d044cb51d73073881ca34 SIZE (openssh-6.6p1+x509-7.9.diff.gz) = 224691 -SHA256 (openssh-6.5p1-gsskex-all-20110125.patch.gz) = dd3b0f383a58e490f735646ae27f3dd05db96446e2e4ae8e753b64eee7f46582 -SIZE (openssh-6.5p1-gsskex-all-20110125.patch.gz) = 23516 +SHA256 (openssh-6.6p1-gsskex-all-20140318.patch.gz) = 9436c03ba46cdda8753f8957816a9832fd04e1244992ba8e729968c93682a236 +SIZE (openssh-6.6p1-gsskex-all-20140318.patch.gz) = 24299 SHA256 (openssh-lpk-6.3p1.patch.gz) = d2a8b7da7acebac2afc4d0a3dffe8fca2e49900cf733af2e7012f2449b3668e1 SIZE (openssh-lpk-6.3p1.patch.gz) = 17815 SHA256 (openssh-6.6p1-sctp-2329.patch.gz) = e054529810815d63f7de5d1c6cc76fccb7766e1b2d1b62438ca83770afac9bfa |