CVS commit: [pkgsrc-2025Q3] pkgsrc/security/pkcs11-helper

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Nov 21 08:43:43 UTC 2025

Modified Files:
        pkgsrc/security/pkcs11-helper [pkgsrc-2025Q3]: Makefile distinfo
Added Files:
        pkgsrc/security/pkcs11-helper/patches [pkgsrc-2025Q3]:
            patch-lib_pkcs11h-util.c

Log Message:
Pullup ticket #7032 - requested by nia
security/pkcs11-helper: security fix

Revisions pulled up:
- security/pkcs11-helper/Makefile                               1.46
- security/pkcs11-helper/distinfo                               1.9
- security/pkcs11-helper/patches/patch-lib_pkcs11h-util.c       1.1

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Wed Nov 19 08:47:26 UTC 2025

   Modified Files:
        pkgsrc/security/pkcs11-helper: Makefile distinfo
   Added Files:
        pkgsrc/security/pkcs11-helper/patches: patch-lib_pkcs11h-util.c

   Log Message:
   pkcs11-helper: Update to 1.31.0

      2025-11-10 - Version 1.31.0

        * threading: fix mutex handling for cond_wait, thanks to Gleb Popov.
        * mbed: initialize certificate early using mbedtls_x509_crt_init.
        * util: fix deserialize buffer overflow. thanks to Aarnav Bos.

   Builds on at least macOS, Linux, FreeBSD, NetBSD, OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.4.1 pkgsrc/security/pkcs11-helper/Makefile
cvs rdiff -u -r1.8 -r1.8.12.1 pkgsrc/security/pkcs11-helper/distinfo
cvs rdiff -u -r0 -r1.1.2.2 \
    pkgsrc/security/pkcs11-helper/patches/patch-lib_pkcs11h-util.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/pkcs11-helper/Makefile
diff -u pkgsrc/security/pkcs11-helper/Makefile:1.45 pkgsrc/security/pkcs11-helper/Makefile:1.45.4.1
--- pkgsrc/security/pkcs11-helper/Makefile:1.45 Thu Apr 17 21:52:18 2025
+++ pkgsrc/security/pkcs11-helper/Makefile      Fri Nov 21 08:43:43 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2025/04/17 21:52:18 wiz Exp $
+# $NetBSD: Makefile,v 1.45.4.1 2025/11/21 08:43:43 bsiegert Exp $
 
-DISTNAME=      pkcs11-helper-1.30.0
-PKGREVISION=   6
+DISTNAME=      pkcs11-helper-1.31.0
 CATEGORIES=    security
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=OpenSC/}
 GITHUB_RELEASE=        ${DISTNAME}
@@ -13,7 +12,7 @@ COMMENT=      Library that simplifies the int
 LICENSE=       modified-bsd OR gnu-gpl-v2
 
 # Not documented, but relatively clear from warnings.
-USE_LANGUAGES=         c99
+FORCE_C_STD=           gnu99
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake pkg-config
 GNU_CONFIGURE=         yes

Index: pkgsrc/security/pkcs11-helper/distinfo
diff -u pkgsrc/security/pkcs11-helper/distinfo:1.8 pkgsrc/security/pkcs11-helper/distinfo:1.8.12.1
--- pkgsrc/security/pkcs11-helper/distinfo:1.8  Sun Apr 14 12:52:09 2024
+++ pkgsrc/security/pkcs11-helper/distinfo      Fri Nov 21 08:43:43 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2024/04/14 12:52:09 gdt Exp $
+$NetBSD: distinfo,v 1.8.12.1 2025/11/21 08:43:43 bsiegert Exp $
 
-BLAKE2s (pkcs11-helper-1.30.0.tar.bz2) = 5b9bda47fa65eb9a280d569cde20a8cf0ae60c417d9e394cf757d22c1a407f66
-SHA512 (pkcs11-helper-1.30.0.tar.bz2) = 19fba76e41210cc17f9efa4501d0214d4a5c777ab7b2671888fd280b150bae4a6b190c7f47fb783015f9aa40d409fd6087264e531d6f28d0bed4293dcbf8bdd5
-Size (pkcs11-helper-1.30.0.tar.bz2) = 423196 bytes
+BLAKE2s (pkcs11-helper-1.31.0.tar.bz2) = 9080bc6cb27f6d35ee1b90ab36f0a39c52647b997b5eea41efc5c3c2d60ecd60
+SHA512 (pkcs11-helper-1.31.0.tar.bz2) = 0833efc59e9093dd398a54640d858b01a830ef7adfb40321c1e0ed0afa004500fc1259cc66bc49c5263935adeda0a3bfe658de538eefd66888685a71f731c484
+Size (pkcs11-helper-1.31.0.tar.bz2) = 424487 bytes
+SHA1 (patch-lib_pkcs11h-util.c) = 7efcde2ad5d8c7d53a802c4d7928cb9b5057109c

Added files:

Index: pkgsrc/security/pkcs11-helper/patches/patch-lib_pkcs11h-util.c
diff -u /dev/null pkgsrc/security/pkcs11-helper/patches/patch-lib_pkcs11h-util.c:1.1.2.2
--- /dev/null   Fri Nov 21 08:43:43 2025
+++ pkgsrc/security/pkcs11-helper/patches/patch-lib_pkcs11h-util.c      Fri Nov 21 08:43:43 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_pkcs11h-util.c,v 1.1.2.2 2025/11/21 08:43:43 bsiegert Exp $
+
+Fix ctype usage.
+
+--- lib/pkcs11h-util.c.orig    2025-11-19 08:30:09.777808327 +0000
++++ lib/pkcs11h-util.c
+@@ -179,7 +179,7 @@ _pkcs11h_util_escapeString (
+ 
+       while (*s != '\x0') {
+ 
+-              if (*s == '\\' || strchr (invalid_chars, (unsigned char)*s) || !isgraph (*s)) {
++              if (*s == '\\' || strchr (invalid_chars, (unsigned char)*s) || !isgraph ((unsigned char)*s)) {
+                       if (t != NULL) {
+                               if (n+4 > *max) {
+                                       rv = CKR_ATTRIBUTE_VALUE_INVALID;