svn commit: r376373 - head/security/openssh-portable
Bryan Drewery
bdrewery at FreeBSD.org
Mon Jan 5 23:21:28 UTC 2015
Author: bdrewery
Date: Mon Jan 5 23:21:27 2015
New Revision: 376373
URL: https://svnweb.freebsd.org/changeset/ports/376373
QAT: https://qat.redports.org/buildarchive/r376373/
Log:
Fix application of GSSAPI patch when using HPN. It applies fine if done after
HPN.
Reported by: gwollman
Modified:
head/security/openssh-portable/Makefile
Modified: head/security/openssh-portable/Makefile
==============================================================================
--- head/security/openssh-portable/Makefile Mon Jan 5 23:20:59 2015 (r376372)
+++ head/security/openssh-portable/Makefile Mon Jan 5 23:21:27 2015 (r376373)
@@ -79,12 +79,6 @@ X509_PATCHFILES= ${PORTNAME}-6.7p1+x509-
SCTP_PATCHFILES= ${PORTNAME}-6.7p1-sctp-2496.patch.gz:-p1
SCTP_CONFIGURE_WITH= sctp
-# 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
@@ -118,6 +112,16 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch
. endif
.endif
+# Must add this patch after HPN due to conflicts
+.if ${PORT_OPTIONS:MKERB_GSSAPI}
+# 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/
+PATCHFILES+= openssh-6.7p1-gsskex-all-20141021-284f364.patch.gz:-p1:gsskex
+.endif
+
+
.if ${OSVERSION} >= 900000
CONFIGURE_LIBS+= -lutil
.endif
More information about the svn-ports-head
mailing list