Attachment #217431 for bug #248819




# $FreeBSD$

PORTNAME=	p11-kit
PORTVERSION=	0.23.21
PORTREVISION=	1
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


LIB_DEPENDS=	libtasn1.so:security/libtasn1 \
		libffi.so:devel/libffi

USES=		localbase meson pkgconfig tar:xz
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
USE_LDCONFIG=	yes

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

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:
	${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 <bsd.port.mk>

Lines 1-3 Link Here

(-)b/security/p11-kit/distinfo (-3 / +5 lines)
1	TIMESTAMP = 1584241896	1	TIMESTAMP = 1598049189
2	SHA256 (p11-kit-0.23.20.tar.xz) = 14d86024c3dfd6b967d9bc0b4ec7b2973014fe7423481f4d230a1a63b8aa6104	2	SHA256 (p11-kit-0.23.21.tar.xz) = f1baa493f05ca0d867f06bcb54cbb5cdb28c756db07207b6e18de18a87b10627
3	SIZE (p11-kit-0.23.20.tar.xz) = 822588	3	SIZE (p11-kit-0.23.21.tar.xz) = 827064
		4	SHA256 (1a21df391691d9a9c7b5ebc77022385f7feb266b.patch) = b99d6de5a0e2aebf2338476ff2dd1cb30061e91ab9c2064b6af63fe9b5e1bb76
		5	SIZE (1a21df391691d9a9c7b5ebc77022385f7feb266b.patch) = 768




libexec/p11-kit/p11-kit-remote
libexec/p11-kit/p11-kit-server
libexec/p11-kit/trust-extract-compat
%%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

Return to bug 248819

Lines 2-12 Link Here

(-)b/security/p11-kit/Makefile (-13 / +34 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= p11-kit	4	PORTNAME= p11-kit
5	PORTVERSION= 0.23.20	5	PORTVERSION= 0.23.21
6	PORTREVISION= 1
7	CATEGORIES= security devel	6	CATEGORIES= security devel
8	MASTER_SITES= https://github.com/p11-glue/p11-kit/releases/download/${PORTVERSION}/	7	MASTER_SITES= https://github.com/p11-glue/p11-kit/releases/download/${PORTVERSION}/
9		8
		9	# Partially backport https://github.com/p11-glue/p11-kit/pull/315
		10	PATCH_SITES= https://github.com/p11-glue/p11-kit/commit/
		11	PATCHFILES= 1a21df391691d9a9c7b5ebc77022385f7feb266b.patch:-p1
		12
10	MAINTAINER= novel@FreeBSD.org	13	MAINTAINER= novel@FreeBSD.org
11	COMMENT= Library for loading and enumerating of PKCS\#11 modules	14	COMMENT= Library for loading and enumerating of PKCS\#11 modules
12		15
Lines 18-37 BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss Link Here
18	LIB_DEPENDS= libtasn1.so:security/libtasn1 \	21	LIB_DEPENDS= libtasn1.so:security/libtasn1 \
19	libffi.so:devel/libffi	22	libffi.so:devel/libffi
20		23
21	GNU_CONFIGURE= yes	24	USES= localbase meson pkgconfig tar:xz
22	CONFIGURE_ARGS= --disable-nls --enable-debug=no \
23	--with-trust-paths=${LOCALBASE}/share/certs/ca-root-nss.crt
24	MAKE_ENV= exampledir=${STAGEDIR}${EXAMPLESDIR}
25	INSTALL_TARGET= install-strip
26
27	USES= tar:xz gmake libtool pathfix pkgconfig
28	USE_LDCONFIG= yes	25	USE_LDCONFIG= yes
29		26
30	TEST_TARGET= check	27	MESON_ARGS= -Dlibffi=enabled -Dtrust_module=enabled \
		28	-Dtrust_paths=${LOCALBASE}/share/certs/ca-root-nss.crt \
		29	-Dnls=false
		30
		31	OPTIONS_DEFINE= BASH DOCS MANPAGES TEST
		32	OPTIONS_SUB= yes
		33	MANPAGES_IMPLIES= DOCS
		34
		35	BASH_BUILD_DEPENDS= bash-completion>=0:shells/bash-completion
		36	BASH_RUN_DEPENDS= bash-completion>=0:shells/bash-completion
		37	BASH_MESON_ENABLED= bash_completion
31		38
		39	DOCS_BUILD_DEPENDS= gtkdoc-scan:textproc/gtk-doc
		40	DOCS_USES= gnome
		41	DOCS_USE= GNOME=glib20
		42	DOCS_MESON_TRUE= gtk_doc
		43
		44	MANPAGES_BUILD_DEPENDS= xsltproc:textproc/libxslt
		45	MANPAGES_MESON_TRUE= man
		46
		47	TEST_MESON_TRUE= test
		48
		49	# Partially backport https://github.com/p11-glue/p11-kit/pull/315
32	pre-configure:	50	pre-configure:
33	@${REINPLACE_CMD} -e \	51	${MV} ${WRKSRC}/trust/trust-extract-compat.in ${WRKSRC}/trust/trust-extract-compat
34	's\|exampledir = $$(p11_system_config)\|exampledir = ${EXAMPLESDIR}\|' \	52
35	${WRKSRC}/Makefile.in	53	post-install:
		54	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
		55	${MV} ${STAGEDIR}${PREFIX}/etc/pkcs11/pkcs11.conf.example ${STAGEDIR}${EXAMPLESDIR}
		56	${RMDIR} ${STAGEDIR}${PREFIX}/etc/pkcs11
36		57
37	.include <bsd.port.mk>	58	.include <bsd.port.mk>

Lines 18-61 libdata/pkgconfig/p11-kit-1.pc Link Here

(-)b/security/p11-kit/pkg-plist (-39 / +43 lines)
18	libexec/p11-kit/p11-kit-remote	18	libexec/p11-kit/p11-kit-remote
19	libexec/p11-kit/p11-kit-server	19	libexec/p11-kit/p11-kit-server
20	libexec/p11-kit/trust-extract-compat	20	libexec/p11-kit/trust-extract-compat
21	share/gtk-doc/html/p11-kit/config-example.html	21	%%MANPAGES%%man/man1/trust.1.gz
22	share/gtk-doc/html/p11-kit/config-files.html	22	%%MANPAGES%%man/man5/pkcs11.conf.5.gz
23	share/gtk-doc/html/p11-kit/config.html	23	%%MANPAGES%%man/man8/p11-kit.8.gz
24	share/gtk-doc/html/p11-kit/devel-building-style.html	24	%%BASH%%share/bash-completion/completions/p11-kit
25	share/gtk-doc/html/p11-kit/devel-building.html	25	%%BASH%%share/bash-completion/completions/trust
26	share/gtk-doc/html/p11-kit/devel-commands.html	26	%%DOCS%%share/gtk-doc/html/p11-kit/config-example.html
27	share/gtk-doc/html/p11-kit/devel-debugging.html	27	%%DOCS%%share/gtk-doc/html/p11-kit/config-files.html
28	share/gtk-doc/html/p11-kit/devel-paths.html	28	%%DOCS%%share/gtk-doc/html/p11-kit/config.html
29	share/gtk-doc/html/p11-kit/devel-testing.html	29	%%DOCS%%share/gtk-doc/html/p11-kit/devel-building-style.html
30	share/gtk-doc/html/p11-kit/devel.html	30	%%DOCS%%share/gtk-doc/html/p11-kit/devel-building.html
31	share/gtk-doc/html/p11-kit/gtk-doc.css	31	%%DOCS%%share/gtk-doc/html/p11-kit/devel-commands.html
32	share/gtk-doc/html/p11-kit/home.png	32	%%DOCS%%share/gtk-doc/html/p11-kit/devel-debugging.html
33	share/gtk-doc/html/p11-kit/index.html	33	%%DOCS%%share/gtk-doc/html/p11-kit/devel-paths.html
34	share/gtk-doc/html/p11-kit/left-insensitive.png	34	%%DOCS%%share/gtk-doc/html/p11-kit/devel-testing.html
35	share/gtk-doc/html/p11-kit/left.png	35	%%DOCS%%share/gtk-doc/html/p11-kit/devel.html
36	share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html	36	%%DOCS%%share/gtk-doc/html/p11-kit/home.png
37	share/gtk-doc/html/p11-kit/p11-kit-Future.html	37	%%DOCS%%share/gtk-doc/html/p11-kit/index.html
38	share/gtk-doc/html/p11-kit/p11-kit-Modules.html	38	%%DOCS%%share/gtk-doc/html/p11-kit/left-insensitive.png
39	share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html	39	%%DOCS%%share/gtk-doc/html/p11-kit/left.png
40	share/gtk-doc/html/p11-kit/p11-kit-URIs.html	40	%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Deprecated.html
41	share/gtk-doc/html/p11-kit/p11-kit-Utilities.html	41	%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Future.html
42	share/gtk-doc/html/p11-kit/p11-kit.devhelp2	42	%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Modules.html
43	share/gtk-doc/html/p11-kit/p11-kit.html	43	%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-PIN-Callbacks.html
44	share/gtk-doc/html/p11-kit/pkcs11-conf.html	44	%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-URIs.html
45	share/gtk-doc/html/p11-kit/reference.html	45	%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit-Utilities.html
46	share/gtk-doc/html/p11-kit/remoting.html	46	%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit.devhelp2
47	share/gtk-doc/html/p11-kit/right-insensitive.png	47	%%DOCS%%share/gtk-doc/html/p11-kit/p11-kit.html
48	share/gtk-doc/html/p11-kit/right.png	48	%%DOCS%%share/gtk-doc/html/p11-kit/pkcs11-conf.html
49	share/gtk-doc/html/p11-kit/sharing-managed.html	49	%%DOCS%%share/gtk-doc/html/p11-kit/reference.html
50	share/gtk-doc/html/p11-kit/sharing.html	50	%%DOCS%%share/gtk-doc/html/p11-kit/remoting.html
51	share/gtk-doc/html/p11-kit/style.css	51	%%DOCS%%share/gtk-doc/html/p11-kit/right-insensitive.png
52	share/gtk-doc/html/p11-kit/tools.html	52	%%DOCS%%share/gtk-doc/html/p11-kit/right.png
53	share/gtk-doc/html/p11-kit/trust-disable.html	53	%%DOCS%%share/gtk-doc/html/p11-kit/sharing-managed.html
54	share/gtk-doc/html/p11-kit/trust-glib-networking.html	54	%%DOCS%%share/gtk-doc/html/p11-kit/sharing.html
55	share/gtk-doc/html/p11-kit/trust-module.html	55	%%DOCS%%share/gtk-doc/html/p11-kit/style.css
56	share/gtk-doc/html/p11-kit/trust-nss.html	56	%%DOCS%%share/gtk-doc/html/p11-kit/tools.html
57	share/gtk-doc/html/p11-kit/trust.html	57	%%DOCS%%share/gtk-doc/html/p11-kit/trust-disable.html
58	share/gtk-doc/html/p11-kit/up-insensitive.png	58	%%DOCS%%share/gtk-doc/html/p11-kit/trust-glib-networking.html
59	share/gtk-doc/html/p11-kit/up.png	59	%%DOCS%%share/gtk-doc/html/p11-kit/trust-module.html
		60	%%DOCS%%share/gtk-doc/html/p11-kit/trust-nss.html
		61	%%DOCS%%share/gtk-doc/html/p11-kit/trust.html
		62	%%DOCS%%share/gtk-doc/html/p11-kit/up-insensitive.png
		63	%%DOCS%%share/gtk-doc/html/p11-kit/up.png
60	%%DATADIR%%/modules/p11-kit-trust.module	64	%%DATADIR%%/modules/p11-kit-trust.module
61	%%EXAMPLESDIR%%/pkcs11.conf.example	65	%%EXAMPLESDIR%%/pkcs11.conf.example