public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/fsverity-utils] rawhide: Fix build with OpenSSL 4
@ 2026-06-12 19:09 Yaakov Selkowitz
  0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-06-12 19:09 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/fsverity-utils
            Branch : rawhide
            Commit : e517ad0e891e7fe166d5a2b5308d3aa966869660
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-04-27T18:15:18-04:00
            Stats  : +31/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fsverity-utils/c/e517ad0e891e7fe166d5a2b5308d3aa966869660?branch=rawhide

            Log:
            Fix build with OpenSSL 4

https://github.com/ebiggers/fsverity-utils/pull/5

---
diff --git a/fsverity-utils.spec b/fsverity-utils.spec
index bce754b..d5cf502 100644
--- a/fsverity-utils.spec
+++ b/fsverity-utils.spec
@@ -7,11 +7,15 @@ Summary: fsverity utilities
 License: LicenseRef-Callaway-BSD
 URL:     https://github.com/ebiggers/fsverity-utils
 Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+# https://github.com/ebiggers/fsverity-utils/pull/5
+Patch0:  openssl4.patch
 
 BuildRequires: gcc make
 BuildRequires: kernel-headers glibc-headers
 BuildRequires: openssl-devel
+%if 0%{?fedora} >= 41 && 0%{?fedora} < 45
 BuildRequires: openssl-devel-engine
+%endif
 Requires:      libfsverity = %{version}-%{release}
 
 %description

diff --git a/openssl4.patch b/openssl4.patch
new file mode 100644
index 0000000..8f76d19
--- /dev/null
+++ b/openssl4.patch
@@ -0,0 +1,27 @@
+From 7bb0f0d82269dc7307989af74aea64621b6f89f0 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Mon, 27 Apr 2026 18:11:02 -0400
+Subject: [PATCH] Fix build with OpenSSL 4
+
+OpenSSL 4 drops support for the ENGINE APIs, which have long been guarded.
+(OpenSSL 3 in RHEL 10 disabled them as well.)  This matches the conditional
+used in later in the code, and covers both BoringSSL and OpenSSL 4.
+
+Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
+---
+ lib/sign_digest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/sign_digest.c b/lib/sign_digest.c
+index c22ff90..4ed0be9 100644
+--- a/lib/sign_digest.c
++++ b/lib/sign_digest.c
+@@ -19,7 +19,7 @@
+ #include <openssl/pkcs7.h>
+ #include <string.h>
+ 
+-#ifndef OPENSSL_IS_BORINGSSL
++#ifndef OPENSSL_NO_ENGINE
+ #include <openssl/engine.h>
+ #endif
+ 

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

only message in thread, other threads:[~2026-06-12 19:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-12 19:09 [rpms/fsverity-utils] rawhide: Fix build with OpenSSL 4 Yaakov Selkowitz

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