From owner-svn-ports-all@freebsd.org Sun Feb 24 15:22:42 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 13FDA15011D9; Sun, 24 Feb 2019 15:22:42 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A7016710A8; Sun, 24 Feb 2019 15:22:41 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9333271B4; Sun, 24 Feb 2019 15:22:41 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1OFMfSh059094; Sun, 24 Feb 2019 15:22:41 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1OFMeHv059091; Sun, 24 Feb 2019 15:22:40 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201902241522.x1OFMeHv059091@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Sun, 24 Feb 2019 15:22:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493765 - in head: . security/gnutls X-SVN-Group: ports-head X-SVN-Commit-Author: tijl X-SVN-Commit-Paths: in head: . security/gnutls X-SVN-Commit-Revision: 493765 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A7016710A8 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.93 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.996,0]; NEURAL_HAM_SHORT(-0.93)[-0.932,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Sun, 24 Feb 2019 15:22:42 -0000 Author: tijl Date: Sun Feb 24 15:22:40 2019 New Revision: 493765 URL: https://svnweb.freebsd.org/changeset/ports/493765 Log: - Let gnutls look for its configuration files in PREFIX/etc instead of /etc. - Use --with-default-trust-store-file to set the location of the root certificates so configure doesn't have to autodetect this and the build dependency can be removed. - Define TEST_TARGET. - Remove DOCSDIR. The files are also in PREFIX/share/info. - Use p11-kit-trust as the default PKCS#11 trust store. PR: 235703 Reported by: mi Modified: head/UPDATING head/security/gnutls/Makefile head/security/gnutls/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Feb 24 15:09:55 2019 (r493764) +++ head/UPDATING Sun Feb 24 15:22:40 2019 (r493765) @@ -5,6 +5,19 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20190224: + AFFECTS: users of security/gnutls + AUTHOR: tijl@FreeBSD.org + + GnuTLS now looks for its configuration files in PREFIX/etc (/usr/local/etc) + instead of /etc. If the following files exist they have to be moved. On a + default installation these files do not exist. + + /etc/gnutls/default-priorities + /etc/gnutls/pkcs11.conf + /etc/tpasswd + /etc/tpasswd.conf + 20190215: AFFECTS: users of net-im/ejabberd AUTHOR: ashish@FreeBSD.org Modified: head/security/gnutls/Makefile ============================================================================== --- head/security/gnutls/Makefile Sun Feb 24 15:09:55 2019 (r493764) +++ head/security/gnutls/Makefile Sun Feb 24 15:22:40 2019 (r493765) @@ -2,7 +2,7 @@ PORTNAME= gnutls PORTVERSION= 3.6.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security net MASTER_SITES= GNUPG/gnutls/v${PORTVERSION:R} @@ -18,23 +18,25 @@ LIB_DEPENDS= libgmp.so:math/gmp \ libnettle.so:security/nettle \ libtasn1.so:security/libtasn1 \ libunistring.so:devel/libunistring -BUILD_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss -RUN_DEPENDS+= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss +RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss USES= compiler:c11 cpe gmake iconv libtool localbase makeinfo \ - pathfix pkgconfig tar:xz + pkgconfig tar:xz USE_LDCONFIG= yes + +CPE_VENDOR= gnu GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-guile \ --enable-local-libopts \ + --with-system-priority-file=${PREFIX}/etc/gnutls/default-priorities \ + --with-default-trust-store-file=${LOCALBASE}/share/certs/ca-root-nss.crt \ --with-trousers-lib=${LOCALBASE}/lib/libtspi.so.1 \ ac_cv_type_max_align_t=yes MAKE_ENV= MAKEINFOFLAGS=--no-split INSTALL_TARGET= install-strip +TEST_TARGET= check -CPE_VENDOR= gnu - -OPTIONS_DEFINE= DANE DOCS EXAMPLES IDN NLS P11KIT TPM ZLIB +OPTIONS_DEFINE= DANE EXAMPLES IDN NLS P11KIT TPM ZLIB OPTIONS_DEFAULT= IDN P11KIT TPM ZLIB OPTIONS_SUB= yes @@ -51,6 +53,7 @@ NLS_USES= gettext P11KIT_DESC= PKCS\#11 and p11-kit support P11KIT_CONFIGURE_WITH= p11-kit +P11KIT_CONFIGURE_ON= --with-default-trust-store-pkcs11="pkcs11:model=p11-kit-trust;manufacturer=PKCS%2311%20Kit" P11KIT_LIB_DEPENDS= libp11-kit.so:security/p11-kit TPM_DESC= Trusted Platform Module support @@ -63,8 +66,52 @@ INFO= gnutls gnutls-guile post-patch: @${RM} ${WRKSRC}/doc/*.info* + @${REINPLACE_CMD} 's,/usr/share,${PREFIX}/share,' \ + ${WRKSRC}/doc/manpages/*.[13] + @${REINPLACE_CMD} -E 's,/etc/(gnutls|tpasswd),${PREFIX}&,g' \ + ${WRKSRC}/doc/cha-gtls-app.texi \ + ${WRKSRC}/doc/gnutls-api.texi \ + ${WRKSRC}/doc/invoke-certtool.texi \ + ${WRKSRC}/doc/invoke-gnutls-cli.texi \ + ${WRKSRC}/doc/invoke-gnutls-serv.texi \ + ${WRKSRC}/doc/invoke-p11tool.texi \ + ${WRKSRC}/doc/invoke-srptool.texi \ + ${WRKSRC}/doc/manpages/certtool.1 \ + ${WRKSRC}/doc/manpages/gnutls_priority_init2.3 \ + ${WRKSRC}/doc/manpages/gnutls-cli.1 \ + ${WRKSRC}/doc/manpages/gnutls-serv.1 \ + ${WRKSRC}/doc/manpages/p11tool.1 \ + ${WRKSRC}/doc/manpages/srptool.1 \ + ${WRKSRC}/lib/includes/gnutls/pkcs11.h \ + ${WRKSRC}/lib/pkcs11.c \ + ${WRKSRC}/src/p11tool-args.c.bak \ + ${WRKSRC}/src/srptool.c + @${REINPLACE_CMD} \ + 's,/etc/pkcs11/modules,${PREFIX}/share/p11-kit/modules,' \ + ${WRKSRC}/doc/cha-tokens.texi \ + ${WRKSRC}/doc/invoke-p11tool.texi \ + ${WRKSRC}/doc/manpages/p11tool.1 \ + ${WRKSRC}/src/p11tool-args.c.bak +# Prevent regeneration. The order is important. + @${TOUCH} ${WRKSRC}/doc/enums.texi \ + ${WRKSRC}/doc/invoke-gnutls-cli.texi \ + ${WRKSRC}/doc/invoke-gnutls-cli-debug.texi \ + ${WRKSRC}/doc/invoke-gnutls-serv.texi \ + ${WRKSRC}/doc/invoke-certtool.texi \ + ${WRKSRC}/doc/invoke-ocsptool.texi \ + ${WRKSRC}/doc/invoke-danetool.texi \ + ${WRKSRC}/doc/invoke-srptool.texi \ + ${WRKSRC}/doc/invoke-psktool.texi \ + ${WRKSRC}/doc/invoke-p11tool.texi \ + ${WRKSRC}/doc/invoke-tpmtool.texi \ + ${WRKSRC}/doc/pkcs11-api.texi \ + ${WRKSRC}/doc/manpages/stamp_mans \ + ${WRKSRC}/doc/stamp_enums \ + ${WRKSRC}/doc/stamp_functions post-install: + @${RM} ${STAGEDIR}${DOCSDIR}/*.png + @${RMDIR} ${STAGEDIR}${DOCSDIR} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/examples/*.[ch] ${STAGEDIR}${EXAMPLESDIR} Modified: head/security/gnutls/pkg-plist ============================================================================== --- head/security/gnutls/pkg-plist Sun Feb 24 15:09:55 2019 (r493764) +++ head/security/gnutls/pkg-plist Sun Feb 24 15:22:40 2019 (r493765) @@ -1173,15 +1173,6 @@ man/man3/gnutls_x509_trust_list_remove_trust_mem.3.gz man/man3/gnutls_x509_trust_list_verify_crt.3.gz man/man3/gnutls_x509_trust_list_verify_crt2.3.gz man/man3/gnutls_x509_trust_list_verify_named_crt.3.gz -%%PORTDOCS%%%%DOCSDIR%%/gnutls-client-server-use-case.png -%%PORTDOCS%%%%DOCSDIR%%/gnutls-handshake-sequence.png -%%PORTDOCS%%%%DOCSDIR%%/gnutls-handshake-state.png -%%PORTDOCS%%%%DOCSDIR%%/gnutls-internals.png -%%PORTDOCS%%%%DOCSDIR%%/gnutls-layers.png -%%PORTDOCS%%%%DOCSDIR%%/gnutls-logo.png -%%PORTDOCS%%%%DOCSDIR%%/gnutls-modauth.png -%%PORTDOCS%%%%DOCSDIR%%/gnutls-x509.png -%%PORTDOCS%%%%DOCSDIR%%/pkcs11-vision.png %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-alert.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select-pkcs11.c %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex-cert-select.c