mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00
Code Issues Releases Activity

Fix application of GSSAPI patch when using HPN. It applies fine if done after

Browse Source 
HPN.

Reported by:	gwollman
This commit is contained in:
Bryan Drewery 2015-01-05 23:21:27 +00:00
parent b5c502f13f
commit 94f086ad17
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=376373
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
security/openssh-portable/Makefile
View File

@ -79,12 +79,6 @@ 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.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-hpn-no-hpn
. 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