Attachment #234505 for bug #264474




# Created by Bruno Damour <bruno@ruomad.net>
#

PORTNAME=		libpki
DISTVERSIONPREFIX=      v
DISTVERSION=		0.9.2
CATEGORIES=		security
DISTNAME=		libpki-0.9.2

MAINTAINER=		bruno@ruomad.net
COMMENT=		OpenCA PKI library (libpki) and tools

LICENSE=		APACHE20
LICENSE_FILE=		${WRKSRC}/COPYING

USES=			ssl gnome autoreconf libtool
USE_GITHUB=		yes
GH_ACCOUNT=		openca
USE_LDCONFIG=		yes
USE_GNOME=		libxml2

# Provided patches fix :
#  - src/pki.config.c to replace a breaking call to strncpy by strcpy
#  - configure.ac to (i) fix a typo in AC_COMPILE_IFELSE invocation,
#    (ii) not to append mybits to libdir (lib vs lib64) on *bsd*, and
#    (iii) map target arm64 (reported by FreeBSD) to expected x86_64 :
#    hence the need to autoreconf

GNU_CONFIGURE=		yes
CONFIGURE_ARGS=		--disable-dependency-tracking \
			--disable-ldap --disable-mysql --disable-pg \
			--disable-dns --disable-iphone
INSTALL_TARGET=		install-strip

# Rename installed configuration files to samples
post-stage:
	${MV} ${WRKDIR}/stage${PREFIX}/etc/pki.conf ${WRKDIR}/stage${PREFIX}/etc/pki.conf.sample; \
	for f in $$(find ${STAGEDIR}${PREFIX}/etc/libpki -type f); do \
		${MV} $$f $$f.sample; \
	done

.include <bsd.port.mk>

Added Link Here

(-)b/security/libpki/distinfo (+3 lines)
1	TIMESTAMP = 1654414123
2	SHA256 (openca-libpki-v0.9.2_GH0.tar.gz) = 4352a77457579a498837e33fbc0092f67a1c5d93eee6eb73bc889ad8b8f747fb
3	SIZE (openca-libpki-v0.9.2_GH0.tar.gz) = 1184928




--- configure.ac.orig	2022-06-04 12:46:07.578141000 +0200
+++ configure.ac	2022-06-05 10:08:00.940257000 +0200
@@ -267,6 +267,7 @@
 		;;
  *bsd*) myarch=bsd
 		shlext=so
+		mybits_install=""
 		;;
  *iphone*)
 		myarch=iphone
@@ -308,6 +309,9 @@
 	x86_64-*)
 		arch_target=x86_64
 		;;
+	amd64*-*)
+		arch_target=x86_64
+		;;
 	sparc*-*)
 		arch_target=Sparc
 		;;
