From owner-svn-ports-all@FreeBSD.ORG Tue Apr 30 13:13:49 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D5893DBB; Tue, 30 Apr 2013 13:13:49 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AE0D2124B; Tue, 30 Apr 2013 13:13:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3UDDnxR036961; Tue, 30 Apr 2013 13:13:49 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3UDDn9p036959; Tue, 30 Apr 2013 13:13:49 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201304301313.r3UDDn9p036959@svn.freebsd.org> From: Bryan Drewery Date: Tue, 30 Apr 2013 13:13:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316929 - head/security/openssh-portable X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Apr 2013 13:13:49 -0000 Author: bdrewery Date: Tue Apr 30 13:13:49 2013 New Revision: 316929 URL: http://svnweb.freebsd.org/changeset/ports/316929 Log: - Add support for base and port Heimdal for Kerberos PR: ports/167554 Requested by: Volodymyr Kostyrko Modified: head/security/openssh-portable/Makefile Modified: head/security/openssh-portable/Makefile ============================================================================== --- head/security/openssh-portable/Makefile Tue Apr 30 12:38:52 2013 (r316928) +++ head/security/openssh-portable/Makefile Tue Apr 30 13:13:49 2013 (r316929) @@ -39,10 +39,12 @@ ETCOLD= ${PREFIX}/etc SUDO?= # empty MAKE_ENV+= SUDO="${SUDO}" -OPTIONS_DEFINE= PAM TCP_WRAPPERS LIBEDIT BSM KERBEROS \ +OPTIONS_DEFINE= PAM TCP_WRAPPERS LIBEDIT BSM \ KERB_GSSAPI OPENSSH_CHROOT HPN LPK X509 \ OVERWRITE_BASE SCTP OPTIONS_DEFAULT= LIBEDIT PAM TCP_WRAPPERS +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) @@ -52,6 +54,9 @@ LPK_DESC= Enable LDAP Public Key (LPK) X509_DESC= Enable x509 certificate patch SCTP_DESC= Enable SCTP support OVERWRITE_BASE_DESC= OpenSSH overwrite base +HEIMDAL_DESC= Heimdal Kerberos (security/heimdal) +HEIMDAL_BASE_DESC= Heimdal Kerberos (base) +MIT_DESC= MIT Kerberos (security/krb5) .include @@ -101,9 +106,19 @@ CONFIGURE_ARGS+= --with-libedit CONFIGURE_ARGS+= --with-audit=bsm .endif -.if ${PORT_OPTIONS:MKERBEROS} +.if ${PORT_OPTIONS:MMIT} || ${PORT_OPTIONS:MHEIMDAL} || ${PORT_OPTIONS:MHEIMDAL_BASE} CONFIGURE_ARGS+= --with-kerberos5 +. if ${PORT_OPTIONS:MMIT} LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5 +. elif ${PORT_OPTIONS:MHEIMDAL} +LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal +. elif ${PORT_OPTIONS:MHEIMDAL_BASE} +. if !exists(/usr/lib/libkrb5.so) +IGNORE= You have selected HEIMDAL_BASE but do not have heimdal installed in base +. else +CONFIGURE_LIBS+= -lgssapi_krb5 +. endif +. endif .if ${PORT_OPTIONS:MKERB_GSSAPI} PATCH_SITES+= http://www.sxw.org.uk/computing/patches/:gsskex PATCHFILES+= openssh-5.7p1-gsskex-all-20110125.patch:gsskex