Merge pull request #8 from mlocati/master

Fork Sync: Update from parent repository
vdlp · Jul 3, 2023 · 0e219f4 · 0e219f4
2 parents cbfe759 + ba3716d
commit 0e219f4
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -274,6 +274,7 @@ install-php-extensions @fix_letsencrypt
 | pdo_sqlsrv[*](#special-requirements-for-pdo_sqlsrv) |  |  | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
 | pgsql | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
 | php_trie |  |  |  |  |  | &check; | &check; | &check; | &check; | &check; |
+| pkcs11 |  |  |  |  |  |  | &check; | &check; | &check; | &check; |
 | pq |  |  | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
 | propro | &check; | &check; | &check; | &check; | &check; | &check; | &check; |  |  |  |
 | protobuf | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
@@ -302,6 +303,7 @@ install-php-extensions @fix_letsencrypt
 | stomp | &check; | &check; | &check; | &check; | &check; | &check; | &check; |  |  | &check; |
 | swoole | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
 | sybase_ct | &check; | &check; |  |  |  |  |  |  |  |  |
+| sync | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
 | sysvmsg | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
 | sysvsem | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
 | sysvshm | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
@@ -330,7 +332,7 @@ install-php-extensions @fix_letsencrypt
 | zookeeper | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
 | zstd | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; | &check; |
 
-*Number of supported extensions: 136*
+*Number of supported extensions: 138*
 <!-- END OF EXTENSIONS TABLE -->
 
 PS: the pre-installed PHP extensions are excluded from this list.

diff --git a/data/supported-extensions b/data/supported-extensions
@@ -79,6 +79,7 @@ pdo_pgsql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
 pdo_sqlsrv 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
 pgsql 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
 php_trie 7.3 7.4 8.0 8.1 8.2
+pkcs11 7.4 8.0 8.1 8.2
 pq 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
 propro 5.5 5.6 7.0 7.1 7.2 7.3 7.4
 protobuf 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
@@ -107,6 +108,7 @@ ssh2 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
 stomp 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.2
 swoole 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
 sybase_ct 5.5 5.6
+sync 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
 sysvmsg 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
 sysvsem 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2
 sysvshm 5.5 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2

diff --git a/install-php-extensions b/install-php-extensions
@@ -1123,6 +1123,12 @@ buildRequiredPackageLists() {
 			php_trie@alpine)
 				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libstdc++"
 				;;
+			pkcs11@alpine)
+				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent softhsm"
+				;;
+			pkcs11@debian)
+				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent libsofthsm2"
+				;;
 			pspell@alpine)
 				buildRequiredPackageLists_persistent="$buildRequiredPackageLists_persistent aspell-libs $(expandASpellDictionaries)"
 				buildRequiredPackageLists_volatile="$buildRequiredPackageLists_volatile aspell-dev"

diff --git a/scripts/tests/pkcs11 b/scripts/tests/pkcs11
@@ -0,0 +1,13 @@
+#!/usr/bin/env php
+<?php
+
+require_once __DIR__ . '/_bootstrap.php';
+
+$module = new Pkcs11\Module('/usr/lib/softhsm/libsofthsm2.so');
+$moduleInfo = $module->getInfo();
+if (!is_array($moduleInfo)) {
+    fwrite(STDERR, "Pkcs11\\Module::getInfo() should return an array\n");
+}
+if (!isset($moduleInfo['manufacturerID']) || $moduleInfo['manufacturerID'] !== 'SoftHSM') {
+    fwrite(STDERR, "Unexpected return value of Pkcs11\\Module::getInfo()\n");
+}