security/pkcs11-tools: Update to 2.6.0

ChangeLog: https://github.com/Mastercard/pkcs11-tools/blob/v2.6.0/CHANGELOG.md

PR:		272848

security/pkcs11-tools/Makefile

 PORTNAME=	pkcs11-tools
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.1
+DISTVERSION=	2.6.0
 CATEGORIES=	security
 
 MAINTAINER=	eric.devolder@gmail.com
 COMMENT=	Tools for managing PKCS11 cryptographic tokens
 WWW=		https://github.com/Mastercard/pkcs11-tools
 
-LICENSE=	APACHE20
+LICENSE=	APACHE20 THIRDPARTY
+LICENSE_COMB=	multi
+LICENSE_NAME_THIRDPARTY=	Third-party licenses
+LICENSE_FILE_THIRDPARTY=	${WRKSRC}/docs/TPLICENSES.md
+LICENSE_PERMS_THIRDPARTY=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BROKEN_SSL=	libressl openssl30 openssl31
 BROKEN_SSL_REASON_libressl=	error: use of undeclared identifier 'EVP_PKEY_X25519' (LibreSSL has no support for Edwards curves)
@@ -22,18 +26,19 @@ USES=		autoreconf:build bison compiler:c11 libtool:build pkgconfig ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Mastercard
-GH_TUPLE=	coreutils:gnulib:3148eb10e:gnulib \
+GH_TUPLE=	coreutils:gnulib:d1b40e0:gnulib \
 		oasis-tcs:pkcs11:a136aac:oasis_pkcs11
 
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=DOCS
+
 GNU_CONFIGURE=	yes
 
 MAKE_ENV=	LIBCRYPTO_RPATH=${OPENSSLBASE}/lib
 
 INSTALL_TARGET=	install-strip
 
-# workaround for Bug#255277:
-# -lcrypto # fails to find symbol in the shared library: ld: error: undefined symbol: EVP_PKEY_meth_get_digestsign
-LDFLAGS+=	${OPENSSLBASE}/lib/libcrypto.a
+.include <bsd.port.options.mk>
 
 post-extract:
 	@${RMDIR} ${WRKSRC}/.gnulib ${WRKSRC}/include/oasis-pkcs11
@@ -43,4 +48,23 @@ post-extract:
 pre-configure:
 	@cd ${WRKSRC} && BUILD_PORT=1 ${WRKSRC}/bootstrap.sh
 
+# FreeBSD<13 does not have system-deployed openssl information through PKGCONFIG
+# We need to provide a hint at configure time
+
+.if ${OPSYS} == FreeBSD && ( ${OSVERSION} <= 1300000 )
+LIBCRYPTO_CFLAGS+=	-pthread
+LIBCRYPTO_LIBS+=	-lcrypto
+
+do-configure:
+	@cd ${WRKSRC} && ./configure LIBCRYPTO_CFLAGS=${LIBCRYPTO_CFLAGS} LIBCRYPTO_LIBS=${LIBCRYPTO_LIBS}
+.endif
+
+post-install:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} \
+		${WRKSRC}/README.md \
+		${WRKSRC}/docs/INSTALL.md \
+		${WRKSRC}/docs/MANUAL.md \
+		${STAGEDIR}${DOCSDIR}
+
 .include <bsd.port.mk>

security/pkcs11-tools/distinfo

-TIMESTAMP = 1684961078
-SHA256 (Mastercard-pkcs11-tools-v2.5.1_GH0.tar.gz) = fb00de4789148b547efe5e82da0a8d749116e51dd59baead687569782b4fa61d
-SIZE (Mastercard-pkcs11-tools-v2.5.1_GH0.tar.gz) = 294644
-SHA256 (coreutils-gnulib-3148eb10e_GH0.tar.gz) = 266ed3348da1629c8b8e4e1adc6a8f6ec5bb523707556a56ca51d3d74eeee5e2
-SIZE (coreutils-gnulib-3148eb10e_GH0.tar.gz) = 7420208
+TIMESTAMP = 1690822324
+SHA256 (Mastercard-pkcs11-tools-v2.6.0_GH0.tar.gz) = 8b5fa6b784bf653a734b8e421b72167c9ba7121e99e5bf19ec11f275e686b0a8
+SIZE (Mastercard-pkcs11-tools-v2.6.0_GH0.tar.gz) = 295153
+SHA256 (coreutils-gnulib-d1b40e0_GH0.tar.gz) = 845c3eb0d09edb247e45ff8824597479b34169f11f0e9a57605c0947a1931b4e
+SIZE (coreutils-gnulib-d1b40e0_GH0.tar.gz) = 7977868
 SHA256 (oasis-tcs-pkcs11-a136aac_GH0.tar.gz) = 5bb41d167ac60a58ba85526c4cd81324599d66a36567eed1aed3bad93c6e3705
 SIZE (oasis-tcs-pkcs11-a136aac_GH0.tar.gz) = 119794

