Attachment 235312 Details for Bug 265189 – Corrected patch against current ports tree (revision 1)

[patch] Corrected patch against current ports tree (revision 1)

libpki-r1.patch (text/plain), 5.82 KB, created by Bruno Damour on 2022-07-17 20:18:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bruno Damour

Created: 2022-07-17 20:18:31 UTC

Size: 5.82 KB

patch

obsolete

>From 31637a6d33f1ae11ea37c6d430e2cf98158fb30b Mon Sep 17 00:00:00 2001
>From: Bruno Damour <bruno@ruomad.net>
>Date: Sun, 17 Jul 2022 22:04:06 +0200
>Subject: [PATCH] libpki-r1
>
>---
> security/libpki/Makefile    | 39 ++++++++++++++++++++++++-------
> security/libpki/pkg-message | 17 ++++++++++++++
> security/libpki/pkg-plist   | 46 ++++++++++++++++++++-----------------
> 3 files changed, 73 insertions(+), 29 deletions(-)
> create mode 100644 security/libpki/pkg-message
>
>diff --git a/security/libpki/Makefile b/security/libpki/Makefile
>index 2583811f7040..a8f1b3b61191 100644
>--- a/security/libpki/Makefile
>+++ b/security/libpki/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	libpki
> DISTVERSIONPREFIX=	v
> DISTVERSION=	0.9.2
>+PORTREVISION=	1
> CATEGORIES=	security
> 
> PATCH_SITES=	https://github.com/openca/libpki/commit/
>@@ -12,6 +13,8 @@ COMMENT=	OpenCA PKI library (libpki) and tools
> LICENSE=	APACHE20
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>+NOT_FOR_ARCHS=	arm64
>+
> USES=		autoreconf gnome libtool ssl
> USE_GITHUB=	yes
> GH_ACCOUNT=	openca
>@@ -20,17 +23,37 @@ USE_LDCONFIG=	yes
> 
> GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-dependency-tracking \
>-		--disable-dns \
>-		--disable-iphone \
>-		--disable-ldap \
>-		--disable-mysql \
>-		--disable-pg
>+		--disable-iphone
>+
> INSTALL_TARGET=	install-strip
> 
>+OPTIONS_DEFINE=		LDAP MYSQL PGSQL DNS
>+
>+DNS_DESC=		"Enable DNS support"
>+LDAP_DESC=		"Enable LDAP support"
>+MYSQL_DESC=		"Enable MySQL support"
>+PGSQL_DESC=		"Enable PostgreSQL support"
>+
>+DNS_CONFIGURE_ENABLE=	dns
>+LDAP_LIB_DEPENDS=	liblber.so:net/openldap24-client libldap_r.so:net/openldap24-client
>+LDAP_CONFIGURE_ENABLE=	ldap
>+LDAP_LDFLAGS+=		-llber
>+MYSQL_USES=		mysql
>+MYSQL_CONFIGURE_ENABLE=	mysql
>+PGSQL_USES=		pgsql
>+PGSQL_CONFIGURE_ENABLE=	pg
>+
> post-stage:
>-	${MV} ${STAGEDIR}${PREFIX}/etc/pki.conf ${STAGEDIR}${PREFIX}/etc/pki.conf.sample; \
>-	for f in $$(find ${STAGEDIR}${PREFIX}/etc/libpki -type f); do \
>-		${MV} $$f $$f.sample; \
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc; \
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki; \
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/hsm.d; \
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/profile.d; \
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/store.d; \
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/token.d; \
>+	${MV} ${STAGEDIR}${PREFIX}/etc/pki.conf ${STAGEDIR}${PREFIX}/share/libpki/etc/pki.conf.sample; \
>+	cd ${STAGEDIR}${PREFIX}/etc/libpki; \
>+	for f in $$(find * -type f); do \
>+		${MV} ${STAGEDIR}${PREFIX}/etc/libpki/$$f ${STAGEDIR}${PREFIX}/share/libpki/etc/libpki/$$f.sample; \
> 	done; \
> 	${RM} -rf ${STAGEDIR}${PREFIX}/include/internal
> 
>diff --git a/security/libpki/pkg-message b/security/libpki/pkg-message
>new file mode 100644
>index 000000000000..78dcb8f577d4
>--- /dev/null
>+++ b/security/libpki/pkg-message
>@@ -0,0 +1,17 @@
>+[
>+{ type: install
>+  message: <<EOM
>+Sample Configuration files have been installed in $PREFIX/share/libpki/etc, in a
>+hierachy that mimics the one created in $PREFIX/etc.
>+They may be used as templates to be copied into the corresponding subdirectory
>+under $PREFIX/etc and customized according to user context.
>+EOM
>+}
>+{
>+  type: remove
>+  message: <<EOM
>+User-installed configuration files under $PREFIX/etc/libpki have been preserved and
>+must be removed manually if needed, as well as this directory. 
>+EOM
>+}
>+]
>diff --git a/security/libpki/pkg-plist b/security/libpki/pkg-plist
>index 5595d20e913c..2db500532b58 100644
>--- a/security/libpki/pkg-plist
>+++ b/security/libpki/pkg-plist
>@@ -8,27 +8,6 @@ bin/pki-siginfo
> bin/pki-tool
> bin/pki-xpair
> bin/url-tool
>-@sample %%ETCDIR%%/hsm.d/eracom-sdk.xml.sample
>-@sample %%ETCDIR%%/hsm.d/etoken-engine.xml.sample
>-@sample %%ETCDIR%%/hsm.d/etoken-pkcs11.xml.sample
>-@sample %%ETCDIR%%/hsm.d/etoken.xml.sample
>-@sample %%ETCDIR%%/hsm.d/opencryptoki.xml.sample
>-@sample %%ETCDIR%%/hsm.d/tpm.xml.sample
>-@sample %%ETCDIR%%/objectIdentifiers.xml.sample
>-@sample %%ETCDIR%%/profile.d/crl.xml.sample
>-@sample %%ETCDIR%%/profile.d/server.xml.sample
>-@sample %%ETCDIR%%/profile.d/test.xml.sample
>-@sample %%ETCDIR%%/profile.d/user.xml.sample
>-@sample %%ETCDIR%%/store.d/empty.xml.sample
>-@sample %%ETCDIR%%/token.d/default.xml.sample
>-@sample %%ETCDIR%%/token.d/eracom.xml.sample
>-@sample %%ETCDIR%%/token.d/etoken-engine.xml.sample
>-@sample %%ETCDIR%%/token.d/etoken.xml.sample
>-@sample %%ETCDIR%%/token.d/opencryptoki.xml.sample
>-@sample %%ETCDIR%%/token.d/software.xml.sample
>-@sample %%ETCDIR%%/token.d/test.xml.sample
>-@sample %%ETCDIR%%/token.d/tpm.xml.sample
>-@sample etc/pki.conf.sample
> include/libpki/banners.h
> include/libpki/cmc.h
> include/libpki/cmc/cmc_cert_req.h
>@@ -176,3 +155,28 @@ lib/libpki.so.92.92.4
> %%DATADIR%%/doxygen-pdf.conf
> %%DATADIR%%/doxygen.conf
> %%DATADIR%%/pkginfo
>+%%DATADIR%%/etc/pki.conf.sample
>+%%DATADIR%%/etc/libpki/hsm.d/eracom-sdk.xml.sample
>+%%DATADIR%%/etc/libpki/hsm.d/etoken-engine.xml.sample
>+%%DATADIR%%/etc/libpki/hsm.d/etoken-pkcs11.xml.sample
>+%%DATADIR%%/etc/libpki/hsm.d/etoken.xml.sample
>+%%DATADIR%%/etc/libpki/hsm.d/opencryptoki.xml.sample
>+%%DATADIR%%/etc/libpki/hsm.d/tpm.xml.sample
>+%%DATADIR%%/etc/libpki/objectIdentifiers.xml.sample
>+%%DATADIR%%/etc/libpki/profile.d/crl.xml.sample
>+%%DATADIR%%/etc/libpki/profile.d/server.xml.sample
>+%%DATADIR%%/etc/libpki/profile.d/test.xml.sample
>+%%DATADIR%%/etc/libpki/profile.d/user.xml.sample
>+%%DATADIR%%/etc/libpki/store.d/empty.xml.sample
>+%%DATADIR%%/etc/libpki/token.d/default.xml.sample
>+%%DATADIR%%/etc/libpki/token.d/eracom.xml.sample
>+%%DATADIR%%/etc/libpki/token.d/etoken-engine.xml.sample
>+%%DATADIR%%/etc/libpki/token.d/etoken.xml.sample
>+%%DATADIR%%/etc/libpki/token.d/opencryptoki.xml.sample
>+%%DATADIR%%/etc/libpki/token.d/software.xml.sample
>+%%DATADIR%%/etc/libpki/token.d/test.xml.sample
>+%%DATADIR%%/etc/libpki/token.d/tpm.xml.sample
>+@dir etc/libpki/hsm.d
>+@dir etc/libpki/profile.d
>+@dir etc/libpki/store.d
>+@dir etc/libpki/token.d
>-- 
>2.37.1
>

Actions: View | Diff

Attachments on bug 265189: 235280 | 235306 | 235312