Index: head/security/p11-kit/Makefile =================================================================== --- head/security/p11-kit/Makefile (revision 545734) +++ head/security/p11-kit/Makefile (revision 545735) @@ -1,37 +1,59 @@ # Created by: Roman Bogorodskiy # $FreeBSD$ PORTNAME= p11-kit -PORTVERSION= 0.23.20 -PORTREVISION= 1 +PORTVERSION= 0.23.21 CATEGORIES= security devel MASTER_SITES= https://github.com/p11-glue/p11-kit/releases/download/${PORTVERSION}/ +# Partially backport https://github.com/p11-glue/p11-kit/pull/315 +PATCH_SITES= https://github.com/p11-glue/p11-kit/commit/ +PATCHFILES= 1a21df391691d9a9c7b5ebc77022385f7feb266b.patch:-p1 + MAINTAINER= novel@FreeBSD.org COMMENT= Library for loading and enumerating of PKCS\#11 modules LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss LIB_DEPENDS= libtasn1.so:security/libtasn1 \ libffi.so:devel/libffi -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-nls --enable-debug=no \ - --with-trust-paths=${LOCALBASE}/share/certs/ca-root-nss.crt -MAKE_ENV= exampledir=${STAGEDIR}${EXAMPLESDIR} -INSTALL_TARGET= install-strip - -USES= tar:xz gmake libtool pathfix pkgconfig +USES= localbase meson pkgconfig tar:xz USE_LDCONFIG= yes -TEST_TARGET= check +MESON_ARGS= -Dlibffi=enabled -Dtrust_module=enabled \ + -Dtrust_paths=${LOCALBASE}/share/certs/ca-root-nss.crt \ + -Dnls=false +OPTIONS_DEFINE= BASH DOCS MANPAGES TEST +OPTIONS_SUB= yes +MANPAGES_IMPLIES= DOCS +OPTIONS_DEFAULT= BASH MANPAGES + +BASH_BUILD_DEPENDS= bash-completion>=0:shells/bash-completion +BASH_RUN_DEPENDS= bash-completion>=0:shells/bash-completion +BASH_MESON_ENABLED= bash_completion + +DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc +DOCS_USES= gnome +DOCS_USE= GNOME=glib20 +DOCS_MESON_TRUE= gtk_doc + +MANPAGES_BUILD_DEPENDS= xsltproc:textproc/libxslt +MANPAGES_MESON_TRUE= man + +TEST_MESON_TRUE= test + +# Partially backport https://github.com/p11-glue/p11-kit/pull/315 pre-configure: - @${REINPLACE_CMD} -e \ - 's|exampledir = $$(p11_system_config)|exampledir = ${EXAMPLESDIR}|' \ - ${WRKSRC}/Makefile.in + ${MV} ${WRKSRC}/trust/trust-extract-compat.in ${WRKSRC}/trust/trust-extract-compat + +post-install: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${MV} ${STAGEDIR}${PREFIX}/etc/pkcs11/pkcs11.conf.example ${STAGEDIR}${EXAMPLESDIR} + ${RMDIR} ${STAGEDIR}${PREFIX}/etc/pkcs11 .include Index: head/security/p11-kit/distinfo =================================================================== --- head/security/p11-kit/distinfo (revision 545734) +++ head/security/p11-kit/distinfo (revision 545735) @@ -1,3 +1,5 @@ -TIMESTAMP = 1584241896 -SHA256 (p11-kit-0.23.20.tar.xz) = 14d86024c3dfd6b967d9bc0b4ec7b2973014fe7423481f4d230a1a63b8aa6104 -SIZE (p11-kit-0.23.20.tar.xz) = 822588 +TIMESTAMP = 1598049189 +SHA256 (p11-kit-0.23.21.tar.xz) = f1baa493f05ca0d867f06bcb54cbb5cdb28c756db07207b6e18de18a87b10627 +SIZE (p11-kit-0.23.21.tar.xz) = 827064 +SHA256 (1a21df391691d9a9c7b5ebc77022385f7feb266b.patch) = b99d6de5a0e2aebf2338476ff2dd1cb30061e91ab9c2064b6af63fe9b5e1bb76 +SIZE (1a21df391691d9a9c7b5ebc77022385f7feb266b.patch) = 768 Index: head/security/p11-kit/pkg-plist =================================================================== --- head/security/p11-kit/pkg-plist (revision 545734) +++ head/security/p11-kit/pkg-plist (revision 545735) @@ -1,61 +1,65 @@ bin/p11-kit bin/trust include/p11-kit-1/p11-kit/deprecated.h include/p11-kit-1/p11-kit/iter.h include/p11-kit-1/p11-kit/p11-kit.h include/p11-kit-1/p11-kit/pin.h include/p11-kit-1/p11-kit/pkcs11.h include/p11-kit-1/p11-kit/pkcs11x.h include/p11-kit-1/p11-kit/remote.h include/p11-kit-1/p11-kit/uri.h lib/libp11-kit.so lib/libp11-kit.so.0 lib/libp11-kit.so.0.3.0 lib/p11-kit-proxy.so lib/pkcs11/p11-kit-client.so lib/pkcs11/p11-kit-trust.so libdata/pkgconfig/p11-kit-1.pc libexec/p11-kit/p11-kit-remote libexec/p11-kit/p11-kit-server libexec/p11-kit/trust-extract-compat -share/gtk-doc/html/p11-kit/config-example.html -share/gtk-doc/html/p11-kit/config-files.html -share/gtk-doc/html/p11-kit/config.html -share/gtk-doc/html/p11-kit/devel-building-style.html -share/gtk-doc/html/p11-kit/devel-building.html -share/gtk-doc/html/p11-kit/devel-commands.html -share/gtk-doc/html/p11-kit/devel-debugging.html -share/gtk-doc/html/p11-kit/devel-paths.html -share/gtk-doc/html/p11-kit/devel-testing.html -share/gtk-doc/html/p11-kit/devel.html -share/gtk-doc/html/p11-kit/gtk-doc.css -share/gtk-doc/html/p11-kit/home.png -share/gtk-doc/html/p11-kit/index.html -share/gtk-doc/html/p11-kit/left-insensitive.png -share/gtk-doc/html/p11-kit/left.png -share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html -share/gtk-doc/html/p11-kit/p11-kit-Future.html -share/gtk-doc/html/p11-kit/p11-kit-Modules.html -share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html -share/gtk-doc/html/p11-kit/p11-kit-URIs.html -share/gtk-doc/html/p11-kit/p11-kit-Utilities.html -share/gtk-doc/html/p11-kit/p11-kit.devhelp2 -share/gtk-doc/html/p11-kit/p11-kit.html -share/gtk-doc/html/p11-kit/pkcs11-conf.html -share/gtk-doc/html/p11-kit/reference.html -share/gtk-doc/html/p11-kit/remoting.html -share/gtk-doc/html/p11-kit/right-insensitive.png -share/gtk-doc/html/p11-kit/right.png -share/gtk-doc/html/p11-kit/sharing-managed.html -share/gtk-doc/html/p11-kit/sharing.html -share/gtk-doc/html/p11-kit/style.css -share/gtk-doc/html/p11-kit/tools.html -share/gtk-doc/html/p11-kit/trust-disable.html -share/gtk-doc/html/p11-kit/trust-glib-networking.html -share/gtk-doc/html/p11-kit/trust-module.html -share/gtk-doc/html/p11-kit/trust-nss.html -share/gtk-doc/html/p11-kit/trust.html -share/gtk-doc/html/p11-kit/up-insensitive.png -share/gtk-doc/html/p11-kit/up.png +%%MANPAGES%%man/man1/trust.1.gz +%%MANPAGES%%man/man5/pkcs11.conf.5.gz +%%MANPAGES%%man/man8/p11-kit.8.gz +%%BASH%%share/bash-completion/completions/p11-kit +%%BASH%%share/bash-completion/completions/trust +%%DOCS%%share/gtk-doc/html/p11-kit/config-example.html +%%DOCS%%share/gtk-doc/html/p11-kit/config-files.html +%%DOCS%%share/gtk-doc/html/p11-kit/config.html +%%DOCS%%share/gtk-doc/html/p11-kit/devel-building-style.html +%%DOCS%%share/gtk-doc/html/p11-kit/devel-building.html +%%DOCS%%share/gtk-doc/html/p11-kit/devel-commands.html +%%DOCS%%share/gtk-doc/html/p11-kit/devel-debugging.html +%%DOCS%%share/gtk-doc/html/p11-kit/devel-paths.html +%%DOCS%%share/gtk-doc/html/p11-kit/devel-testing.html +%%DOCS%%share/gtk-doc/html/p11-kit/devel.html +%%DOCS%%share/gtk-doc/html/p11-kit/home.png +%%DOCS%%share/gtk-doc/html/p11-kit/index.html +%%DOCS%%share/gtk-doc/html/p11-kit/left-insensitive.png +%%DOCS%%share/gtk-doc/html/p11-kit/left.png +%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html +%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Future.html +%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Modules.html +%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html +%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-URIs.html +%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Utilities.html +%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit.devhelp2 +%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit.html +%%DOCS%%share/gtk-doc/html/p11-kit/pkcs11-conf.html +%%DOCS%%share/gtk-doc/html/p11-kit/reference.html +%%DOCS%%share/gtk-doc/html/p11-kit/remoting.html +%%DOCS%%share/gtk-doc/html/p11-kit/right-insensitive.png +%%DOCS%%share/gtk-doc/html/p11-kit/right.png +%%DOCS%%share/gtk-doc/html/p11-kit/sharing-managed.html +%%DOCS%%share/gtk-doc/html/p11-kit/sharing.html +%%DOCS%%share/gtk-doc/html/p11-kit/style.css +%%DOCS%%share/gtk-doc/html/p11-kit/tools.html +%%DOCS%%share/gtk-doc/html/p11-kit/trust-disable.html +%%DOCS%%share/gtk-doc/html/p11-kit/trust-glib-networking.html +%%DOCS%%share/gtk-doc/html/p11-kit/trust-module.html +%%DOCS%%share/gtk-doc/html/p11-kit/trust-nss.html +%%DOCS%%share/gtk-doc/html/p11-kit/trust.html +%%DOCS%%share/gtk-doc/html/p11-kit/up-insensitive.png +%%DOCS%%share/gtk-doc/html/p11-kit/up.png %%DATADIR%%/modules/p11-kit-trust.module %%EXAMPLESDIR%%/pkcs11.conf.example