security/pkcs11-tools/files/patch-configure.ac

---- configure.ac.orig	2021-04-12 12:06:48 UTC
-+++ configure.ac
-@@ -75,24 +75,24 @@ PKG_PROG_PKG_CONFIG
- dnl for libcrypto, we are first detecting libcrypo11,
- dnl as older distros may still run on top of openssl 1.0,
- dnl but have v1.1.x accessible through libcrypto11.pc file
--PKG_CHECK_MODULES([LIBCRYPTO],
--	          [libcrypto11 >= 1.1.1e],
--		  [ ac_save_CPPFLAGS=$CPPFLAGS
--		    CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}"
--		    AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC],
--		                  [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])],
--    				  [],
--				  [[ #include <openssl/opensslconf.h> ]])
--		    CPPFLAGS=${ac_save_CPPFLAGS} ],
--		    [ PKG_CHECK_MODULES([LIBCRYPTO],
--					[libcrypto >= 1.1.1e],
--				    	[ ac_save_CPPFLAGS=$CPPFLAGS
--				      	  CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}"
--				      	  AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC],
--		                      	  	     	 [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])],
--						     	 [],
--						     	 [[ #include <openssl/opensslconf.h> ]])
--					  CPPFLAGS=${ac_save_CPPFLAGS} ])])
-+#PKG_CHECK_MODULES([LIBCRYPTO],
-+#	          [libcrypto11 >= 1.1.1e],
-+#		  [ ac_save_CPPFLAGS=$CPPFLAGS
-+#		    CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}"
-+#		    AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC],
-+#		                  [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])],
-+#    				  [],
-+#				  [[ #include <openssl/opensslconf.h> ]])
-+#		    CPPFLAGS=${ac_save_CPPFLAGS} ],
-+#		    [ PKG_CHECK_MODULES([LIBCRYPTO],
-+#					[libcrypto >= 1.1.1e],
-+#				    	[ ac_save_CPPFLAGS=$CPPFLAGS
-+#				      	  CPPFLAGS="${CPPFLAGS} ${LIBCRYPTO_CFLAGS}"
-+#				      	  AC_CHECK_DECLS([OPENSSL_NO_RSA, OPENSSL_NO_DSA, OPENSSL_NO_DH, OPENSSL_NO_EC],
-+#		                      	  	     	 [AC_MSG_FAILURE([The OpenSSL crypto library is missing features/algorithm to allow compilation])],
-+#						     	 [],
-+#						     	 [[ #include <openssl/opensslconf.h> ]])
-+#					  CPPFLAGS=${ac_save_CPPFLAGS} ])])
- 
- dnl on UNIX platforms, check for dynamic loader lib
- AM_COND_IF( [TARGET_OS_MINGW32],
-@@ -152,8 +152,8 @@ AS_IF([test "x$with_luna" != xno],
- 
- dnl check if a specific rpath is provided when linking.
- dnl this option is needed when openssl is not deployed to a system-wide location
--AC_ARG_VAR([LIBCRYPTO_RPATH], 	[provide RPATH to LIBCRYPTO, e.g. LIBCRYPTO_RPATH=/usr/local/ssl/lib (useful when openssl is not deployed to a system-wide location)])
--AM_CONDITIONAL([HAS_LIBCRYPTO_RPATH], [test "x$LIBCRYPTO_RPATH" != "x"])
-+#AC_ARG_VAR([LIBCRYPTO_RPATH], 	[provide RPATH to LIBCRYPTO, e.g. LIBCRYPTO_RPATH=/usr/local/ssl/lib (useful when openssl is not deployed to a system-wide location)])
-+AM_CONDITIONAL([HAS_LIBCRYPTO_RPATH], [test "xx" != "x"])
- 
- 
- #### TODO HERE

security/pkcs11-tools/pkg-plist

@@ -19,9 +19,13 @@ bin/p11setattr
 bin/p11slotinfo
 bin/p11unwrap
 bin/p11wrap
+bin/with_aws
 bin/with_beid
 bin/with_luna
 bin/with_nfast
 bin/with_nss
 bin/with_softhsm
 bin/with_utimaco
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
+%%PORTDOCS%%%%DOCSDIR%%/MANUAL.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md