diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-05-25 16:44:00 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2013-05-25 16:44:00 +0000 |
| commit | ef47aef18c18bac83d02b81630b368d22e2f6bcd (patch) | |
| tree | e46a60c5b46c79c76cd81bf15cc3bb9d90e108a2 /security/openssh-portable | |
| parent | e31d9d96e643927087805d91b355b480bf0c768f (diff) | |
| download | ports-ef47aef18c18bac83d02b81630b368d22e2f6bcd.tar.gz ports-ef47aef18c18bac83d02b81630b368d22e2f6bcd.zip | |
Notes
Diffstat (limited to 'security/openssh-portable')
| -rw-r--r-- | security/openssh-portable/Makefile | 20 | ||||
| -rw-r--r-- | security/openssh-portable/distinfo | 2 |
2 files changed, 20 insertions, 2 deletions
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile index 736e0e7e750c..745228e6f959 100644 --- a/security/openssh-portable/Makefile +++ b/security/openssh-portable/Makefile @@ -3,7 +3,7 @@ PORTNAME= openssh DISTVERSION= 6.2p2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security ipv6 MASTER_SITES= ${MASTER_SITE_OPENBSD} @@ -40,13 +40,14 @@ SUDO?= # empty MAKE_ENV+= SUDO="${SUDO}" OPTIONS_DEFINE= PAM TCP_WRAPPERS LIBEDIT BSM \ - HPN LPK X509 \ + HPN LPK X509 KERB_GSSAPI \ OVERWRITE_BASE SCTP AES_THREADED OPTIONS_DEFAULT= LIBEDIT PAM TCP_WRAPPERS HPN OPTIONS_RADIO= KERBEROS OPTIONS_RADIO_KERBEROS= MIT HEIMDAL HEIMDAL_BASE TCP_WRAPPERS_DESC= Enable tcp_wrappers support BSM_DESC= Enable OpenBSM Auditing +KERB_GSSAPI_DESC= Enable Kerberos/GSSAPI patch (req: GSSAPI) HPN_DESC= Enable HPN-SSH patch LPK_DESC= Enable LDAP Public Key (LPK) [OBSOLETE] X509_DESC= Enable x509 certificate patch @@ -86,6 +87,15 @@ BROKEN= X509 patch and SCTP patch do not apply cleanly together . if ${PORT_OPTIONS:MLPK} BROKEN= X509 patch and LPK patch do not apply cleanly together . endif + +. if ${PORT_OPTIONS:MKERB_GSSAPI} +BROKEN= X509 patch incompatible with KERB_GSSAPI patch +. endif + +.endif + +.if ${PORT_OPTIONS:MHEIMDAL_BASE} && ${PORT_OPTIONS:MKERB_GSSAPI} +BROKEN= KERB_GSSAPI Requires either MIT or HEMIDAL, does not build with base Heimdal currently .endif .if defined(OPENSSH_OVERWRITE_BASE) @@ -121,6 +131,12 @@ IGNORE= You have selected HEIMDAL_BASE but do not have heimdal installed in bas CONFIGURE_LIBS+= -lgssapi_krb5 . endif . endif + +# Adapated from 5.7 patch at http://www.sxw.org.uk/computing/patches/ +.if ${PORT_OPTIONS:MKERB_GSSAPI} +PATCHFILES+= openssh-6.2p2-gsskex-all-20110125.patch.gz +PATCH_DIST_STRIP= +.endif .if ${OPENSSLBASE} == "/usr" CONFIGURE_ARGS+= --without-rpath LDFLAGS= # empty diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo index 0ad77f8e1f23..2976445f45b9 100644 --- a/security/openssh-portable/distinfo +++ b/security/openssh-portable/distinfo @@ -6,6 +6,8 @@ SHA256 (openssh-6.2p1-CTR-threaded-v14.diff.gz) = 4d2fefd8a415c76d761ffe3a8fda7d SIZE (openssh-6.2p1-CTR-threaded-v14.diff.gz) = 4908 SHA256 (openssh-6.2p1+x509-7.4.1.diff.gz) = cdfa0ac38184062de7e0af36eeda7713095fbcffffb598d785047f6f47e48eae SIZE (openssh-6.2p1+x509-7.4.1.diff.gz) = 215496 +SHA256 (openssh-6.2p2-gsskex-all-20110125.patch.gz) = 1c54be66bfedb90b4909f0dda11dde09b10db6dca5a1c565c4c3efaed2036b2d +SIZE (openssh-6.2p2-gsskex-all-20110125.patch.gz) = 24309 SHA256 (openssh-lpk-6.2p1.patch.gz) = 96c7a5435f3fd7d83875ee06c4a3c83ee6172c7d9de31b9ffdeb18118f285a24 SIZE (openssh-lpk-6.2p1.patch.gz) = 17881 SHA256 (openssh-sctp-2163.patch.gz) = 86ac3a59119c9c26193334d8ba7c3be9f143209080e4f8a2a00577c24c0c9e03 |