Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Mar 2014 19:53:28 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r349185 - head/ftp/curl
Message-ID:  <201403251953.s2PJrSmw064322@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Tue Mar 25 19:53:27 2014
New Revision: 349185
URL: http://svnweb.freebsd.org/changeset/ports/349185
QAT: https://qat.redports.org/buildarchive/r349185/

Log:
  - Add security/heimdal and security/krb5 support and corresponding options:
    - GSSAPI_BASE for base system (default)
    - HEIMDAL_PORT for security/heimdal
    - KRB5_PORT for security/krb5
  
  Tested by:	redports

Modified:
  head/ftp/curl/Makefile

Modified: head/ftp/curl/Makefile
==============================================================================
--- head/ftp/curl/Makefile	Tue Mar 25 19:41:30 2014	(r349184)
+++ head/ftp/curl/Makefile	Tue Mar 25 19:53:27 2014	(r349185)
@@ -12,14 +12,18 @@ COMMENT?=	Non-interactive tool to get fi
 
 LICENSE=	MIT
 
-OPTIONS_DEFINE=	CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES GSSAPI IDN IPV6 LDAP LDAPS LIBSSH2 PROXY RTMP SPNEGO TLS_SRP
-OPTIONS_RADIO=	RESOLV SSL
+OPTIONS_DEFINE=	CA_BUNDLE COOKIES CURL_DEBUG DEBUG DOCS EXAMPLES IDN IPV6 LDAP LDAPS LIBSSH2 PROXY RTMP SPNEGO TLS_SRP
+OPTIONS_RADIO=	GSSAPI RESOLV SSL
+OPTIONS_RADIO_GSSAPI=	GSSAPI_BASE HEIMDAL_PORT KRB5_PORT
 OPTIONS_RADIO_RESOLV=	CARES THREADED_RESOLVER
 OPTIONS_RADIO_SSL=	CYASSL GNUTLS NSS OPENSSL POLARSSL
-OPTIONS_DEFAULT=CA_BUNDLE COOKIES GSSAPI IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER SSL TLS_SRP
+OPTIONS_DEFAULT=CA_BUNDLE COOKIES GSSAPI_BASE IPV6 OPENSSL PROXY RESOLV THREADED_RESOLVER SSL TLS_SRP
 CA_BUNDLE_DESC=	Install CA bundle for OpenSSL
 COOKIES_DESC=	Cookies support
 CURL_DEBUG_DESC=cURL debug memory tracking
+GSSAPI_BASE_DESC=	GSSAPI support via base system
+HEIMDAL_PORT_DESC=	GSSAPI support via security/heimdal
+KRB5_PORT_DESC=	GSSAPI support via security/krb5
 LIBSSH2_DESC=	SCP/SFTP support via libssh2
 RESOLV_DESC=	DNS resolving options
 SPNEGO_DESC=	SPNEGO (RFC 4178) support
@@ -50,6 +54,9 @@ DOCS=		BINDINGS BUGS CONTRIBUTE DISTRO-D
 
 SLAVEDIRS=	ftp/curl-hiphop
 
+HEIMDAL_HOME?=	${PREFIX}
+KRB5_HOME?=	${PREFIX}
+
 CA_BUNDLE_CONFIGURE_OFF=--without-ca-bundle
 CA_BUNDLE_CONFIGURE_ON=	--with-ca-bundle=${LOCALBASE}/share/certs/ca-root-nss.crt
 CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
@@ -68,15 +75,22 @@ DEBUG_CONFIGURE_ON=	--enable-debug
 GNUTLS_CONFIGURE_OFF=	--without-gnutls
 GNUTLS_CONFIGURE_ON=	--with-gnutls=${LOCALBASE}
 GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
-GSSAPI_CONFIGURE_OFF=	--without-gssapi
-GSSAPI_CONFIGURE_ON=	--with-gssapi=/usr
-GSSAPI_CPPFLAGS=	-I${INCLUDEDIR}/gssapi
+GSSAPI_BASE_CONFIGURE_ON=	--with-gssapi=/usr
+GSSAPI_BASE_CPPFLAGS=	-I${INCLUDEDIR}/gssapi
+HEIMDAL_PORT_CONFIGURE_ON=	--with-gssapi=${HEIMDAL_HOME}
+HEIMDAL_PORT_CPPFLAGS=	-I${HEIMDAL_HOME}/include
+HEIMDAL_PORT_LDFLAGS=	-L${HEIMDAL_HOME}/lib
+HEIMDAL_PORT_LIB_DEPENDS=	libgssapi.so:${PORTSDIR}/security/heimdal
 IDN_CONFIGURE_OFF=	--without-libidn
 IDN_CONFIGURE_ON=	--with-libidn=${LOCALBASE}
 IDN_LIB_DEPENDS=	libidn.so:${PORTSDIR}/dns/libidn
 IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 IPV6_CONFIGURE_ON=	--enable-ipv6
+KRB5_PORT_CONFIGURE_ON=	--with-gssapi=${KRB5_HOME}
+KRB5_PORT_CPPFLAGS=	-I${KRB5_HOME}/include
+KRB5_PORT_LDFLAGS=	-L${KRB5_HOME}/lib
+KRB5_PORT_LIB_DEPENDS=	libgssapi_krb5.so:${PORTSDIR}/security/krb5
 LDAP_CONFIGURE_OFF=	--disable-ldap
 LDAP_CONFIGURE_ON=	--enable-ldap
 LDAP_CPPFLAGS=		-I${LOCALBASE}/include
@@ -134,6 +148,10 @@ IGNORE=		only supports LDAPS with SSL
 IGNORE=		only supports LIBSSH2 with OpenSSL
 .endif
 
+.if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MHEIMDAL_PORT} && !${PORT_OPTIONS:MKRB5_PORT}
+CONFIGURE_ARGS+=--without-gssapi
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(flags_dbg_off=\)".*"|\1""|; s|\(flags_opt_off=\)".*"|\1""|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^SUBDIRS = / s|$$| docs|; /^DIST_SUBDIRS = / s| docs||; /cd docs &&/d' ${WRKSRC}/Makefile.in



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403251953.s2PJrSmw064322>