From 624c03fe04ae84b176f44664ec4ea937c633f342 Mon Sep 17 00:00:00 2001
From: Zoltan Fridrich <zfridric@redhat.com>
Date: Wed, 8 Nov 2023 10:50:32 +0100
Subject: [PATCH] Rebase to 0.25.2

---
 .gitignore        |  3 +++
 .p11-kit.metadata |  3 +++
 p11-kit.spec      | 24 +++++++++++++++---------
 sources           |  6 +++---
 4 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 .p11-kit.metadata

diff --git a/.gitignore b/.gitignore
index e8cc4cd..c05f14c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,6 @@
 /gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg
 /p11-kit-0.24.1.tar.xz
 /p11-kit-0.24.1.tar.xz.sig
+/p11-kit-0.25.2.tar.xz
+/p11-kit-0.25.2.tar.xz.sig
+/p11-kit-release-keyring.gpg
diff --git a/.p11-kit.metadata b/.p11-kit.metadata
new file mode 100644
index 0000000..04bb77c
--- /dev/null
+++ b/.p11-kit.metadata
@@ -0,0 +1,3 @@
+6fecd5be3ee12d07f6f61a65e18523ee03e0f925 p11-kit-release-keyring.gpg
+81087d58d7f150f5573ed79c9aa7d613652ae5a3 p11-kit-0.25.2.tar.xz
+1fe218289b0e01c98a4e5610cec46e88ea4807f5 p11-kit-0.25.2.tar.xz.sig
diff --git a/p11-kit.spec b/p11-kit.spec
index 122f870..14ce7da 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -1,14 +1,14 @@
 # This spec file has been automatically updated
-Version:	0.24.1
-Release: 2%{?dist}
+Version:        0.25.2
+Release:        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
-Source2:        gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg
+Source2:        https://p11-glue.github.io/p11-glue/p11-kit/p11-kit-release-keyring.gpg
 Source3:        trust-extract-compat
 Source4:        p11-kit-client.service
 
@@ -23,6 +23,7 @@ BuildRequires:  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)
+BuildRequires:  pkgconfig(systemd)
 BuildRequires:  gnupg2
 BuildRequires:  /usr/bin/xsltproc
 
@@ -44,8 +45,8 @@ developing applications that use %{name}.
 %package trust
 Summary:            System trust module from %{name}
 Requires:           %{name}%{?_isa} = %{version}-%{release}
-Requires(post):     %{_sbindir}/update-alternatives
-Requires(postun):   %{_sbindir}/update-alternatives
+Requires(post):     %{_sbindir}/alternatives
+Requires(postun):   %{_sbindir}/alternatives
 Conflicts:          nss < 3.14.3-9
 
 %description trust
@@ -99,13 +100,12 @@ install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_userunitdir}
 
 
 %post trust
-%{_sbindir}/update-alternatives --install %{_libdir}/libnssckbi.so \
-        %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30
+%{_sbindir}/alternatives --install %{_libdir}/libnssckbi.so %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so 30
 
 %postun trust
 if [ $1 -eq 0 ] ; then
         # package removal
-        %{_sbindir}/update-alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so
+        %{_sbindir}/alternatives --remove %{alt_ckbi} %{_libdir}/pkcs11/p11-kit-trust.so
 fi
 
 
@@ -152,6 +152,12 @@ fi
 
 
 %changelog
+* Wed Nov 8 2023 Zoltan Fridrich <zfridric@redhat.com> - 0.25.2-1
+- Update to new upstream release 0.25.2
+  Resolves: RHEL-14834
+- Add IBM specific mechanisms and attributes
+  Resolves: RHEL-10570
+
 * Tue Feb  1 2022 Daiki Ueno <dueno@redhat.com> - 0.24.1-2
 - Replace "black list" with "blocklist" in -trust subpackage description (#2026457)
 
diff --git a/sources b/sources
index 6158248..7a6bbf1 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (gpgkey-462225C3B46F34879FC8496CD605848ED7E69871.gpg) = 177e5856fa0f0d542e8014f1beffafcd0b655c842f6a69236f26d628ed7b4bbebb5767c889e5e59ba285f65625eb024a4d754da1bcdd714274820f7206408c86
-SHA512 (p11-kit-0.24.1.tar.xz) = 8cf170c714bb9e0cf3df93e8ec55b8e3c55cabf2c6a27f177ac6de8b8028985df2ca0216d3215d6828dc2ae3095c4e1a4febe8cb26b88ec321defc66bb011e81
-SHA512 (p11-kit-0.24.1.tar.xz.sig) = 9dfe3d86d7c1f396da529291cf0af4e38f56f05023f957604c86c8199cbd20ab48da6f2541b4bcb34bfa01dc7912056e06fc88783d321b07fced19c687bd0ac1
+SHA512 (p11-kit-release-keyring.gpg) = 9a832a8ac3a139cbbf1ecb66573f0709847ebfef4975777cf82b4dca09af1ad8e6400f0af0bcdb92860e7ed4fc05082ba1edda0238a21fe24d49555a1069e881
+SHA512 (p11-kit-0.25.2.tar.xz) = 64df7600c1eedfba942a38eb32bda7fe869ed197449dff2b8470be37ba71f3eefc3990613d2f787d3300b18e87391cd8f8bb4b33277d51ec873548126137bd01
+SHA512 (p11-kit-0.25.2.tar.xz.sig) = 897c3a1280adb2b6e41f75dbb0943bf90981c04710fbaeed4dd93dd0694b4077c8e8b355dca1269e4de3f997273b95d3c71d61d774ef7b960967d72ddacfb8a3