@@ -524,13 +528,13 @@
 dnl [ pthread_rw=no ] )
 
 dnl AC_TRY_COMPILE( [
-AC_COMPILE_IFELSE( AC_LANG_SOURCE([[
+AC_COMPILE_IFELSE( [AC_LANG_SOURCE([
 #include <sys/types.h>
 #include <pthread.h>
 pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;
 int main() {
 return (0);
-} ]]),
+} ])],
 [ pthread_rw=yes ] , 
 [ pthread_rw=no ] )
 

Added Link Here

(-)b/security/libpki/files/patch-pki_config.c (+11 lines)
1	--- src/pki_config.c.orig 2021-01-16 00:14:34 UTC
2	+++ src/pki_config.c
3	@@ -83,7 +83,7 @@ static char * _xml_search_namespace_add ( char *search
4	PKI_Free( my_arg );
5
6	ret = PKI_Malloc ( strlen( my_search ) + 1);
7	- strncpy( ret, my_search, strlen(my_search) );
8	+ strcpy( ret, my_search );
9
10	PKI_Free ( my_search );
11	return( ret );

Added Link Here

(-)b/security/libpki/pkg-descr (+5 lines)
1	OpenCA LibPKI provides an easy-to-use PKI library for PKI enabled application development.
2	The library provides the developer with all the needed functionalities to manage certificates,
3	from generation to validation.
4
5	WWW: https://www.openca.org/projects/libpki




bin/libpki-config
bin/pki-cert
bin/pki-crl
bin/pki-derenc
bin/pki-query
bin/pki-request
bin/pki-siginfo
bin/pki-tool
bin/pki-xpair
bin/url-tool
etc/libpki/hsm.d/eracom-sdk.xml.sample
etc/libpki/hsm.d/etoken-engine.xml.sample
etc/libpki/hsm.d/etoken-pkcs11.xml.sample
etc/libpki/hsm.d/etoken.xml.sample
etc/libpki/hsm.d/opencryptoki.xml.sample
etc/libpki/hsm.d/tpm.xml.sample
etc/libpki/objectIdentifiers.xml.sample
etc/libpki/profile.d/crl.xml.sample
etc/libpki/profile.d/server.xml.sample
etc/libpki/profile.d/test.xml.sample
etc/libpki/profile.d/user.xml.sample
etc/libpki/store.d/empty.xml.sample
etc/libpki/token.d/default.xml.sample
etc/libpki/token.d/eracom.xml.sample
etc/libpki/token.d/etoken-engine.xml.sample
etc/libpki/token.d/etoken.xml.sample
etc/libpki/token.d/opencryptoki.xml.sample
etc/libpki/token.d/software.xml.sample
etc/libpki/token.d/test.xml.sample
etc/libpki/token.d/tpm.xml.sample
etc/pki.conf.sample
include/libpki/banners.h
include/libpki/cmc.h
include/libpki/cmc/cmc_cert_req.h
include/libpki/compat.h
include/libpki/config.h
include/libpki/crypto.h
include/libpki/datatypes.h
include/libpki/drivers/engine/data_st.h
include/libpki/drivers/engine/engine_hsm.h
include/libpki/drivers/engine/engine_hsm_obj.h
include/libpki/drivers/engine/engine_hsm_pkey.h
include/libpki/drivers/engine/engine_st.h
include/libpki/drivers/hsm_keypair.h
include/libpki/drivers/hsm_main.h
include/libpki/drivers/hsm_slot.h
include/libpki/drivers/kmf/data_st.h
include/libpki/drivers/kmf/kmf_hsm.h
include/libpki/drivers/kmf/kmf_hsm_engine.h
include/libpki/drivers/kmf/kmf_hsm_pkey.h
include/libpki/drivers/kmf/kmf_hsm_sign.h
include/libpki/drivers/kmf/pki_kmflib.h
include/libpki/drivers/openssl/data_st.h
include/libpki/drivers/openssl/openssl_hsm.h
include/libpki/drivers/openssl/openssl_hsm_cb.h
include/libpki/drivers/openssl/openssl_hsm_obj.h
include/libpki/drivers/openssl/openssl_hsm_pkey.h
include/libpki/drivers/pkcs11/pkcs11_hsm.h
include/libpki/drivers/pkcs11/pkcs11_hsm_obj.h
include/libpki/drivers/pkcs11/pkcs11_hsm_pkey.h
include/libpki/drivers/pkcs11/pkcs11_utils.h
include/libpki/drivers/pkcs11/rsa/cryptoki.h
include/libpki/drivers/pkcs11/rsa/pkcs11.h
include/libpki/drivers/pkcs11/rsa/pkcs11_func.h
include/libpki/drivers/pkcs11/rsa/pkcs11f.h
include/libpki/drivers/pkcs11/rsa/pkcs11t.h
include/libpki/errors-new.h
include/libpki/errors.h
include/libpki/est/est.h
include/libpki/est/pki_x509_est_asn1.h
include/libpki/est/pki_x509_est_attrs.h
include/libpki/est/pki_x509_est_data.h
include/libpki/est/pki_x509_est_msg.h
include/libpki/extensions.h
include/libpki/hsm_st.h
include/libpki/io/pki_keypair_io.h
include/libpki/io/pki_msg_req_io.h
include/libpki/io/pki_msg_resp_io.h
include/libpki/io/pki_ocsp_req_io.h
include/libpki/io/pki_ocsp_resp_io.h
include/libpki/io/pki_x509_cert_io.h
include/libpki/io/pki_x509_cms_io.h
include/libpki/io/pki_x509_crl_io.h
include/libpki/io/pki_x509_io.h
include/libpki/io/pki_x509_p12_io.h
include/libpki/io/pki_x509_pkcs7_io.h
include/libpki/io/pki_x509_req_io.h
include/libpki/io/pki_x509_xpair_io.h
include/libpki/libpkiv.h
include/libpki/net/dns.h
include/libpki/net/http_s.h
include/libpki/net/ldap.h
include/libpki/net/pkcs11.h
include/libpki/net/pki_mysql.h
include/libpki/net/pki_pg.h
include/libpki/net/pki_socket.h
include/libpki/net/sock.h
include/libpki/net/ssl.h
include/libpki/net/url.h
include/libpki/openssl/data_st.h
include/libpki/openssl/pthread_init.h
include/libpki/os.h
include/libpki/pki.h
include/libpki/pki_algor.h
include/libpki/pki_conf.h
include/libpki/pki_config.h
include/libpki/pki_cred.h
include/libpki/pki_digest.h
include/libpki/pki_err.h
include/libpki/pki_hmac.h
include/libpki/pki_id.h
include/libpki/pki_id_info.h
include/libpki/pki_init.h
include/libpki/pki_integer.h
include/libpki/pki_io.h
include/libpki/pki_keypair.h
include/libpki/pki_keyparams.h
include/libpki/pki_log.h
include/libpki/pki_mem.h
include/libpki/pki_msg.h
include/libpki/pki_msg_req.h
include/libpki/pki_msg_resp.h
include/libpki/pki_ocsp_req.h
include/libpki/pki_ocsp_resp.h
include/libpki/pki_oid.h
include/libpki/pki_string.h
include/libpki/pki_threads.h
include/libpki/pki_threads_vars.h
include/libpki/pki_time.h
include/libpki/pki_x509.h
include/libpki/pki_x509_attribute.h
include/libpki/pki_x509_cert.h
include/libpki/pki_x509_cert_mem.h
include/libpki/pki_x509_cms.h
include/libpki/pki_x509_crl.h
include/libpki/pki_x509_data_st.h
include/libpki/pki_x509_extension.h
include/libpki/pki_x509_mem.h
include/libpki/pki_x509_mime.h
include/libpki/pki_x509_name.h
include/libpki/pki_x509_p12.h
include/libpki/pki_x509_pkcs7.h
include/libpki/pki_x509_profile.h
include/libpki/pki_x509_req.h
include/libpki/pki_x509_signature.h
include/libpki/pki_x509_xpair.h
include/libpki/pki_x509_xpair_asn1.h
include/libpki/profile.h
include/libpki/prqp/http_client.h
include/libpki/prqp/prqp.h
include/libpki/prqp/prqp_asn1.h
include/libpki/prqp/prqp_bio.h
include/libpki/prqp/prqp_lib.h
include/libpki/prqp/prqp_req_io.h
include/libpki/prqp/prqp_resp_io.h
include/libpki/prqp/prqp_srv.h
include/libpki/prqp/prqp_stack.h
include/libpki/scep/pki_x509_scep_asn1.h
include/libpki/scep/pki_x509_scep_attrs.h
include/libpki/scep/pki_x509_scep_data.h
include/libpki/scep/pki_x509_scep_msg.h
include/libpki/scep/scep.h
include/libpki/stack.h
include/libpki/support.h
include/libpki/token.h
include/libpki/token_data.h
include/libpki/token_id.h
include/libpki/token_st.h
lib/libpki.a
lib/libpki.so
lib/libpki.so.92
lib/libpki.so.92.92.4

Return to bug 264474

Added Link Here

(-)b/security/libpki/Makefile (+42 lines)
1	# Created by Bruno Damour <bruno@ruomad.net>
2	#
3
4	PORTNAME= libpki
5	DISTVERSIONPREFIX= v
6	DISTVERSION= 0.9.2
7	CATEGORIES= security
8	DISTNAME= libpki-0.9.2
9
10	MAINTAINER= bruno@ruomad.net
11	COMMENT= OpenCA PKI library (libpki) and tools
12
13	LICENSE= APACHE20
14	LICENSE_FILE= ${WRKSRC}/COPYING
15
16	USES= ssl gnome autoreconf libtool
17	USE_GITHUB= yes
18	GH_ACCOUNT= openca
19	USE_LDCONFIG= yes
20	USE_GNOME= libxml2
21
22	# Provided patches fix :
23	# - src/pki.config.c to replace a breaking call to strncpy by strcpy
24	# - configure.ac to (i) fix a typo in AC_COMPILE_IFELSE invocation,
25	# (ii) not to append mybits to libdir (lib vs lib64) on bsd, and
26	# (iii) map target arm64 (reported by FreeBSD) to expected x86_64 :
27	# hence the need to autoreconf
28
29	GNU_CONFIGURE= yes
30	CONFIGURE_ARGS= --disable-dependency-tracking \
31	--disable-ldap --disable-mysql --disable-pg \
32	--disable-dns --disable-iphone
33	INSTALL_TARGET= install-strip
34
35	# Rename installed configuration files to samples
36	post-stage:
37	${MV} ${WRKDIR}/stage${PREFIX}/etc/pki.conf ${WRKDIR}/stage${PREFIX}/etc/pki.conf.sample; \
38	for f in $$(find ${STAGEDIR}${PREFIX}/etc/libpki -type f); do \
39	${MV} $$f $$f.sample; \
40	done
41
42	.include <bsd.port.mk>

Added Link Here

(-)b/security/libpki/files/patch-configure.ac (+36 lines)
1	--- configure.ac.orig 2022-06-04 12:46:07.578141000 +0200
2	+++ configure.ac 2022-06-05 10:08:00.940257000 +0200
3	@@ -267,6 +267,7 @@
4	;;
5	bsd) myarch=bsd
6	shlext=so
7	+ mybits_install=""
8	;;
9	iphone)
10	myarch=iphone
11	@@ -308,6 +309,9 @@
12	x86_64-*)
13	arch_target=x86_64
14	;;
15	+ amd64-)
16	+ arch_target=x86_64
17	+ ;;
18	sparc-)
19	arch_target=Sparc
20	;;
21	@@ -524,13 +528,13 @@
22	dnl [ pthread_rw=no ] )
23
24	dnl AC_TRY_COMPILE( [
25	-AC_COMPILE_IFELSE( AC_LANG_SOURCE([[
26	+AC_COMPILE_IFELSE( [AC_LANG_SOURCE([
27	#include <sys/types.h>
28	#include <pthread.h>
29	pthread_rwlock_t rwlock=PTHREAD_RWLOCK_INITIALIZER;
30	int main() {
31	return (0);
32	-} ]]),
33	+} ])],
34	[ pthread_rw=yes ] ,
35	[ pthread_rw=no ] )
36

Added Link Here

(-)b/security/libpki/pkg-plist (-1 / +172 lines)
0	-	1	bin/libpki-config
		2	bin/pki-cert
		3	bin/pki-crl
		4	bin/pki-derenc
		5	bin/pki-query
		6	bin/pki-request
		7	bin/pki-siginfo
		8	bin/pki-tool
		9	bin/pki-xpair
		10	bin/url-tool
		11	etc/libpki/hsm.d/eracom-sdk.xml.sample
		12	etc/libpki/hsm.d/etoken-engine.xml.sample
		13	etc/libpki/hsm.d/etoken-pkcs11.xml.sample
		14	etc/libpki/hsm.d/etoken.xml.sample
		15	etc/libpki/hsm.d/opencryptoki.xml.sample
		16	etc/libpki/hsm.d/tpm.xml.sample
		17	etc/libpki/objectIdentifiers.xml.sample
		18	etc/libpki/profile.d/crl.xml.sample
		19	etc/libpki/profile.d/server.xml.sample
		20	etc/libpki/profile.d/test.xml.sample
		21	etc/libpki/profile.d/user.xml.sample
		22	etc/libpki/store.d/empty.xml.sample
		23	etc/libpki/token.d/default.xml.sample
		24	etc/libpki/token.d/eracom.xml.sample
		25	etc/libpki/token.d/etoken-engine.xml.sample
		26	etc/libpki/token.d/etoken.xml.sample
		27	etc/libpki/token.d/opencryptoki.xml.sample
		28	etc/libpki/token.d/software.xml.sample
		29	etc/libpki/token.d/test.xml.sample
		30	etc/libpki/token.d/tpm.xml.sample
		31	etc/pki.conf.sample
		32	include/libpki/banners.h
		33	include/libpki/cmc.h
		34	include/libpki/cmc/cmc_cert_req.h
		35	include/libpki/compat.h
		36	include/libpki/config.h
		37	include/libpki/crypto.h
		38	include/libpki/datatypes.h
		39	include/libpki/drivers/engine/data_st.h
		40	include/libpki/drivers/engine/engine_hsm.h
		41	include/libpki/drivers/engine/engine_hsm_obj.h
		42	include/libpki/drivers/engine/engine_hsm_pkey.h
		43	include/libpki/drivers/engine/engine_st.h
		44	include/libpki/drivers/hsm_keypair.h
		45	include/libpki/drivers/hsm_main.h
		46	include/libpki/drivers/hsm_slot.h
		47	include/libpki/drivers/kmf/data_st.h
		48	include/libpki/drivers/kmf/kmf_hsm.h
		49	include/libpki/drivers/kmf/kmf_hsm_engine.h
		50	include/libpki/drivers/kmf/kmf_hsm_pkey.h
		51	include/libpki/drivers/kmf/kmf_hsm_sign.h
		52	include/libpki/drivers/kmf/pki_kmflib.h
		53	include/libpki/drivers/openssl/data_st.h
		54	include/libpki/drivers/openssl/openssl_hsm.h
		55	include/libpki/drivers/openssl/openssl_hsm_cb.h
		56	include/libpki/drivers/openssl/openssl_hsm_obj.h
		57	include/libpki/drivers/openssl/openssl_hsm_pkey.h
		58	include/libpki/drivers/pkcs11/pkcs11_hsm.h
		59	include/libpki/drivers/pkcs11/pkcs11_hsm_obj.h
		60	include/libpki/drivers/pkcs11/pkcs11_hsm_pkey.h
		61	include/libpki/drivers/pkcs11/pkcs11_utils.h
		62	include/libpki/drivers/pkcs11/rsa/cryptoki.h
		63	include/libpki/drivers/pkcs11/rsa/pkcs11.h
		64	include/libpki/drivers/pkcs11/rsa/pkcs11_func.h
		65	include/libpki/drivers/pkcs11/rsa/pkcs11f.h
66	include/libpki/drivers/pkcs11/rsa/pkcs11t.h
67	include/libpki/errors-new.h
68	include/libpki/errors.h
69	include/libpki/est/est.h
70	include/libpki/est/pki_x509_est_asn1.h
71	include/libpki/est/pki_x509_est_attrs.h
72	include/libpki/est/pki_x509_est_data.h
73	include/libpki/est/pki_x509_est_msg.h
74	include/libpki/extensions.h
75	include/libpki/hsm_st.h
76	include/libpki/io/pki_keypair_io.h
77	include/libpki/io/pki_msg_req_io.h
78	include/libpki/io/pki_msg_resp_io.h
79	include/libpki/io/pki_ocsp_req_io.h
80	include/libpki/io/pki_ocsp_resp_io.h
81	include/libpki/io/pki_x509_cert_io.h
82	include/libpki/io/pki_x509_cms_io.h
83	include/libpki/io/pki_x509_crl_io.h
84	include/libpki/io/pki_x509_io.h
85	include/libpki/io/pki_x509_p12_io.h
86	include/libpki/io/pki_x509_pkcs7_io.h
87	include/libpki/io/pki_x509_req_io.h
88	include/libpki/io/pki_x509_xpair_io.h
89	include/libpki/libpkiv.h
90	include/libpki/net/dns.h
91	include/libpki/net/http_s.h
92	include/libpki/net/ldap.h
93	include/libpki/net/pkcs11.h
94	include/libpki/net/pki_mysql.h
95	include/libpki/net/pki_pg.h
96	include/libpki/net/pki_socket.h
97	include/libpki/net/sock.h
98	include/libpki/net/ssl.h
99	include/libpki/net/url.h
100	include/libpki/openssl/data_st.h
101	include/libpki/openssl/pthread_init.h
102	include/libpki/os.h
103	include/libpki/pki.h
104	include/libpki/pki_algor.h
105	include/libpki/pki_conf.h
106	include/libpki/pki_config.h
107	include/libpki/pki_cred.h
108	include/libpki/pki_digest.h
109	include/libpki/pki_err.h
110	include/libpki/pki_hmac.h
111	include/libpki/pki_id.h
112	include/libpki/pki_id_info.h
113	include/libpki/pki_init.h
114	include/libpki/pki_integer.h
115	include/libpki/pki_io.h
116	include/libpki/pki_keypair.h
117	include/libpki/pki_keyparams.h
118	include/libpki/pki_log.h
119	include/libpki/pki_mem.h
120	include/libpki/pki_msg.h
121	include/libpki/pki_msg_req.h
122	include/libpki/pki_msg_resp.h
123	include/libpki/pki_ocsp_req.h
124	include/libpki/pki_ocsp_resp.h
125	include/libpki/pki_oid.h
126	include/libpki/pki_string.h
127	include/libpki/pki_threads.h
128	include/libpki/pki_threads_vars.h
129	include/libpki/pki_time.h
130	include/libpki/pki_x509.h
131	include/libpki/pki_x509_attribute.h
132	include/libpki/pki_x509_cert.h
133	include/libpki/pki_x509_cert_mem.h
134	include/libpki/pki_x509_cms.h
135	include/libpki/pki_x509_crl.h
136	include/libpki/pki_x509_data_st.h
137	include/libpki/pki_x509_extension.h
138	include/libpki/pki_x509_mem.h
139	include/libpki/pki_x509_mime.h
140	include/libpki/pki_x509_name.h
141	include/libpki/pki_x509_p12.h
142	include/libpki/pki_x509_pkcs7.h
143	include/libpki/pki_x509_profile.h
144	include/libpki/pki_x509_req.h
145	include/libpki/pki_x509_signature.h
146	include/libpki/pki_x509_xpair.h
147	include/libpki/pki_x509_xpair_asn1.h
148	include/libpki/profile.h
149	include/libpki/prqp/http_client.h
150	include/libpki/prqp/prqp.h
151	include/libpki/prqp/prqp_asn1.h
152	include/libpki/prqp/prqp_bio.h
153	include/libpki/prqp/prqp_lib.h
154	include/libpki/prqp/prqp_req_io.h
155	include/libpki/prqp/prqp_resp_io.h
156	include/libpki/prqp/prqp_srv.h
157	include/libpki/prqp/prqp_stack.h
158	include/libpki/scep/pki_x509_scep_asn1.h
159	include/libpki/scep/pki_x509_scep_attrs.h
160	include/libpki/scep/pki_x509_scep_data.h
161	include/libpki/scep/pki_x509_scep_msg.h
162	include/libpki/scep/scep.h
163	include/libpki/stack.h
164	include/libpki/support.h
165	include/libpki/token.h
166	include/libpki/token_data.h
167	include/libpki/token_id.h
168	include/libpki/token_st.h
169	lib/libpki.a
170	lib/libpki.so
171	lib/libpki.so.92
172	lib/libpki.so.92.92.4