sync ports with The Matrix

security/opensc/Makefile

@@ -2,6 +2,7 @@ COMMENT=	set of libraries and utilities to access smart cards
 
 V=		0.23.0
 DISTNAME=	opensc-${V}
+REVISION=	0
 
 SHARED_LIBS +=	opensc 8.0	# 9.0
 SHARED_LIBS +=	smm-local 3.1

security/opensc/patches/patch-src_libopensc_sc-ossl-compat_h

@@ -1,4 +1,4 @@
-pending "LibreSSL fixes" https://github.com/OpenSC/OpenSC/pull/2816
+merged "LibreSSL fixes" https://github.com/OpenSC/OpenSC/pull/2816
 
 Index: src/libopensc/sc-ossl-compat.h
 --- src/libopensc/sc-ossl-compat.h.orig

security/opensc/patches/patch-src_pkcs11_pkcs11-global_c

@@ -1,19 +0,0 @@
-pending "LibreSSL fixes" https://github.com/OpenSC/OpenSC/pull/2816
-
-Index: src/pkcs11/pkcs11-global.c
---- src/pkcs11/pkcs11-global.c.orig
-+++ src/pkcs11/pkcs11-global.c
-@@ -251,8 +251,12 @@ __attribute__((destructor))
- int module_close()
- {
- 	sc_notify_close();
--#if defined(ENABLE_OPENSSL) && defined(OPENSSL_SECURE_MALLOC_SIZE) && !defined(LIBRESSL_VERSION_NUMBER)
-+#if defined(ENABLE_OPENSSL)
-+#if defined(OPENSSL_SECURE_MALLOC_SIZE) && !defined(LIBRESSL_VERSION_NUMBER)
- 	CRYPTO_secure_malloc_done();
-+#else
-+	OPENSSL_cleanup();
-+#endif
- #endif
- #ifdef ENABLE_OPENPACE
- 	EAC_cleanup();