svn commit: r336138 - head/security/krb5

[Cy Schubert]

Author: cy
Date: Wed Dec 11 03:45:23 2013
New Revision: 336138
URL: http://svnweb.freebsd.org/changeset/ports/336138

Log:
  Add LDAP support.
  
  PR:		184557
  Submitted by:	Erick Turnquist <jhujhiti at adjectivism.org>

Modified:
  head/security/krb5/Makefile
  head/security/krb5/pkg-plist

Modified: head/security/krb5/Makefile
==============================================================================
--- head/security/krb5/Makefile	Wed Dec 11 01:53:16 2013	(r336137)
+++ head/security/krb5/Makefile	Wed Dec 11 03:45:23 2013	(r336138)
@@ -3,7 +3,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.11.3
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
@@ -32,11 +32,12 @@ CONFIGURE_ARGS?=	--enable-shared --witho
 CONFIGURE_ENV=		INSTALL="${INSTALL}" YACC="${YACC}"
 MAKE_ARGS=		INSTALL="${INSTALL}"
 
-OPTIONS_DEFINE=		KRB5_PDF KRB5_HTML DNS_FOR_REALM
+OPTIONS_DEFINE=		KRB5_PDF KRB5_HTML DNS_FOR_REALM LDAP
 OPTIONS_DEFAULT=	KRB5_PDF KRB5_HTML
 KRB5_PDF_DESC=		Install krb5 PDF documentation
 KRB5_HTML_DESC=		Install krb5 HTML documentation
 DNS_FOR_REALM_DESC=	Enable DNS lookups for Kerberos realm names
+LDAP=			Enable LDAP support
 
 .if defined(KRB5_HOME)
 PREFIX=			${KRB5_HOME}
@@ -44,6 +45,7 @@ CFLAGS+=		-rpath=${KRB5_HOME}/lib
 LDFLAGS+=		-rpath=${KRB5_HOME}/lib
 .endif
 LDFLAGS+=		-L${LOCALBASE}/lib
+CFLAGS+=		-I${LOCALBASE}/include
 
 USE_OPENSSL=		yes
 
@@ -54,6 +56,11 @@ NO_STAGE=	yes
 CONFIGURE_ARGS+=	--enable-dns-for-realm
 .endif
 
+.if ${PORT_OPTIONS:MLDAP}
+USE_OPENLDAP=		yes
+CONFIGURE_ARGS+=	--with-ldap
+.endif
+
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 
 MAN1=			k5srvutil.1 kadmin.1 krb5-config.1 krb5-send-pr.1 \
@@ -74,7 +81,7 @@ WRKSRC=			${WRKDIR}/${PORTNAME}-${PORTVE
 HTML_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/html
 PDF_DOC_DIR=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc/pdf
 
-CONFIGURE_ARGS+=	CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}"
+CONFIGURE_ARGS+=	CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB} -L${LOCALBASE}/include"
 
 post-extract:
 	@${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz

Modified: head/security/krb5/pkg-plist
==============================================================================
--- head/security/krb5/pkg-plist	Wed Dec 11 01:53:16 2013	(r336137)
+++ head/security/krb5/pkg-plist	Wed Dec 11 03:45:23 2013	(r336138)
@@ -38,6 +38,7 @@ include/gssrpc/svc_auth.h
 include/gssrpc/types.h
 include/gssrpc/xdr.h
 include/krb5.h
+%%LDAP%%include/krb5/ccselect_plugin.h
 include/krb5/kadm5_hook_plugin.h
 include/krb5/krb5.h
 include/krb5/locate_plugin.h
@@ -72,12 +73,16 @@ lib/libkrb5.so.3
 lib/libkrb5support.so
 lib/libkrb5support.so.0
 lib/krb5/plugins/kdb/db2.so
+%%LDAP%%lib/krb5/plugins/kdb/kldap.so
 lib/krb5/plugins/preauth/pkinit.so
+%%LDAP%%lib/libkdb_ldap.so
+%%LDAP%%lib/libkdb_ldap.so.1
 lib/libverto.so.0
 lib/libverto.so
 sbin/gss-server
 sbin/kadmin.local
 sbin/kadmind
+%%LDAP%%sbin/kdb5_ldap_util
 sbin/kdb5_util
 sbin/kprop
 sbin/kpropd