public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/kryoptic] f44: New upstream release 1.5.2
@ 2026-06-30 10:20 Jakub Jelen
  0 siblings, 0 replies; only message in thread
From: Jakub Jelen @ 2026-06-30 10:20 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/kryoptic
Branch : f44
Commit : 3a24c09cd80464f8418b2d3a6e4b8e3036ce1c94
Author : Jakub Jelen <jjelen@redhat.com>
Date   : 2026-06-30T12:17:22+02:00
Stats  : +5/-58 in 5 file(s)
URL    : https://src.fedoraproject.org/rpms/kryoptic/c/3a24c09cd80464f8418b2d3a6e4b8e3036ce1c94?branch=f44

Log:
New upstream release 1.5.2

---
diff --git a/.gitignore b/.gitignore
index b5534f3..0ebd698 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /kryoptic-1.5.0.tar.gz.asc
 /kryoptic-1.5.1.tar.gz
 /kryoptic-1.5.1.tar.gz.asc
+/kryoptic-1.5.2.tar.gz
+/kryoptic-1.5.2.tar.gz.asc

diff --git a/kryoptic-deadlock.patch b/kryoptic-deadlock.patch
deleted file mode 100644
index 08604a1..0000000
--- a/kryoptic-deadlock.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5494395faecdd07b4473e6c2ef74a9f858c7c1f4 Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Fri, 5 Jun 2026 11:55:15 -0400
-Subject: [PATCH] Fix potential deadlock by resetting config before finalizing
- state
-
-This commit swaps the order of operations in the finalize function
-to ensure the global configuration is reset before the state is
-finalized. Although the write lock on STATE is supposed to be released
-before the CONFIG lock is acquired, we have observed deadlocks in some
-builds, likely because STATE does not immediately go out of scope.
-
-By ensuring the CONFIG lock is always acquired prior to the STATE lock,
-we align with the locking order used throughout the rest of the codebase
-and eliminate this potential deadlock.
-
-Assisted-by: Gemini <gemini@google.com>
-Signed-off-by: Simo Sorce <simo@redhat.com>
----
- src/fns/general.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/fns/general.rs b/src/fns/general.rs
-index 419bacf9..54c61059 100644
---- a/src/fns/general.rs
-+++ b/src/fns/general.rs
-@@ -97,9 +97,9 @@ pub extern "C" fn fn_initialize(init_args: CK_VOID_PTR) -> CK_RV {
- 
- #[inline(always)]
- fn finalize(_reserved: CK_VOID_PTR) -> Result<()> {
--    let ret = STATE.wlock()?.finalize();
-     let mut conf = crate::CONFIG.wlock()?;
-     *conf = Config::new();
-+    let ret = STATE.wlock()?.finalize();
-     if ret != CKR_OK {
-         return Err(ret)?;
-     }
-

diff --git a/kryoptic-fix-metadata.diff b/kryoptic-fix-metadata.diff
deleted file mode 100644
index 6d8129d..0000000
--- a/kryoptic-fix-metadata.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur kryoptic-1.5.1-original/tools/Cargo.toml kryoptic-1.5.1/tools/Cargo.toml
---- kryoptic-1.5.1-original/tools/Cargo.toml	2026-06-04 19:04:30.000000000 +0100
-+++ kryoptic-1.5.1/tools/Cargo.toml	2026-06-08 12:34:13.579498551 +0100
-@@ -34,7 +34,7 @@
- libc = "0.2.151"
- serde = { version = "1.0.180", features = ["derive"] }
- serde_json = "1.0.104"
--quick-xml = { version = "0.39", features = ["serialize"], optional = true }
-+quick-xml = { version = ">=0.39, <0.41", features = ["serialize"], optional = true }
- 
- [features]
- default = ["kryoptic-lib/default"]

diff --git a/kryoptic.spec b/kryoptic.spec
index e6247f6..4d2294a 100644
--- a/kryoptic.spec
+++ b/kryoptic.spec
@@ -9,7 +9,7 @@
 %global features kryoptic-lib/nssdb,kryoptic-lib/pqc,kryoptic-lib/standard,kryoptic-lib/dynamic,profiles
 
 Name:           kryoptic
-Version:        1.5.1
+Version:        1.5.2
 Release:        %autorelease
 Summary:        PKCS #11 software token written in Rust
 
@@ -33,11 +33,6 @@ Source0:        https://github.com/latchset/kryoptic/releases/download/v%{versio
 Source1:        https://github.com/latchset/kryoptic/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
 Source2:        https://people.redhat.com/~ssorce/simo_redhat.asc
 %endif
-# Manually created patch for downstream crate metadata changes
-# * Allow quick-xml 0.40: https://github.com/latchset/kryoptic/pull/460
-Patch:          kryoptic-fix-metadata.diff
-# https://github.com/latchset/kryoptic/pull/459
-Patch:          kryoptic-deadlock.patch
 
 
 BuildRequires:  cargo-rpm-macros >= 26

diff --git a/sources b/sources
index 3bec875..c7e1b4d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (kryoptic-1.5.1.tar.gz) = 150c0ca38a7b2dc3b96ed42c7acab217ca4a17c89ff9765fa0d2354d4b70f64ffe3341178e42d8bd3ec7bfc963700d1f2a0b13956e156b7e6db18e773e5e037a
-SHA512 (kryoptic-1.5.1.tar.gz.asc) = 4b6f47c7c76cb156dd3fa449f7b9f4171c728c1f41cf42902ae9b8ea3aa8e7f63201e0b88b539a8c5470a5b1da2ef8f1da5d3b82d0fe67b724273ee6a7c095e0
+SHA512 (kryoptic-1.5.2.tar.gz) = 5213047b146ca181a8ddcfe6c3397b2a756a6bbb622a6add6ad89f42e364e7ac7799b194096e9aca626eed7c71351de0ae1fa462915c5a1ea7bd1ee249a3b65d
+SHA512 (kryoptic-1.5.2.tar.gz.asc) = a9f802ab14c9b85b16274f837b27d9f5a4ec51472cab513a6a51f25441ebb9086434b065ff0def411e324d89436f84579325692c6c108162d63a0633ec3e7f22

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-06-30 10:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-30 10:20 [rpms/kryoptic] f44: New upstream release 1.5.2 Jakub Jelen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox