From 93cc8c15cae5a07f3afd2c391b2b6ad87d02c12c Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 24 Aug 2023 10:37:57 +0900 Subject: [PATCH 01/25] Migrate License field to SPDX license identifier Signed-off-by: Daiki Ueno --- p11-kit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 1ad9176..eace013 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -4,7 +4,7 @@ Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules -License: BSD +License: BSD-3-Clause URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz.sig From aab0f5c7d6ac37efa86df453bffeef65d0550a88 Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 26 Oct 2023 10:03:53 +0000 Subject: [PATCH 02/25] [packit] 0.25.1 upstream release Upstream tag: 0.25.1 Upstream commit: 3ee32232 --- .gitignore | 2 ++ README.packit | 2 +- p11-kit.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 46beaf7..add35eb 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /p11-kit-0.25.0.tar.xz /p11-kit-0.25.0.tar.xz.sig /p11-kit-release-keyring.gpg +/p11-kit-0.25.1.tar.xz +/p11-kit-0.25.1.tar.xz.sig diff --git a/README.packit b/README.packit index 101115f..2a3acd4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.77.0.post2+g06f877b. +The file was generated using packit 0.84.0. diff --git a/p11-kit.spec b/p11-kit.spec index eace013..8859071 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.25.0 +Version: 0.25.1 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules diff --git a/sources b/sources index 9e7be52..a2d5228 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.0.tar.xz) = e6df3cb224f6ff5671bd3c0557503b5f20bbfded1b6ec340b1dafcbd1b1725ea2d41d0e920756716e0fe9cb28270d115fe77b23ec876a15007b22e3f30d015fe -SHA512 (p11-kit-0.25.0.tar.xz.sig) = dc87fa4c94b723f74ed279d372c15dbafc87aba83539d05e20a528d035ec14e8c3814bb62f0582acdaa542a42a467d6a53b3197be93cb020b66ad9fe2cf26752 +SHA512 (p11-kit-0.25.1.tar.xz) = e12e32148e0924ac7dca4c6a4399cff0934df4f002a31e7ffc5c3cfd14a4c0a47225eb84abd73b7f36c8dfcc32f92756e90699335b830414e8f5eddeaa42c532 +SHA512 (p11-kit-0.25.1.tar.xz.sig) = 1278c27c774150bbab46df947d55fe96951f250bed9dc6c218faaa1020d686189c26d6569df2916b4730878123f69b4457faf422b0b48de13408faab8d4c9187 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From cc82edfd46981ede1d8f1ba4f8bb6a700bb1dc0d Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 26 Oct 2023 10:05:05 +0000 Subject: [PATCH 03/25] [packit] 0.25.1 upstream release Upstream tag: 0.25.1 Upstream commit: 3ee32232 --- .gitignore | 2 ++ README.packit | 2 +- p11-kit.spec | 4 ++-- sources | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 46beaf7..add35eb 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /p11-kit-0.25.0.tar.xz /p11-kit-0.25.0.tar.xz.sig /p11-kit-release-keyring.gpg +/p11-kit-0.25.1.tar.xz +/p11-kit-0.25.1.tar.xz.sig diff --git a/README.packit b/README.packit index 101115f..2a3acd4 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.77.0.post2+g06f877b. +The file was generated using packit 0.84.0. diff --git a/p11-kit.spec b/p11-kit.spec index 1ad9176..8859071 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,10 +1,10 @@ # This spec file has been automatically updated -Version: 0.25.0 +Version: 0.25.1 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules -License: BSD +License: BSD-3-Clause URL: http://p11-glue.freedesktop.org/p11-kit.html Source0: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.xz.sig diff --git a/sources b/sources index 9e7be52..a2d5228 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.0.tar.xz) = e6df3cb224f6ff5671bd3c0557503b5f20bbfded1b6ec340b1dafcbd1b1725ea2d41d0e920756716e0fe9cb28270d115fe77b23ec876a15007b22e3f30d015fe -SHA512 (p11-kit-0.25.0.tar.xz.sig) = dc87fa4c94b723f74ed279d372c15dbafc87aba83539d05e20a528d035ec14e8c3814bb62f0582acdaa542a42a467d6a53b3197be93cb020b66ad9fe2cf26752 +SHA512 (p11-kit-0.25.1.tar.xz) = e12e32148e0924ac7dca4c6a4399cff0934df4f002a31e7ffc5c3cfd14a4c0a47225eb84abd73b7f36c8dfcc32f92756e90699335b830414e8f5eddeaa42c532 +SHA512 (p11-kit-0.25.1.tar.xz.sig) = 1278c27c774150bbab46df947d55fe96951f250bed9dc6c218faaa1020d686189c26d6569df2916b4730878123f69b4457faf422b0b48de13408faab8d4c9187 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From dd7fdb54d62056acac47137cf10ca4eb4d0fe39b Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 31 Oct 2023 09:27:24 +0000 Subject: [PATCH 04/25] [packit] 0.25.2 upstream release Upstream tag: 0.25.2 Upstream commit: 66d6b42e --- .gitignore | 2 ++ README.packit | 2 +- p11-kit.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index add35eb..0209a25 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ /p11-kit-release-keyring.gpg /p11-kit-0.25.1.tar.xz /p11-kit-0.25.1.tar.xz.sig +/p11-kit-0.25.2.tar.xz +/p11-kit-0.25.2.tar.xz.sig diff --git a/README.packit b/README.packit index 2a3acd4..5998f60 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.84.0. +The file was generated using packit 0.85.0. diff --git a/p11-kit.spec b/p11-kit.spec index 8859071..ab4eea2 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.25.1 +Version: 0.25.2 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules diff --git a/sources b/sources index a2d5228..7f63c24 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.1.tar.xz) = e12e32148e0924ac7dca4c6a4399cff0934df4f002a31e7ffc5c3cfd14a4c0a47225eb84abd73b7f36c8dfcc32f92756e90699335b830414e8f5eddeaa42c532 -SHA512 (p11-kit-0.25.1.tar.xz.sig) = 1278c27c774150bbab46df947d55fe96951f250bed9dc6c218faaa1020d686189c26d6569df2916b4730878123f69b4457faf422b0b48de13408faab8d4c9187 +SHA512 (p11-kit-0.25.2.tar.xz) = 64df7600c1eedfba942a38eb32bda7fe869ed197449dff2b8470be37ba71f3eefc3990613d2f787d3300b18e87391cd8f8bb4b33277d51ec873548126137bd01 +SHA512 (p11-kit-0.25.2.tar.xz.sig) = 897c3a1280adb2b6e41f75dbb0943bf90981c04710fbaeed4dd93dd0694b4077c8e8b355dca1269e4de3f997273b95d3c71d61d774ef7b960967d72ddacfb8a3 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From c8034a7af58775672da90eb0baf8b7e5c5efd35d Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 31 Oct 2023 09:28:04 +0000 Subject: [PATCH 05/25] [packit] 0.25.2 upstream release Upstream tag: 0.25.2 Upstream commit: 66d6b42e --- .gitignore | 2 ++ README.packit | 2 +- p11-kit.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index add35eb..0209a25 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,5 @@ /p11-kit-release-keyring.gpg /p11-kit-0.25.1.tar.xz /p11-kit-0.25.1.tar.xz.sig +/p11-kit-0.25.2.tar.xz +/p11-kit-0.25.2.tar.xz.sig diff --git a/README.packit b/README.packit index 2a3acd4..5998f60 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.84.0. +The file was generated using packit 0.85.0. diff --git a/p11-kit.spec b/p11-kit.spec index 8859071..ab4eea2 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.25.1 +Version: 0.25.2 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules diff --git a/sources b/sources index a2d5228..7f63c24 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.1.tar.xz) = e12e32148e0924ac7dca4c6a4399cff0934df4f002a31e7ffc5c3cfd14a4c0a47225eb84abd73b7f36c8dfcc32f92756e90699335b830414e8f5eddeaa42c532 -SHA512 (p11-kit-0.25.1.tar.xz.sig) = 1278c27c774150bbab46df947d55fe96951f250bed9dc6c218faaa1020d686189c26d6569df2916b4730878123f69b4457faf422b0b48de13408faab8d4c9187 +SHA512 (p11-kit-0.25.2.tar.xz) = 64df7600c1eedfba942a38eb32bda7fe869ed197449dff2b8470be37ba71f3eefc3990613d2f787d3300b18e87391cd8f8bb4b33277d51ec873548126137bd01 +SHA512 (p11-kit-0.25.2.tar.xz.sig) = 897c3a1280adb2b6e41f75dbb0943bf90981c04710fbaeed4dd93dd0694b4077c8e8b355dca1269e4de3f997273b95d3c71d61d774ef7b960967d72ddacfb8a3 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From 813fe621e6494b63d1fe2b6433a4b040ffb35cff Mon Sep 17 00:00:00 2001 From: Zoltan Fridrich Date: Wed, 8 Nov 2023 11:08:29 +0100 Subject: [PATCH 06/25] Replace "black list" with "blocklist" in package description Signed-off-by: Zoltan Fridrich --- p11-kit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index ab4eea2..59b278b 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -51,7 +51,7 @@ Conflicts: nss < 3.14.3-9 %description trust The %{name}-trust package contains a system trust PKCS#11 module which -contains certificate anchors and black lists. +contains certificate anchors and blocklists. %package server From ed0f630c7acfe5b9fa9a1b5d2fa87bd33880b4a9 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 15 Nov 2023 12:51:54 +0000 Subject: [PATCH 07/25] [packit] 0.25.3 upstream release Upstream tag: 0.25.3 Upstream commit: 917e02a3 --- .gitignore | 2 ++ README.packit | 2 +- p11-kit.spec | 2 +- sources | 4 ++-- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0209a25..7b351bd 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ /p11-kit-0.25.1.tar.xz.sig /p11-kit-0.25.2.tar.xz /p11-kit-0.25.2.tar.xz.sig +/p11-kit-0.25.3.tar.xz +/p11-kit-0.25.3.tar.xz.sig diff --git a/README.packit b/README.packit index 5998f60..b6ea2f6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.85.0. +The file was generated using packit 0.85.0.post1.dev17+g1f3036b1. diff --git a/p11-kit.spec b/p11-kit.spec index 59b278b..866be52 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.25.2 +Version: 0.25.3 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules diff --git a/sources b/sources index 7f63c24..ca61d94 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.2.tar.xz) = 64df7600c1eedfba942a38eb32bda7fe869ed197449dff2b8470be37ba71f3eefc3990613d2f787d3300b18e87391cd8f8bb4b33277d51ec873548126137bd01 -SHA512 (p11-kit-0.25.2.tar.xz.sig) = 897c3a1280adb2b6e41f75dbb0943bf90981c04710fbaeed4dd93dd0694b4077c8e8b355dca1269e4de3f997273b95d3c71d61d774ef7b960967d72ddacfb8a3 +SHA512 (p11-kit-0.25.3.tar.xz) = ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c +SHA512 (p11-kit-0.25.3.tar.xz.sig) = 189a40b12e40818daff4aa6869d7e0fa342a42f3901d85fc52bb40f7023bb17790967be5ab9a183473fe8bb3e335a0d4d8c2b6345ccf811e90f8495009c085b8 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From fb7385f02f40aa45b850a94531ff69139f3b2852 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 15 Nov 2023 12:53:59 +0000 Subject: [PATCH 08/25] [packit] 0.25.3 upstream release Upstream tag: 0.25.3 Upstream commit: 917e02a3 --- .gitignore | 2 ++ README.packit | 2 +- p11-kit.spec | 4 ++-- sources | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0209a25..7b351bd 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ /p11-kit-0.25.1.tar.xz.sig /p11-kit-0.25.2.tar.xz /p11-kit-0.25.2.tar.xz.sig +/p11-kit-0.25.3.tar.xz +/p11-kit-0.25.3.tar.xz.sig diff --git a/README.packit b/README.packit index 5998f60..b6ea2f6 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.85.0. +The file was generated using packit 0.85.0.post1.dev17+g1f3036b1. diff --git a/p11-kit.spec b/p11-kit.spec index ab4eea2..866be52 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.25.2 +Version: 0.25.3 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -51,7 +51,7 @@ Conflicts: nss < 3.14.3-9 %description trust The %{name}-trust package contains a system trust PKCS#11 module which -contains certificate anchors and black lists. +contains certificate anchors and blocklists. %package server diff --git a/sources b/sources index 7f63c24..ca61d94 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.2.tar.xz) = 64df7600c1eedfba942a38eb32bda7fe869ed197449dff2b8470be37ba71f3eefc3990613d2f787d3300b18e87391cd8f8bb4b33277d51ec873548126137bd01 -SHA512 (p11-kit-0.25.2.tar.xz.sig) = 897c3a1280adb2b6e41f75dbb0943bf90981c04710fbaeed4dd93dd0694b4077c8e8b355dca1269e4de3f997273b95d3c71d61d774ef7b960967d72ddacfb8a3 +SHA512 (p11-kit-0.25.3.tar.xz) = ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c +SHA512 (p11-kit-0.25.3.tar.xz.sig) = 189a40b12e40818daff4aa6869d7e0fa342a42f3901d85fc52bb40f7023bb17790967be5ab9a183473fe8bb3e335a0d4d8c2b6345ccf811e90f8495009c085b8 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From 34faad315d01886e96c29a4d3049d1da50440471 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 11:39:08 +0000 Subject: [PATCH 09/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a088c987f21d8ef9ad3b25a7e0c7c0c3aea20a04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 11:44:40 +0000 Subject: [PATCH 10/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4591e32cb1e546a082ad3d2cece04c3b6bb967a2 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 31 Jan 2024 11:08:56 +0900 Subject: [PATCH 11/25] import-object: Avoid integer truncation on 32-bit platforms Fixes: #2261437 Signed-off-by: Daiki Ueno --- p11-kit-0.25.3-import-object.patch | 109 +++++++++++++++++++++++++++++ p11-kit.spec | 1 + 2 files changed, 110 insertions(+) create mode 100644 p11-kit-0.25.3-import-object.patch diff --git a/p11-kit-0.25.3-import-object.patch b/p11-kit-0.25.3-import-object.patch new file mode 100644 index 0000000..974e0cf --- /dev/null +++ b/p11-kit-0.25.3-import-object.patch @@ -0,0 +1,109 @@ +From d49c92c8420db6ee4c88515bdb014f68f4d471d9 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Sat, 2 Dec 2023 09:24:01 +0900 +Subject: [PATCH] import-object: Avoid integer truncation on 32-bit platforms +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The build fails when compiling for 32-bit platforms with +-Werror=incompatible-pointer-types: + + CFLAGS="-m32 -march=i686 -Werror=incompatible-pointer-types -Werror=implicit -Werror=int-conversion" setarch i686 -- meson setup _build + setarch i686 -- meson compile -C _build -v + ... + + ../p11-kit/import-object.c: In function ‘add_attrs_pubkey_rsa’: + ../p11-kit/import-object.c:223:62: error: passing argument 3 of ‘p11_asn1_read’ from incompatible pointer type [-Werror=incompatible-pointer-types] + 223 | attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); + | ^~~~~~~~~~~~~~~~~~~~~~~~ + | | + | long unsigned int * + +Reported by Sam James in: +https://github.com/p11-glue/p11-kit/issues/608 + +Signed-off-by: Daiki Ueno +--- + p11-kit/import-object.c | 30 +++++++++++++++++++++++++++--- + 1 file changed, 27 insertions(+), 3 deletions(-) + +diff --git a/p11-kit/import-object.c b/p11-kit/import-object.c +index feee076..fb47b96 100644 +--- a/p11-kit/import-object.c ++++ b/p11-kit/import-object.c +@@ -55,6 +55,7 @@ + #endif + + #include ++#include + #include + #include + #include +@@ -201,6 +202,7 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, + CK_ATTRIBUTE attr_encrypt = { CKA_ENCRYPT, &tval, sizeof (tval) }; + CK_ATTRIBUTE attr_modulus = { CKA_MODULUS, }; + CK_ATTRIBUTE attr_exponent = { CKA_PUBLIC_EXPONENT, }; ++ size_t len = 0; + + pubkey = p11_asn1_read (info, "subjectPublicKey", &pubkey_len); + if (pubkey == NULL) { +@@ -220,17 +222,31 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, + goto cleanup; + } + +- attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); ++ attr_modulus.pValue = p11_asn1_read (asn, "modulus", &len); + if (attr_modulus.pValue == NULL) { + p11_message (_("failed to obtain modulus")); + goto cleanup; + } ++#if ULONG_MAX < SIZE_MAX ++ if (len > ULONG_MAX) { ++ p11_message (_("failed to obtain modulus")); ++ goto cleanup; ++ } ++#endif ++ attr_modulus.ulValueLen = len; + +- attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &attr_exponent.ulValueLen); ++ attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &len); + if (attr_exponent.pValue == NULL) { + p11_message (_("failed to obtain exponent")); + goto cleanup; + } ++#if ULONG_MAX < SIZE_MAX ++ if (len > ULONG_MAX) { ++ p11_message (_("failed to obtain exponent")); ++ goto cleanup; ++ } ++#endif ++ attr_exponent.ulValueLen = len; + + result = p11_attrs_build (attrs, &attr_key_type, &attr_encrypt, &attr_modulus, &attr_exponent, NULL); + if (result == NULL) { +@@ -260,12 +276,20 @@ add_attrs_pubkey_ec (CK_ATTRIBUTE *attrs, + CK_ATTRIBUTE attr_key_type = { CKA_KEY_TYPE, &key_type, sizeof (key_type) }; + CK_ATTRIBUTE attr_ec_params = { CKA_EC_PARAMS, }; + CK_ATTRIBUTE attr_ec_point = { CKA_EC_POINT, }; ++ size_t len = 0; + +- attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &attr_ec_params.ulValueLen); ++ attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &len); + if (attr_ec_params.pValue == NULL) { + p11_message (_("failed to obtain EC parameters")); + goto cleanup; + } ++#if ULONG_MAX < SIZE_MAX ++ if (len > ULONG_MAX) { ++ p11_message (_("failed to obtain EC parameters")); ++ goto cleanup; ++ } ++#endif ++ attr_ec_params.ulValueLen = len; + + /* subjectPublicKey is read as BIT STRING value which contains + * EC point data. We need to DER encode this data as OCTET STRING. +-- +2.43.0 + diff --git a/p11-kit.spec b/p11-kit.spec index 866be52..46b9cb6 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -11,6 +11,7 @@ Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version} Source2: https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyring.gpg Source3: trust-extract-compat Source4: p11-kit-client.service +Patch: p11-kit-0.25.3-import-object.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 From 5037388f87eb522bc90a94a9b5144936513d280d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 21 Jun 2024 15:31:43 -0400 Subject: [PATCH 12/25] Fix bash-completion build dependency The pkgconfig data has been split out into bash-completion-devel for F41. --- p11-kit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 46b9cb6..b268309 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -20,7 +20,7 @@ BuildRequires: gettext BuildRequires: gtk-doc BuildRequires: meson BuildRequires: systemd-devel -BuildRequires: bash-completion +BuildRequires: pkgconfig(bash-completion) # Work around for https://bugzilla.redhat.com/show_bug.cgi?id=1497147 # Remove this once it is fixed BuildRequires: pkgconfig(glib-2.0) From 83f95a1eee36953e86a032a78fa1dd50681d1d5d Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 4 Jul 2024 10:52:10 +0000 Subject: [PATCH 13/25] Update to 0.25.5 upstream release Upstream tag: 0.25.5 Upstream commit: 0dd11336 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 + README.packit | 2 +- p11-kit-0.25.3-import-object.patch | 109 ----------------------------- p11-kit.spec | 3 +- sources | 4 +- 5 files changed, 6 insertions(+), 114 deletions(-) delete mode 100644 p11-kit-0.25.3-import-object.patch diff --git a/.gitignore b/.gitignore index 7b351bd..6db1df5 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ /p11-kit-0.25.2.tar.xz.sig /p11-kit-0.25.3.tar.xz /p11-kit-0.25.3.tar.xz.sig +/p11-kit-0.25.5.tar.xz +/p11-kit-0.25.5.tar.xz.sig diff --git a/README.packit b/README.packit index b6ea2f6..f2be23e 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.85.0.post1.dev17+g1f3036b1. +The file was generated using packit 0.97.3.post1.dev7+g1954e49a. diff --git a/p11-kit-0.25.3-import-object.patch b/p11-kit-0.25.3-import-object.patch deleted file mode 100644 index 974e0cf..0000000 --- a/p11-kit-0.25.3-import-object.patch +++ /dev/null @@ -1,109 +0,0 @@ -From d49c92c8420db6ee4c88515bdb014f68f4d471d9 Mon Sep 17 00:00:00 2001 -From: Daiki Ueno -Date: Sat, 2 Dec 2023 09:24:01 +0900 -Subject: [PATCH] import-object: Avoid integer truncation on 32-bit platforms -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The build fails when compiling for 32-bit platforms with --Werror=incompatible-pointer-types: - - CFLAGS="-m32 -march=i686 -Werror=incompatible-pointer-types -Werror=implicit -Werror=int-conversion" setarch i686 -- meson setup _build - setarch i686 -- meson compile -C _build -v - ... - - ../p11-kit/import-object.c: In function ‘add_attrs_pubkey_rsa’: - ../p11-kit/import-object.c:223:62: error: passing argument 3 of ‘p11_asn1_read’ from incompatible pointer type [-Werror=incompatible-pointer-types] - 223 | attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); - | ^~~~~~~~~~~~~~~~~~~~~~~~ - | | - | long unsigned int * - -Reported by Sam James in: -https://github.com/p11-glue/p11-kit/issues/608 - -Signed-off-by: Daiki Ueno ---- - p11-kit/import-object.c | 30 +++++++++++++++++++++++++++--- - 1 file changed, 27 insertions(+), 3 deletions(-) - -diff --git a/p11-kit/import-object.c b/p11-kit/import-object.c -index feee076..fb47b96 100644 ---- a/p11-kit/import-object.c -+++ b/p11-kit/import-object.c -@@ -55,6 +55,7 @@ - #endif - - #include -+#include - #include - #include - #include -@@ -201,6 +202,7 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, - CK_ATTRIBUTE attr_encrypt = { CKA_ENCRYPT, &tval, sizeof (tval) }; - CK_ATTRIBUTE attr_modulus = { CKA_MODULUS, }; - CK_ATTRIBUTE attr_exponent = { CKA_PUBLIC_EXPONENT, }; -+ size_t len = 0; - - pubkey = p11_asn1_read (info, "subjectPublicKey", &pubkey_len); - if (pubkey == NULL) { -@@ -220,17 +222,31 @@ add_attrs_pubkey_rsa (CK_ATTRIBUTE *attrs, - goto cleanup; - } - -- attr_modulus.pValue = p11_asn1_read (asn, "modulus", &attr_modulus.ulValueLen); -+ attr_modulus.pValue = p11_asn1_read (asn, "modulus", &len); - if (attr_modulus.pValue == NULL) { - p11_message (_("failed to obtain modulus")); - goto cleanup; - } -+#if ULONG_MAX < SIZE_MAX -+ if (len > ULONG_MAX) { -+ p11_message (_("failed to obtain modulus")); -+ goto cleanup; -+ } -+#endif -+ attr_modulus.ulValueLen = len; - -- attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &attr_exponent.ulValueLen); -+ attr_exponent.pValue = p11_asn1_read (asn, "publicExponent", &len); - if (attr_exponent.pValue == NULL) { - p11_message (_("failed to obtain exponent")); - goto cleanup; - } -+#if ULONG_MAX < SIZE_MAX -+ if (len > ULONG_MAX) { -+ p11_message (_("failed to obtain exponent")); -+ goto cleanup; -+ } -+#endif -+ attr_exponent.ulValueLen = len; - - result = p11_attrs_build (attrs, &attr_key_type, &attr_encrypt, &attr_modulus, &attr_exponent, NULL); - if (result == NULL) { -@@ -260,12 +276,20 @@ add_attrs_pubkey_ec (CK_ATTRIBUTE *attrs, - CK_ATTRIBUTE attr_key_type = { CKA_KEY_TYPE, &key_type, sizeof (key_type) }; - CK_ATTRIBUTE attr_ec_params = { CKA_EC_PARAMS, }; - CK_ATTRIBUTE attr_ec_point = { CKA_EC_POINT, }; -+ size_t len = 0; - -- attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &attr_ec_params.ulValueLen); -+ attr_ec_params.pValue = p11_asn1_read (info, "algorithm.parameters", &len); - if (attr_ec_params.pValue == NULL) { - p11_message (_("failed to obtain EC parameters")); - goto cleanup; - } -+#if ULONG_MAX < SIZE_MAX -+ if (len > ULONG_MAX) { -+ p11_message (_("failed to obtain EC parameters")); -+ goto cleanup; -+ } -+#endif -+ attr_ec_params.ulValueLen = len; - - /* subjectPublicKey is read as BIT STRING value which contains - * EC point data. We need to DER encode this data as OCTET STRING. --- -2.43.0 - diff --git a/p11-kit.spec b/p11-kit.spec index b268309..012a4b2 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.25.3 +Version: 0.25.5 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -11,7 +11,6 @@ Source1: https://github.com/p11-glue/p11-kit/releases/download/%{version} Source2: https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyring.gpg Source3: trust-extract-compat Source4: p11-kit-client.service -Patch: p11-kit-0.25.3-import-object.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 diff --git a/sources b/sources index ca61d94..bed7eca 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.3.tar.xz) = ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c -SHA512 (p11-kit-0.25.3.tar.xz.sig) = 189a40b12e40818daff4aa6869d7e0fa342a42f3901d85fc52bb40f7023bb17790967be5ab9a183473fe8bb3e335a0d4d8c2b6345ccf811e90f8495009c085b8 +SHA512 (p11-kit-0.25.5.tar.xz) = 177ec6ff5eb891901078306dce2bf3f5c1a0e5c2a8c493bdf5a08ae1ff1240fdf6952961e973c373f80ac3d1d5a9927e07f4da49e4ff92269d992e744889fc94 +SHA512 (p11-kit-0.25.5.tar.xz.sig) = 2be5aa4ccbb889e32aed88fc1f7926c3ccaadc90cc6b15a187358c812eee4ce1712068d1f271766ac51366112c0619aad46cff345ed2edd009fb2fe7fb804493 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From b64d63776753734bc3dff3fdd7df2092026ecd6f Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 4 Jul 2024 10:51:08 +0000 Subject: [PATCH 14/25] Update to 0.25.5 upstream release Upstream tag: 0.25.5 Upstream commit: 0dd11336 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ README.packit | 2 +- p11-kit.spec | 4 ++-- sources | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7b351bd..6db1df5 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ /p11-kit-0.25.2.tar.xz.sig /p11-kit-0.25.3.tar.xz /p11-kit-0.25.3.tar.xz.sig +/p11-kit-0.25.5.tar.xz +/p11-kit-0.25.5.tar.xz.sig diff --git a/README.packit b/README.packit index b6ea2f6..f2be23e 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.85.0.post1.dev17+g1f3036b1. +The file was generated using packit 0.97.3.post1.dev7+g1954e49a. diff --git a/p11-kit.spec b/p11-kit.spec index 866be52..012a4b2 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,5 +1,5 @@ # This spec file has been automatically updated -Version: 0.25.3 +Version: 0.25.5 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -19,7 +19,7 @@ BuildRequires: gettext BuildRequires: gtk-doc BuildRequires: meson BuildRequires: systemd-devel -BuildRequires: bash-completion +BuildRequires: pkgconfig(bash-completion) # Work around for https://bugzilla.redhat.com/show_bug.cgi?id=1497147 # Remove this once it is fixed BuildRequires: pkgconfig(glib-2.0) diff --git a/sources b/sources index ca61d94..bed7eca 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.3.tar.xz) = ad2d393bf122526cbba18dc9d5a13f2c1cad7d70125ec90ffd02059dfa5ef30ac59dfc0bb9bc6380c8f317e207c9e87e895f1945634f56ddf910c2958868fb4c -SHA512 (p11-kit-0.25.3.tar.xz.sig) = 189a40b12e40818daff4aa6869d7e0fa342a42f3901d85fc52bb40f7023bb17790967be5ab9a183473fe8bb3e335a0d4d8c2b6345ccf811e90f8495009c085b8 +SHA512 (p11-kit-0.25.5.tar.xz) = 177ec6ff5eb891901078306dce2bf3f5c1a0e5c2a8c493bdf5a08ae1ff1240fdf6952961e973c373f80ac3d1d5a9927e07f4da49e4ff92269d992e744889fc94 +SHA512 (p11-kit-0.25.5.tar.xz.sig) = 2be5aa4ccbb889e32aed88fc1f7926c3ccaadc90cc6b15a187358c812eee4ce1712068d1f271766ac51366112c0619aad46cff345ed2edd009fb2fe7fb804493 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From 89bca1f9d6285a0b186ca7be4be860cff191dd77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 12 Jul 2024 14:44:23 +0200 Subject: [PATCH 15/25] Call alternatives without full path As part of https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin, alternatives is moved from /usr/sbin/alternatives to /usr/bin/alternatives. (This happened when alternatives rpm was rebuilt in a build environment with the updated definitions.) On traditional systems a compat symlink is created, so both paths work. This means that packages that use paths into /usr/sbin do not need to be rebuilt and will continue to work fine. Unfortunately, on ostree systems, the compat symlinks are missing, so calls to /usr/sbin/alternatives fail. In addition, when _this_ package will be rebuilt in an environment with the updated definitions, its script will try to call /usr/bin/alternatives, which in turn will not work on systems with an older build of alternatives, where only /usr/sbin/alternatives exists, but not /usr/bin/alternatives, and /usr/sbin is not a symlink to /usr/bin. There is no reason for or benefit from specifying the full path to binaries in scriptlets because the scriptlets are called with a well-defined $PATH. So drop the full path, so that the package works fine no matter where exactly alternatives is installed. --- p11-kit.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index 012a4b2..d93e173 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -100,12 +100,12 @@ install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_userunitdir} %post trust -%{_sbindir}/alternatives --install %{_libdir}/libnssckbi.so %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30 +alternatives --install %{_libdir}/libnssckbi.so %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30 %postun trust if [ $1 -eq 0 ] ; then # package removal - %{_sbindir}/alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so + alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so fi From 1c9cf0a627a7097f805c73364a9820da1415d3de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 21:16:09 +0000 Subject: [PATCH 16/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 8a8660a738f8a5461aeb603b8ecfcef82bcfc97f Mon Sep 17 00:00:00 2001 From: Zoltan Fridrich Date: Tue, 8 Oct 2024 11:07:04 +0200 Subject: [PATCH 17/25] Integrate mingw-p11-kit into spec file Signed-off-by: Zoltan Fridrich --- p11-kit.spec | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 101 insertions(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index d93e173..79996ed 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -1,4 +1,11 @@ # This spec file has been automatically updated +%if 0%{?fedora} +%bcond_without mingw +%else +%bcond_with mingw +%endif + + Version: 0.25.5 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit @@ -27,6 +34,23 @@ BuildRequires: pkgconfig(systemd) BuildRequires: gnupg2 BuildRequires: /usr/bin/xsltproc +%if %{with mingw} +BuildRequires: ninja-build + +BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-gcc +BuildRequires: mingw32-binutils +BuildRequires: mingw32-libffi +BuildRequires: mingw32-libtasn1 + +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-gcc +BuildRequires: mingw64-binutils +BuildRequires: mingw64-libffi +BuildRequires: mingw64-libtasn1 +%endif + + %description p11-kit provides a way to load and enumerate PKCS#11 modules, as well as a standard configuration setup for installing PKCS#11 modules in @@ -64,6 +88,33 @@ export PKCS#11 modules through a Unix domain socket. Note that this feature is still experimental. +%if %{with mingw} +%package -n mingw32-%{name} +Summary: MinGW Library for loading and sharing PKCS#11 modules +Requires: pkgconfig +BuildArch: noarch + +%description -n mingw32-%{name} +p11-kit provides a way to load and enumerate PKCS#11 modules, as well as +a standard configuration setup for installing PKCS#11 modules in such a +way that they're discoverable. This library is cross-compiled for MinGW. + + +%package -n mingw64-%{name} +Summary: MinGW Library for loading and sharing PKCS#11 modules +Requires: pkgconfig +BuildArch: noarch + +%description -n mingw64-%{name} +p11-kit provides a way to load and enumerate PKCS#11 modules, as well as +a standard configuration setup for installing PKCS#11 modules in such a +way that they're discoverable. This library is cross-compiled for MinGW. + + +%{?mingw_debug_package} +%endif + + # solution taken from icedtea-web.spec %define multilib_arches ppc64 sparc64 x86_64 ppc64le %ifarch %{multilib_arches} @@ -79,11 +130,16 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %autosetup -p1 %build -# These paths are the source paths that come from the plan here: +# These paths are the source paths that come from the plan here: # https://fedoraproject.org/wiki/Features/SharedSystemCertificates:SubTasks %meson -Dgtk_doc=true -Dman=true -Dtrust_paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source %meson_build +%if %{with mingw} +%mingw_meson -Dgtk_doc=false -Dman=false -Dnls=false -Dtrust_paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source +%mingw_ninja +%endif + %install %meson_install mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/modules @@ -95,6 +151,12 @@ mkdir -p $RPM_BUILD_ROOT%{_userunitdir} install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_userunitdir} %find_lang %{name} +%if %{with mingw} +%mingw_ninja_install + +%{?mingw_debug_install_post} +%endif + %check %meson_test @@ -150,6 +212,44 @@ fi %{_userunitdir}/p11-kit-server.service %{_userunitdir}/p11-kit-server.socket +%if %{with mingw} +%files -n mingw32-%{name} +%{!?_licensedir:%global license %%doc} +%license COPYING +%{mingw32_bindir}/libp11-kit-0.dll +%{mingw32_bindir}/p11-kit.exe +%{mingw32_bindir}/trust.exe +%{mingw32_libdir}/libp11-kit.dll.a +%dir %{mingw32_libdir}/pkcs11/ +%{mingw32_libdir}/pkcs11/p11-kit-trust.dll +%{mingw32_libdir}/pkcs11/p11-kit-trust.dll.a +%{mingw32_libdir}/pkgconfig/p11-kit-1.pc +%dir %{mingw32_libexecdir}/p11-kit/ +%{mingw32_libexecdir}/p11-kit/*.exe +%{mingw32_libexecdir}/p11-kit/trust-extract-compat +%{mingw32_includedir}/p11-kit-1/ +%{mingw32_datadir}/p11-kit/ +%{mingw32_sysconfdir}/pkcs11/ + +%files -n mingw64-%{name} +%{!?_licensedir:%global license %%doc} +%license COPYING +%{mingw64_bindir}/libp11-kit-0.dll +%{mingw64_bindir}/p11-kit.exe +%{mingw64_bindir}/trust.exe +%{mingw64_libdir}/libp11-kit.dll.a +%dir %{mingw64_libdir}/pkcs11/ +%{mingw64_libdir}/pkcs11/p11-kit-trust.dll +%{mingw64_libdir}/pkcs11/p11-kit-trust.dll.a +%{mingw64_libdir}/pkgconfig/p11-kit-1.pc +%dir %{mingw64_libexecdir}/p11-kit/ +%{mingw64_libexecdir}/p11-kit/*.exe +%{mingw64_libexecdir}/p11-kit/trust-extract-compat +%{mingw64_includedir}/p11-kit-1/ +%{mingw64_datadir}/p11-kit/ +%{mingw64_sysconfdir}/pkcs11/ +%endif + %changelog %autochangelog From b4943bcb3d5f3eadfbc9d36a268e1fe69f925487 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 22:08:21 +0000 Subject: [PATCH 18/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From a8fa1a940d8b2b5a3c8ce4e3cdd22b5d265de383 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 5 May 2025 18:00:32 +0200 Subject: [PATCH 19/25] Fix the MingGW build with GCC 15.1.1 Otherwise, it leads to: [22/338] Compiling C object common/libp11-library.a.p/library.c.obj FAILED: common/libp11-library.a.p/library.c.obj i686-w64-mingw32-gcc -Icommon/libp11-library.a.p -Icommon -I../common -I. -I.. -fvisibility=hidden -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -O0 -g -D_GNU_SOURCE -DP11_KIT_FUTURE_UNSTABLE_API -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -MD -MQ common/libp11-library.a.p/library.c.obj -MF common/libp11-library.a.p/library.c.obj.d -o common/libp11-library.a.p/library.c.obj -c ../common/library.c ../common/library.c:208:27: error: expected identifier or '(' before '=' token 208 | static DWORD thread_local = TLS_OUT_OF_INDEXES; | ^ ../common/library.c: In function '_p11_library_get_thread_local': ../common/library.c:217:26: error: expected identifier or '(' before '==' token 217 | if (thread_local == TLS_OUT_OF_INDEXES) | ^~ ../common/library.c:217:13: error: declaration in the controlling expression must have an initializer 217 | if (thread_local == TLS_OUT_OF_INDEXES) | ^~~~~~~~~~~~ ../common/library.c:220:29: error: expected expression before 'thread_local' 220 | data = TlsGetValue (thread_local); | ^~~~~~~~~~~~ ../common/library.c:223:30: error: expected expression before 'thread_local' 223 | TlsSetValue (thread_local, data); | ^~~~~~~~~~~~ ../common/library.c:223:17: error: too few arguments to function 'TlsSetValue'; expected 2, have 1 223 | TlsSetValue (thread_local, data); | ^~~~~~~~~~~ https://src.fedoraproject.org/rpms/p11-kit/pull-request/54 --- p11-kit-0.25.6-thread-local-var.patch | 134 ++++++++++++++++++++++++++ p11-kit.spec | 3 + 2 files changed, 137 insertions(+) create mode 100644 p11-kit-0.25.6-thread-local-var.patch diff --git a/p11-kit-0.25.6-thread-local-var.patch b/p11-kit-0.25.6-thread-local-var.patch new file mode 100644 index 0000000..77acdbc --- /dev/null +++ b/p11-kit-0.25.6-thread-local-var.patch @@ -0,0 +1,134 @@ +From fd7ad3969f68ea24e54d242a08b089039555f7bb Mon Sep 17 00:00:00 2001 +From: Brecht Sanders +Date: Tue, 31 Dec 2024 16:28:31 +0100 +Subject: [PATCH] avoid using already defined thread_local as variable name + +Building p11-kit 0.25.5 with GCC15 on MinGW-w64 failed because `thread_local` is already defined for this platform. + +Resolved by changing the variable name from `thread_local` to `threadlocal`. +--- + common/library.c | 36 ++++++++++++++++++------------------ + 1 file changed, 18 insertions(+), 18 deletions(-) + +diff --git a/common/library.c b/common/library.c +index 1581702b62db..723b05f33699 100644 +--- a/common/library.c ++++ b/common/library.c +@@ -124,7 +124,7 @@ _p11_library_get_thread_local (void) + return &local; + } + #else +-static pthread_key_t thread_local = 0; ++static pthread_key_t threadlocal = 0; + + static p11_local * + _p11_library_get_thread_local (void) +@@ -133,10 +133,10 @@ _p11_library_get_thread_local (void) + + p11_library_init_once (); + +- local = pthread_getspecific (thread_local); ++ local = pthread_getspecific (threadlocal); + if (local == NULL) { + local = calloc (1, sizeof (p11_local)); +- pthread_setspecific (thread_local, local); ++ pthread_setspecific (threadlocal, local); + } + + return local; +@@ -158,7 +158,7 @@ p11_library_init_impl (void) + P11_RECURSIVE_MUTEX_INIT (p11_library_mutex); + P11_RECURSIVE_MUTEX_INIT (p11_virtual_mutex); + #ifndef P11_TLS_KEYWORD +- pthread_key_create (&thread_local, free); ++ pthread_key_create (&threadlocal, free); + #endif + p11_message_storage = thread_local_message; + #ifdef HAVE_STRERROR_L +@@ -181,8 +181,8 @@ p11_library_uninit (void) + + #ifndef P11_TLS_KEYWORD + /* Some cleanup to pacify valgrind */ +- free (pthread_getspecific (thread_local)); +- pthread_setspecific (thread_local, NULL); ++ free (pthread_getspecific (threadlocal)); ++ pthread_setspecific (threadlocal, NULL); + #endif + + #ifdef HAVE_STRERROR_L +@@ -191,7 +191,7 @@ p11_library_uninit (void) + #endif + p11_message_storage = dont_store_message; + #ifndef P11_TLS_KEYWORD +- pthread_key_delete (thread_local); ++ pthread_key_delete (threadlocal); + #endif + p11_mutex_uninit (&p11_virtual_mutex); + p11_mutex_uninit (&p11_library_mutex); +@@ -205,7 +205,7 @@ p11_library_uninit (void) + + #ifdef OS_WIN32 + +-static DWORD thread_local = TLS_OUT_OF_INDEXES; ++static DWORD threadlocal = TLS_OUT_OF_INDEXES; + + BOOL WINAPI DllMain (HINSTANCE, DWORD, LPVOID); + +@@ -214,13 +214,13 @@ _p11_library_get_thread_local (void) + { + LPVOID data; + +- if (thread_local == TLS_OUT_OF_INDEXES) ++ if (threadlocal == TLS_OUT_OF_INDEXES) + return NULL; + +- data = TlsGetValue (thread_local); ++ data = TlsGetValue (threadlocal); + if (data == NULL) { + data = LocalAlloc (LPTR, sizeof (p11_local)); +- TlsSetValue (thread_local, data); ++ TlsSetValue (threadlocal, data); + } + + return (p11_local *)data; +@@ -233,8 +233,8 @@ p11_library_init (void) + p11_debug ("initializing library"); + P11_RECURSIVE_MUTEX_INIT (p11_library_mutex); + P11_RECURSIVE_MUTEX_INIT (p11_virtual_mutex); +- thread_local = TlsAlloc (); +- if (thread_local == TLS_OUT_OF_INDEXES) ++ threadlocal = TlsAlloc (); ++ if (threadlocal == TLS_OUT_OF_INDEXES) + p11_debug ("couldn't setup tls"); + else + p11_message_storage = thread_local_message; +@@ -244,9 +244,9 @@ void + p11_library_thread_cleanup (void) + { + p11_local *local; +- if (thread_local != TLS_OUT_OF_INDEXES) { ++ if (threadlocal != TLS_OUT_OF_INDEXES) { + p11_debug ("thread stopped, freeing tls"); +- local = TlsGetValue (thread_local); ++ local = TlsGetValue (threadlocal); + LocalFree (local); + } + } +@@ -258,11 +258,11 @@ p11_library_uninit (void) + + uninit_common (); + +- if (thread_local != TLS_OUT_OF_INDEXES) { ++ if (threadlocal != TLS_OUT_OF_INDEXES) { + p11_message_storage = dont_store_message; +- data = TlsGetValue (thread_local); ++ data = TlsGetValue (threadlocal); + LocalFree (data); +- TlsFree (thread_local); ++ TlsFree (threadlocal); + } + p11_mutex_uninit (&p11_virtual_mutex); + p11_mutex_uninit (&p11_library_mutex); +-- +2.49.0 + diff --git a/p11-kit.spec b/p11-kit.spec index 79996ed..414078d 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -19,6 +19,9 @@ Source2: https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyr Source3: trust-extract-compat Source4: p11-kit-client.service +# https://github.com/p11-glue/p11-kit/pull/667 +Patch0: p11-kit-0.25.6-thread-local-var.patch + BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel From 509127e98c97aaecc3cdffca3bf426fe4bf7a7cb Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 5 May 2025 16:00:04 +0200 Subject: [PATCH 20/25] Move ownership of %{_libdir}/pkcs11 to the main package Commit 35e6a9531992aea8 made the 'trust' sub-package own the %{_libdir}/pkcs11 directory at a time when p11-kit-trust.so was the only PKCS#11 module being shipped by p11-kit. Since then, commit 7c8cb4503293e46e or p11-kit-0.23.4 introduced the p11-kit-client.so module. It was initially part of the main package, until was split into its own sub-package in commit adb7cbe63f623521. Even though it doesn't depend directly on the 'trust' module, it depended on it to own the %{_libdir}/pkcs11 directory. It will be better if the main package owns the %{_libdir}/pkcs11 directory, just like it already owns %{_sysconfdir}/pkcs11, so that the directory doesn't have to be separately owned by multiple sub-packages. https://src.fedoraproject.org/rpms/p11-kit/pull-request/53 --- p11-kit.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/p11-kit.spec b/p11-kit.spec index 414078d..79e6d5a 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -183,6 +183,7 @@ fi %dir %{_sysconfdir}/pkcs11/modules %dir %{_datadir}/p11-kit %dir %{_datadir}/p11-kit/modules +%dir %{_libdir}/pkcs11 %dir %{_libexecdir}/p11-kit %{_bindir}/p11-kit %{_libdir}/libp11-kit.so.* @@ -201,7 +202,6 @@ fi %files trust %{_bindir}/trust -%dir %{_libdir}/pkcs11 %ghost %{_libdir}/libnssckbi.so %{_libdir}/pkcs11/p11-kit-trust.so %{_datadir}/p11-kit/modules/p11-kit-trust.module From 27179e46de3720b075db0305ed9c8c8f50a9eab2 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Mon, 5 May 2025 16:01:08 +0200 Subject: [PATCH 21/25] Split p11-kit-client.so into a separate sub-package Strictly speaking, the same container or machine doesn't need to have both the p11-kit-client.so module and the p11-kit-server executable. eg., Flatpak and Toolbx need only the p11-kit-server executable to be present on the host machine, and need only the p11-kit-client.so module inside the container. Therefore, splitting the 'server' sub-package [1] will avoid having unexpected content in containers and machines. A Release number of 8 was chosen for the Version-Release tuple in 'Obsoletes', because that will be the Release number of this commit according to %{autorelease}: $ rpmautospec calculate-release Calculated release number: 8 [1] https://docs.fedoraproject.org/en-US/packaging-guidelines/#_one_to_many_replacement https://src.fedoraproject.org/rpms/p11-kit/pull-request/53 --- p11-kit.spec | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/p11-kit.spec b/p11-kit.spec index 79e6d5a..f8e566a 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -60,6 +60,17 @@ as a standard configuration setup for installing PKCS#11 modules in such a way that they're discoverable. +%package client +Summary: Client module from %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-server < 0.25.5-8 + +%description client +The %{name}-client package contains a PKCS#11 module that enables +accessing other PKCS#11 modules over a Unix domain socket. Note that +this feature is still experimental. + + %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -82,8 +93,9 @@ contains certificate anchors and blocklists. %package server -Summary: Server and client commands for %{name} +Summary: Server command for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: %{name}-server < 0.25.5-8 %description server The %{name}-server package contains command line tools that enable to @@ -194,6 +206,10 @@ fi %{_mandir}/man5/pkcs11.conf.5.gz %{_datadir}/bash-completion/completions/p11-kit +%files client +%{_libdir}/pkcs11/p11-kit-client.so +%{_userunitdir}/p11-kit-client.service + %files devel %{_includedir}/p11-kit-1/ %{_libdir}/libp11-kit.so @@ -209,8 +225,6 @@ fi %{_datadir}/bash-completion/completions/trust %files server -%{_libdir}/pkcs11/p11-kit-client.so -%{_userunitdir}/p11-kit-client.service %{_libexecdir}/p11-kit/p11-kit-server %{_userunitdir}/p11-kit-server.service %{_userunitdir}/p11-kit-server.socket From 44c46c2705f867b61091d0e7df1cab7e3380d2e3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 23:50:34 +0000 Subject: [PATCH 22/25] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 8a33186b2fc7f20dbfb2d452b9724071619bb786 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Wed, 3 Sep 2025 18:33:50 +0900 Subject: [PATCH 23/25] rpc: Fix empty array attribute handling Signed-off-by: Daiki Ueno --- p11-kit-0.25.5-rpc-empty.patch | 62 ++++++++++++++++++++++++++++++++++ p11-kit.spec | 2 ++ 2 files changed, 64 insertions(+) create mode 100644 p11-kit-0.25.5-rpc-empty.patch diff --git a/p11-kit-0.25.5-rpc-empty.patch b/p11-kit-0.25.5-rpc-empty.patch new file mode 100644 index 0000000..63709dc --- /dev/null +++ b/p11-kit-0.25.5-rpc-empty.patch @@ -0,0 +1,62 @@ +From e94c1fb907546faafb3509615943776d1ea37eb8 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Wed, 3 Sep 2025 17:10:21 +0900 +Subject: [PATCH] rpc: Fix empty array attribute handling + +When an empty array attribute is exchanged at the RPC level, the +client previously sent the number of elements (= 0) even if it's +empty, while the server doesn't expect it. This fixes the client to +not send it. + +Signed-off-by: Daiki Ueno +--- + p11-kit/rpc-message.c | 2 +- + p11-kit/test-mock.c | 12 ++++++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/p11-kit/rpc-message.c b/p11-kit/rpc-message.c +index 049417f..5eaea61 100644 +--- a/p11-kit/rpc-message.c ++++ b/p11-kit/rpc-message.c +@@ -266,7 +266,7 @@ p11_rpc_message_write_attribute_buffer_array (p11_rpc_message *msg, + /* And the attribute buffer length */ + p11_rpc_buffer_add_uint32 (msg->output, attr->pValue ? attr->ulValueLen : 0); + +- if (IS_ATTRIBUTE_ARRAY (attr)) ++ if (attr->pValue && IS_ATTRIBUTE_ARRAY (attr)) + p11_rpc_message_write_attribute_buffer_array ( + msg, attr->pValue, + attr->ulValueLen / sizeof (CK_ATTRIBUTE)); +diff --git a/p11-kit/test-mock.c b/p11-kit/test-mock.c +index b117b92..f174015 100644 +--- a/p11-kit/test-mock.c ++++ b/p11-kit/test-mock.c +@@ -624,6 +624,12 @@ test_get_wrap_template (void) + { CKA_WRAP_TEMPLATE, temp, sizeof (temp) }, + }; + CK_ULONG n_attrs = sizeof (attrs) / sizeof (attrs[0]); ++ CK_OBJECT_CLASS klass = -1ul; ++ CK_ATTRIBUTE attrs_empty_template[] = { ++ { CKA_WRAP_TEMPLATE, NULL, 0 }, ++ { CKA_UNWRAP_TEMPLATE, NULL, 0 }, ++ }; ++ CK_ULONG n_attrs_empty_template = sizeof(attrs_empty_template) / sizeof(attrs_empty_template[0]); + + module = setup_mock_module (&session); + +@@ -664,6 +670,12 @@ test_get_wrap_template (void) + assert (verify == CK_TRUE); + assert (encrypt == CK_TRUE); + ++ rv = (module->C_GetAttributeValue) (session, MOCK_PUBLIC_KEY_CAPITALIZE, attrs_empty_template, n_attrs_empty_template); ++ assert (rv == CKR_ATTRIBUTE_TYPE_INVALID); ++ assert_num_eq (attrs_empty_template[0].type, CKA_WRAP_TEMPLATE); ++ assert_ptr_eq (attrs_empty_template[0].pValue, NULL); ++ assert_num_eq (attrs_empty_template[0].ulValueLen, (CK_ULONG)-1); ++ + teardown_mock_module (module); + } + +-- +2.50.1 + diff --git a/p11-kit.spec b/p11-kit.spec index f8e566a..e6ddd55 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -21,6 +21,8 @@ Source4: p11-kit-client.service # https://github.com/p11-glue/p11-kit/pull/667 Patch0: p11-kit-0.25.6-thread-local-var.patch +# https://github.com/p11-glue/p11-kit/pull/704 +Patch1: p11-kit-0.25.5-rpc-empty.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 From 6d11b1e9cb18f535cd43880752de3f0b6ab78699 Mon Sep 17 00:00:00 2001 From: Packit Date: Tue, 9 Sep 2025 12:57:59 +0000 Subject: [PATCH 24/25] Update to 0.25.6 upstream release - Resolves: rhbz#2394061 Upstream tag: 0.25.6 Upstream commit: 4f821372 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ README.packit | 2 +- p11-kit-0.25.6-packaging.patch | 18 ++++++++++++++++++ p11-kit.spec | 7 ++----- sources | 4 ++-- 5 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 p11-kit-0.25.6-packaging.patch diff --git a/.gitignore b/.gitignore index 6db1df5..78c0a93 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,5 @@ /p11-kit-0.25.3.tar.xz.sig /p11-kit-0.25.5.tar.xz /p11-kit-0.25.5.tar.xz.sig +/p11-kit-0.25.6.tar.xz +/p11-kit-0.25.6.tar.xz.sig diff --git a/README.packit b/README.packit index f2be23e..fb341a1 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.97.3.post1.dev7+g1954e49a. +The file was generated using packit 1.11.0.post1.dev7+gfdcdf3a32. diff --git a/p11-kit-0.25.6-packaging.patch b/p11-kit-0.25.6-packaging.patch new file mode 100644 index 0000000..aee2dd8 --- /dev/null +++ b/p11-kit-0.25.6-packaging.patch @@ -0,0 +1,18 @@ +diff --git a/meson.build b/meson.build +index ab28396..b5829ca 100644 +--- a/meson.build ++++ b/meson.build +@@ -459,6 +459,7 @@ with_systemd = false + systemd = dependency('systemd', required: get_option('systemd')) + if systemd.found() + systemduserunitdir = systemd.get_variable(pkgconfig : 'systemduserunitdir') ++ with_systemd = true + endif + + configure_file(output: 'config.h', configuration: conf) +@@ -488,4 +489,4 @@ if get_option('nls') + subdir('po') + endif + subdir('bash-completion') +-subdir('zsh-completion') ++# subdir('zsh-completion') diff --git a/p11-kit.spec b/p11-kit.spec index e6ddd55..1ffa8c4 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -6,7 +6,7 @@ %endif -Version: 0.25.5 +Version: 0.25.6 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -19,10 +19,7 @@ Source2: https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyr Source3: trust-extract-compat Source4: p11-kit-client.service -# https://github.com/p11-glue/p11-kit/pull/667 -Patch0: p11-kit-0.25.6-thread-local-var.patch -# https://github.com/p11-glue/p11-kit/pull/704 -Patch1: p11-kit-0.25.5-rpc-empty.patch +Patch: p11-kit-0.25.6-packaging.patch BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 diff --git a/sources b/sources index bed7eca..c7c1c77 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.5.tar.xz) = 177ec6ff5eb891901078306dce2bf3f5c1a0e5c2a8c493bdf5a08ae1ff1240fdf6952961e973c373f80ac3d1d5a9927e07f4da49e4ff92269d992e744889fc94 -SHA512 (p11-kit-0.25.5.tar.xz.sig) = 2be5aa4ccbb889e32aed88fc1f7926c3ccaadc90cc6b15a187358c812eee4ce1712068d1f271766ac51366112c0619aad46cff345ed2edd009fb2fe7fb804493 +SHA512 (p11-kit-0.25.6.tar.xz) = 71b5b83f0f241a28db66dcb940690ee6d23bbeebdd7d3f6772f1f444e2410c3b6e00f6a2530baef639816e4e05fe2189d340dae7c688f0d751c423c51d20ef16 +SHA512 (p11-kit-0.25.6.tar.xz.sig) = 99d06ee64de815bcb4e6bd861f2e11940103896f87b206b9ae221b91f706dc810fef7e7f5341570b8c447093e34defa8918693b1e14c8659aab1cd1d65768fb7 SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881 From a33bf8feb91135889310ccdcd5633611501600bc Mon Sep 17 00:00:00 2001 From: Packit Date: Sat, 13 Sep 2025 00:47:23 +0000 Subject: [PATCH 25/25] Update to 0.25.8 upstream release Upstream tag: 0.25.8 Upstream commit: 2ee61264 Commit authored by Packit automation (https://packit.dev/) --- .gitignore | 2 ++ p11-kit.spec | 8 ++++---- sources | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 78c0a93..dfb8ab3 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ /p11-kit-0.25.5.tar.xz.sig /p11-kit-0.25.6.tar.xz /p11-kit-0.25.6.tar.xz.sig +/p11-kit-0.25.8.tar.xz +/p11-kit-0.25.8.tar.xz.sig diff --git a/p11-kit.spec b/p11-kit.spec index 1ffa8c4..3dc3568 100644 --- a/p11-kit.spec +++ b/p11-kit.spec @@ -6,7 +6,7 @@ %endif -Version: 0.25.6 +Version: 0.25.8 Release: %{?autorelease}%{!?autorelease:1%{?dist}} Name: p11-kit Summary: Library for loading and sharing PKCS#11 modules @@ -19,8 +19,6 @@ Source2: https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyr Source3: trust-extract-compat Source4: p11-kit-client.service -Patch: p11-kit-0.25.6-packaging.patch - BuildRequires: gcc BuildRequires: libtasn1-devel >= 2.3 BuildRequires: libffi-devel @@ -150,7 +148,7 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0} %meson_build %if %{with mingw} -%mingw_meson -Dgtk_doc=false -Dman=false -Dnls=false -Dtrust_paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source +%mingw_meson -Dgtk_doc=false -Dman=false -Dnls=false -Dtrust_paths=%{_sysconfdir}/pki/ca-trust/source:%{_datadir}/pki/ca-trust-source -Dzsh_completion=disabled %mingw_ninja %endif @@ -204,6 +202,7 @@ fi %{_mandir}/man8/p11-kit.8.gz %{_mandir}/man5/pkcs11.conf.5.gz %{_datadir}/bash-completion/completions/p11-kit +%{_datadir}/zsh/site-functions/_p11-kit %files client %{_libdir}/pkcs11/p11-kit-client.so @@ -222,6 +221,7 @@ fi %{_datadir}/p11-kit/modules/p11-kit-trust.module %{_libexecdir}/p11-kit/trust-extract-compat %{_datadir}/bash-completion/completions/trust +%{_datadir}/zsh/site-functions/_trust %files server %{_libexecdir}/p11-kit/p11-kit-server diff --git a/sources b/sources index c7c1c77..418f67a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (p11-kit-0.25.6.tar.xz) = 71b5b83f0f241a28db66dcb940690ee6d23bbeebdd7d3f6772f1f444e2410c3b6e00f6a2530baef639816e4e05fe2189d340dae7c688f0d751c423c51d20ef16 -SHA512 (p11-kit-0.25.6.tar.xz.sig) = 99d06ee64de815bcb4e6bd861f2e11940103896f87b206b9ae221b91f706dc810fef7e7f5341570b8c447093e34defa8918693b1e14c8659aab1cd1d65768fb7 +SHA512 (p11-kit-0.25.8.tar.xz) = 4a3852459a4a5e4ea71eea5d23ef74deeb51c66b28d095be30a263f10d1f47853341f8628eb0c43c88247503059a4c1f67017965a70cd3c7df31d86e458a8162 +SHA512 (p11-kit-0.25.8.tar.xz.sig) = 97f47324cd7578833b751ab1fee55a9a538ba94b52ec4729249a9e5494c60cceef6c60999b495299f2b9ae0d0cda60d5db713d82e0b7991112b7b4b46ad46d1d SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881