Accepting request 1120796 from home:pmonrealgonzalez:branches:Base:System

- Update to 0.25.1:
  * fix probing of C_GetInterface [#535]
  * p11-kit: add command to list tokens [#581]
  * p11-kit: add command to list mechanisms supported by a token [#576]
  * p11-kit: add command to generate private-public keypair on a token
    [#551, #582]
  * p11-kit: add commands to import/export certificates and public
    keys into/from a token [#543, #549, #568, #588]
  * p11-kit: add commands to list and delete objects of a token
    [#533, #544, #571]
  * p11-kit: add --login option to login into a token with object
    and profile management commands [#587]
  * p11-kit: adjust behavior of PKCS#11 profile management commands
    [#558, #560, #583, #591]
  * p11-kit: print PKCS#11 URIs in list-modules [#532]
  * bug and build fixes [#528 #529, #534, #537, #540, #541, #545,
    #547, #550, #557, #572, #575, #579, #585, #586, #590]
  * test fixes [#553, #580]
  * Remove patch fixed upstream:
    - d1d4b0ac316a27c739ff91e6c4153f1154e96e5a.patch

OBS-URL: https://build.opensuse.org/request/show/1120796
OBS-URL: https://build.opensuse.org/package/show/Base:System/p11-kit?expand=0&rev=56

d1d4b0ac316a27c739ff91e6c4153f1154e96e5a.patch

@@ -1,42 +0,0 @@
-From d1d4b0ac316a27c739ff91e6c4153f1154e96e5a Mon Sep 17 00:00:00 2001
-From: Xi Ruoyao <xry111@xry111.site>
-Date: Thu, 27 Jul 2023 12:18:15 +0800
-Subject: [PATCH] Fix probing of C_GetInterface
-
-`p11_dl_symbol (dl, "C_GetInterface")` uses dlsym() to find
-C_GetInterface in the loaded pkcs11 module.  For legacy (pre-3.0) pkcs11
-modules, C_GetInterface is not defined in the module.  But according to
-the documentation of dlsym():
-
-    The search performed by dlsym() is breadth first through the
-    dependency tree of these shared objects.
-
-So if a pkcs11 module links to libp11-kit.so, the C_GetInterface
-implementation in libp11-kit.so itself will be found.  This
-C_GetInterface will return the metadata of p11-kit-proxy.so, causing
-"Refuse to load the p11-kit-proxy.so as a registered module".
-
-To solve the issue, if p11_dl_symbol() returns the C_GetInterface in
-libp11-kit.so itself, we should ignore it and continue trying
-C_GetFunctionList.
----
- p11-kit/modules.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/p11-kit/modules.c b/p11-kit/modules.c
-index 8ad88ae01..da0a7f04d 100644
---- a/p11-kit/modules.c
-+++ b/p11-kit/modules.c
-@@ -383,6 +383,12 @@ dlopen_and_get_function_list (Module *mod,
- 	mod->loaded_module = dl;
- 
- 	gi = p11_dl_symbol (dl, "C_GetInterface");
-+
-+#ifndef OS_WIN32
-+	if (gi == C_GetInterface)
-+		gi = NULL;
-+#endif
-+
- 	if (gi) {
- 		/* Get the default standard interface */
- 		rv = gi ((unsigned char *)"PKCS 11", NULL, &interface, 0);

p11-kit-0.25.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d55583bcdde83d86579cabe3a8f7f2638675fef01d23cace733ff748fc354706
-size 958940

p11-kit-0.25.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b6f326925725c8c45484e6daf78cdc73428a86296b6b99078255017f1bacdafc
+size 990460

p11-kit.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri Oct 27 12:05:22 UTC 2023 - Pedro Monreal <pmonreal@suse.com>
+
+- Update to 0.25.1:
+  * fix probing of C_GetInterface [#535]
+  * p11-kit: add command to list tokens [#581]
+  * p11-kit: add command to list mechanisms supported by a token [#576]
+  * p11-kit: add command to generate private-public keypair on a token
+    [#551, #582]
+  * p11-kit: add commands to import/export certificates and public
+    keys into/from a token [#543, #549, #568, #588]
+  * p11-kit: add commands to list and delete objects of a token
+    [#533, #544, #571]
+  * p11-kit: add --login option to login into a token with object
+    and profile management commands [#587]
+  * p11-kit: adjust behavior of PKCS#11 profile management commands
+    [#558, #560, #583, #591]
+  * p11-kit: print PKCS#11 URIs in list-modules [#532]
+  * bug and build fixes [#528 #529, #534, #537, #540, #541, #545,
+    #547, #550, #557, #572, #575, #579, #585, #586, #590]
+  * test fixes [#553, #580]
+  * Remove patch fixed upstream:
+    - d1d4b0ac316a27c739ff91e6c4153f1154e96e5a.patch
+
 -------------------------------------------------------------------
 Wed Sep 20 21:26:03 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
 

p11-kit.spec

@@ -21,7 +21,7 @@
 %define trustdir_cfg     %{pkidir_cfg}/trust
 %define trustdir_static  %{pkidir_static}/trust
 Name:           p11-kit
-Version:        0.25.0
+Version:        0.25.1
 Release:        0
 Summary:        Library to work with PKCS#11 modules
 License:        BSD-3-Clause
@@ -31,8 +31,6 @@ Source0:        https://github.com/p11-glue/%{name}/releases/download/%{version}
 Source1:        https://github.com/p11-glue/%{name}/releases/download/%{version}/p11-kit-%{version}.tar.xz.sig
 Source98:       https://p11-glue.github.io/p11-glue/%{name}/%{name}-release-keyring.gpg#/%{name}.keyring
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM d1d4b0ac316a27c739ff91e6c4153f1154e96e5a.patch -- Fix probing of C_GetInterface
-Patch0:         https://github.com/p11-glue/p11-kit/commit/d1d4b0ac316a27c739ff91e6c4153f1154e96e5a.patch
 BuildRequires:  gtk-doc
 %if 0%{?suse_version} >= 1600
 BuildRequires:  libtasn1-tools