Date: Tue, 29 Jul 2014 09:14:01 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363301 - head/security/gnutls Message-ID: <201407290914.s6T9E1J4059230@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Tue Jul 29 09:14:01 2014 New Revision: 363301 URL: http://svnweb.freebsd.org/changeset/ports/363301 QAT: https://qat.redports.org/buildarchive/r363301/ Log: security/gnutls: Support OPTIONal library dependencies Factor out libidn, libp11-kit and libtspi into OPTIONal library dependencies, with the CRYWRAP, P11KIT and TPM options respectively, as per the upstream documentation [1]. Make ZLIB an OPTION because we can, and the choice to customise compression support in security software (especially lately) may be very useful for some consumers. Add CRYWRAP, P11KIT, TPM and ZLIB to OPTIONS_DEFAULT to retain current default functionality. [1] http://gnutls.org/manual/html_node/Downloading-and-installing.html Inspired by: Recent gnutls 2 -> 3 change, fan of minimal dependencies PR: 192090 Submitted by: koobs Approved by: maintainer Modified: head/security/gnutls/Makefile head/security/gnutls/pkg-plist Modified: head/security/gnutls/Makefile ============================================================================== --- head/security/gnutls/Makefile Tue Jul 29 08:52:17 2014 (r363300) +++ head/security/gnutls/Makefile Tue Jul 29 09:14:01 2014 (r363301) @@ -2,7 +2,7 @@ PORTNAME= gnutls PORTVERSION= 3.2.16 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security net MASTER_SITES= GNUPG/gnutls/v3.2 @@ -15,10 +15,7 @@ LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LESSER LIB_DEPENDS= libnettle.so:${PORTSDIR}/security/nettle \ - libp11-kit.so:${PORTSDIR}/security/p11-kit \ - libidn.so:${PORTSDIR}/dns/libidn \ - libtasn1.so:${PORTSDIR}/security/libtasn1 \ - libtspi.so:${PORTSDIR}/security/trousers + libtasn1.so:${PORTSDIR}/security/libtasn1 USES= gmake iconv libtool makeinfo pathfix pkgconfig tar:xz USE_LDCONFIG= yes @@ -30,16 +27,31 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV= MAKEINFOFLAGS=--no-split -OPTIONS_DEFINE= EXAMPLES LIBDANE NLS -OPTIONS_SUB= yes +OPTIONS_DEFINE= CRYWRAP EXAMPLES LIBDANE NLS P11KIT TPM ZLIB +OPTIONS_DEFAULT= CRYWRAP P11KIT TPM ZLIB +OPTIONS_SUB= yes + +CRYWRAP_DESC= Enable Crywrap TLS proxy service +CRYWRAP_LIB_DEPENDS= libidn.so:${PORTSDIR}/dns/libidn +CRYWRAP_CONFIGURE_ENABLE= crywrap -LIBDANE_DESC= DNSSEC support for DANE (danetool --check) -LIBDANE_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound +LIBDANE_DESC= DNSSEC support for DANE (danetool --check) +LIBDANE_LIB_DEPENDS= libunbound.so:${PORTSDIR}/dns/unbound LIBDANE_CONFIGURE_ENABLE= libdane NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext +P11KIT_DESC= PKCS\#11 and p11-kit support +P11KIT_CONFIGURE_WITH= p11-kit +P11KIT_LIB_DEPENDS= libp11-kit.so:${PORTSDIR}/security/p11-kit + +TPM_DESC= TPM (trousers) support +TPM_CONFIGURE_WITH= tpm +TPM_LIB_DEPENDS= libtspi.so:${PORTSDIR}/security/trousers + +ZLIB_CONFIGURE_WITH= zlib + INFO= gnutls gnutls-guile post-patch: Modified: head/security/gnutls/pkg-plist ============================================================================== --- head/security/gnutls/pkg-plist Tue Jul 29 08:52:17 2014 (r363300) +++ head/security/gnutls/pkg-plist Tue Jul 29 09:14:01 2014 (r363301) @@ -4,10 +4,10 @@ bin/gnutls-cli bin/gnutls-cli-debug bin/gnutls-serv bin/ocsptool -bin/p11tool +%%P11KIT%%bin/p11tool bin/psktool bin/srptool -bin/tpmtool +%%TPM%%bin/tpmtool include/gnutls/abstract.h include/gnutls/compat.h include/gnutls/crypto.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407290914.s6T9E1J4059230>