public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/kryoptic] f45: New upstream release
@ 2026-09-22 15:36 Jakub Jelen
0 siblings, 0 replies; only message in thread
From: Jakub Jelen @ 2026-09-22 15:36 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/kryoptic
Branch : f45
Commit : 53683cd768ce1776b706ac4ecfe11b0d0b7f6d0e
Author : Jakub Jelen <jjelen@redhat.com>
Date : 2026-09-22T16:59:11+02:00
Stats : +5/-76 in 5 file(s)
URL : https://src.fedoraproject.org/rpms/kryoptic/c/53683cd768ce1776b706ac4ecfe11b0d0b7f6d0e?branch=f45
Log:
New upstream release
---
diff --git a/.gitignore b/.gitignore
index 0ebd698..ccb4b24 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
/kryoptic-1.5.1.tar.gz.asc
/kryoptic-1.5.2.tar.gz
/kryoptic-1.5.2.tar.gz.asc
+/kryoptic-1.5.3.tar.gz
+/kryoptic-1.5.3.tar.gz.asc
diff --git a/kryoptic-fix-deadlock.patch b/kryoptic-fix-deadlock.patch
deleted file mode 100644
index 4a6c7a5..0000000
--- a/kryoptic-fix-deadlock.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 9dbf68e12ab06c7171c83e6f34d8a4b50605f09a Mon Sep 17 00:00:00 2001
-From: Simo Sorce <simo@redhat.com>
-Date: Mon, 6 Jul 2026 12:50:02 -0400
-Subject: [PATCH] Prevent test deadlocks in synchronization
-
-Replaced the blocking `write()` lock acquisition on the SYNC primitive with a
-polling loop using `try_write()` and a short sleep. A queued write lock could
-block incoming `read()` attempts, leading to deadlocks during test
-finalization. Using `try_write()` ensures that pending reads can complete
-safely.
-
-Signed-off-by: Simo Sorce <simo@redhat.com>
----
- src/tests/mod.rs | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/tests/mod.rs b/src/tests/mod.rs
-index 5f4e576..292fbd7 100644
---- a/src/tests/mod.rs
-+++ b/src/tests/mod.rs
-@@ -5,6 +5,8 @@ use std::ffi::CString;
- use std::fs::{create_dir_all, remove_dir_all, OpenOptions};
- use std::io::Write;
- use std::sync::Once;
-+use std::thread;
-+use std::time::Duration;
-
- #[cfg(feature = "log")]
- use crate::log;
-@@ -198,8 +200,22 @@ impl TestToken<'_> {
- drop(FINI.read().unwrap());
- } else {
- self.sync = None;
-+
- /* wait for all others to complete */
-- drop(SYNC.write().unwrap());
-+ loop {
-+ /* This needs to use try_write() because a queued write lock
-+ * may actually block read() attempts, which would cause
-+ * tests to deadlock, sleeps between attempts. */
-+ thread::sleep(Duration::from_millis(5));
-+ match SYNC.try_write() {
-+ Ok(lock) => {
-+ drop(lock);
-+ break;
-+ }
-+ Err(_) => (),
-+ }
-+ }
-+
- let ret = fn_finalize(std::ptr::null_mut());
- assert_eq!(ret, CKR_OK);
- /* winner finalized and completed the tests */
---
-2.55.0
-
diff --git a/kryoptic-fix-metadata.diff b/kryoptic-fix-metadata.diff
deleted file mode 100644
index d1f3f26..0000000
--- a/kryoptic-fix-metadata.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/tools/Cargo.toml
-+++ b/tools/Cargo.toml
-@@ -34,7 +34,7 @@ hex = "0.4.3"
- libc = "0.2.151"
- serde = { version = "1.0.180", features = ["derive"] }
- serde_json = "1.0.104"
--quick-xml = { version = "0.40", features = ["serialize"], optional = true }
-+quick-xml = { version = "0.41", features = ["serialize"], optional = true }
-
- [features]
- default = ["kryoptic-lib/default"]
diff --git a/kryoptic.spec b/kryoptic.spec
index 256f794..20b4e3f 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.2
+Version: 1.5.3
Release: %autorelease
Summary: PKCS #11 software token written in Rust
@@ -33,12 +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
-# * Update quick-xml dependency to 0.41:
-# https://github.com/latchset/kryoptic/pull/475
-Patch: kryoptic-fix-metadata.diff
-# https://github.com/latchset/kryoptic/pull/476
-Patch: kryoptic-fix-deadlock.patch
BuildRequires: cargo-rpm-macros >= 26
diff --git a/sources b/sources
index c7e1b4d..bc7dc26 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (kryoptic-1.5.2.tar.gz) = 5213047b146ca181a8ddcfe6c3397b2a756a6bbb622a6add6ad89f42e364e7ac7799b194096e9aca626eed7c71351de0ae1fa462915c5a1ea7bd1ee249a3b65d
-SHA512 (kryoptic-1.5.2.tar.gz.asc) = a9f802ab14c9b85b16274f837b27d9f5a4ec51472cab513a6a51f25441ebb9086434b065ff0def411e324d89436f84579325692c6c108162d63a0633ec3e7f22
+SHA512 (kryoptic-1.5.3.tar.gz) = 4f0e11b1b6179616cc5365ea611018faf5174189d76fee08a79c405cab24a8292d4749792125d4fef68fc692e3e9a2096345a092d151ca7386eaf910db3f54ab
+SHA512 (kryoptic-1.5.3.tar.gz.asc) = af9e5135985e47c525ad6f286be83c7d92a816d0e76aad9ea968fa9c8e7ce4506ac89185b518bf098dead3683272451d40408aa684c2750a2a10ecb8c7dcfdc6
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-09-22 15:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-22 15:36 [rpms/kryoptic] f45: New upstream release Jakub Jelen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox