CVS commit: pkgsrc/security/pkcs11-provider

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Tue Nov  3 14:47:35 UTC 2026

Modified Files:
        pkgsrc/security/pkcs11-provider: Makefile distinfo
Added Files:
        pkgsrc/security/pkcs11-provider/patches: patch-meson.build
            patch-meson__options.txt

Log Message:
security/pkcs11-provider: Fix build with base openssl.

Just arrange to install modules into $PREFIX/lib/ossl-modules for
base openssl; it is the user's responsibility to set OPENSSL_MODULES
or pass -provider-path or otherwise configure base openssl to use
pkgsrc modules.

No change to build with pkgsrc openssl, and this didn't build with
base openssl before, so no revbump.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/security/pkcs11-provider/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/pkcs11-provider/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/security/pkcs11-provider/patches/patch-meson.build \
    pkgsrc/security/pkcs11-provider/patches/patch-meson__options.txt

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-provider/Makefile
diff -u pkgsrc/security/pkcs11-provider/Makefile:1.2 pkgsrc/security/pkcs11-provider/Makefile:1.3
--- pkgsrc/security/pkcs11-provider/Makefile:1.2        Sat Oct 31 23:14:09 2026
+++ pkgsrc/security/pkcs11-provider/Makefile    Tue Nov  3 14:47:35 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2026/10/31 23:14:09 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2026/11/03 14:47:35 riastradh Exp $
 
 DISTNAME=      pkcs11-provider-1.3.0
 CATEGORIES=    security
@@ -12,11 +12,8 @@ LICENSE=     apache-2.0
 
 USE_TOOLS+=    pkg-config
 
-# as of 2026-10-31, does not work with base openssl
-# a) the pkgsrc framework does not provide all required pkg-config values
-#    in the faked libcrypto.pc file
-# b) the base system does not provide the directories to install into
-USE_BUILTIN.openssl=   no
+MESON_ARGS+=   ${${USE_BUILTIN.openssl} == "yes":?-Dmodules_dir=${PREFIX:Q}/lib/ossl-modules:}
+
 .include "../../devel/meson/build.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/security/pkcs11-provider/distinfo
diff -u pkgsrc/security/pkcs11-provider/distinfo:1.1 pkgsrc/security/pkcs11-provider/distinfo:1.2
--- pkgsrc/security/pkcs11-provider/distinfo:1.1        Mon Oct 26 12:20:31 2026
+++ pkgsrc/security/pkcs11-provider/distinfo    Tue Nov  3 14:47:35 2026
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1 2026/10/26 12:20:31 riastradh Exp $
+$NetBSD: distinfo,v 1.2 2026/11/03 14:47:35 riastradh Exp $
 
 BLAKE2s (pkcs11-provider-1.3.0.tar.xz) = 496732ebac367453eb4181ffc6897f3103b300fbb2a985fcd4b20b269859f411
 SHA512 (pkcs11-provider-1.3.0.tar.xz) = 5a2af2ab09cf8088ea05b07f6feed90b9df57ec6201a64f9c06cde447d3f9faf532a07094b5f62617163374bb03f974d62b11e27b48ba2a83e4459339d32b157
 Size (pkcs11-provider-1.3.0.tar.xz) = 236628 bytes
+SHA1 (patch-meson.build) = 593eadd43114cc3b01f096dd575d7c6c31e7f2b8
+SHA1 (patch-meson__options.txt) = a7cac9b4c61ed7d6b88ca932b793ad14c7ad2886

Added files:

Index: pkgsrc/security/pkcs11-provider/patches/patch-meson.build
diff -u /dev/null pkgsrc/security/pkcs11-provider/patches/patch-meson.build:1.1
--- /dev/null   Tue Nov  3 14:47:35 2026
+++ pkgsrc/security/pkcs11-provider/patches/patch-meson.build   Tue Nov  3 14:47:35 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-meson.build,v 1.1 2026/11/03 14:47:35 riastradh Exp $
+
+Allow pkgsrc to override OpenSSL module dir in case pkg-config doesn't
+provide it.
+
+--- meson.build.orig   2026-09-22 14:45:27.000000000 +0000
++++ meson.build
+@@ -49,7 +49,10 @@ libcrypto = dependency('libcrypto', vers
+ if not libcrypto.found()
+   libcrypto = dependency('libcrypto3', version: '>= 3.0.7', required: true)
+ endif
++provider_path = get_option('modules_dir')
++if provider_path == ''
+ provider_path = libcrypto.get_variable(pkgconfig: 'modulesdir')
++endif
+ libssl = dependency('libssl', version: '>= 3.0.7', required: false)
+ if not libssl.found()
+   libssl = dependency('libssl3', version: '>= 3.0.7', required: true, method: 'pkg-config')
Index: pkgsrc/security/pkcs11-provider/patches/patch-meson__options.txt
diff -u /dev/null pkgsrc/security/pkcs11-provider/patches/patch-meson__options.txt:1.1
--- /dev/null   Tue Nov  3 14:47:35 2026
+++ pkgsrc/security/pkcs11-provider/patches/patch-meson__options.txt    Tue Nov  3 14:47:35 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-meson__options.txt,v 1.1 2026/11/03 14:47:35 riastradh Exp $
+
+Allow pkgsrc to override OpenSSL module dir in case pkg-config doesn't
+provide it.
+
+--- meson_options.txt.orig     2026-09-22 14:45:27.000000000 +0000
++++ meson_options.txt
+@@ -17,3 +17,8 @@ option('build_info',
+     type : 'string',
+     value : '',
+     description : 'Optional string with build information, like a build id')
++
++option('modules_dir',
++    type : 'string',
++    value : '',
++    description : 'Path where OpenSSL modules are to be installed')