[rpms/systemd] rawhide: Update to load openssl-4 rather than openssl-3

[rpms/systemd] rawhide: Update to load openssl-4 rather than openssl-3

[@ 2026-06-19 19:46 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/systemd
            Branch : rawhide
            Commit : 054158500a9fb8a5867055fe1ec430b56c04569c
            Author : Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
            Date   : 2026-06-19T21:44:06+02:00
            Stats  : +47/-0 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/systemd/c/054158500a9fb8a5867055fe1ec430b56c04569c?branch=rawhide

            Log:
            Update to load openssl-4 rather than openssl-3

The autogenerated dependency (Requires:libcrypto.so.3()(64bit) in
systemd-udev.rpm) is causing a failure in coreos.cosa.build-and-test.

---
diff --git a/42668.patch b/42668.patch
new file mode 100644
index 0000000..4754a3a
--- /dev/null
+++ b/42668.patch
@@ -0,0 +1,44 @@
+From e6f1190eb6be465432cfbab267a59c851ae990c5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@amutable.com>
+Date: Fri, 19 Jun 2026 21:38:44 +0200
+Subject: [PATCH] crypto-util: prefer openssl-4
+
+Fedora has switched to openssl 4, and we generate a Requires dependency
+on libcrypto for the systemd-udev subpackage, so preferring openssl-3
+does the wrong thing. So the order in the dlopen note needs to be switched.
+But in general, we want to get rid of openssl-3, so we want to load
+openssl-4 in preference. Change the order in both places.
+
+(The "compat" order can stay in 261-stable for other distros.)
+---
+ src/shared/crypto-util.c | 3 +--
+ src/shared/crypto-util.h | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/shared/crypto-util.c b/src/shared/crypto-util.c
+index ed6d2a269c772..b345475fa4043 100644
+--- a/src/shared/crypto-util.c
++++ b/src/shared/crypto-util.c
+@@ -339,8 +339,7 @@ int dlopen_libcrypto(int log_level) {
+ 
+         LIBCRYPTO_NOTE(SD_ELF_NOTE_DLOPEN_PRIORITY_SUGGESTED);
+ 
+-        // FIXME: switch order to prefer libcrypto.so.4 in a future version once it has stabilized
+-        FOREACH_STRING(soname, "libcrypto.so.3", "libcrypto.so.4") {
++        FOREACH_STRING(soname, "libcrypto.so.4", "libcrypto.so.3") {
+                 r = dlopen_many_sym_or_warn(
+                         &libcrypto_dl,
+                         soname,
+diff --git a/src/shared/crypto-util.h b/src/shared/crypto-util.h
+index 980c1c60a2a5f..bd0cb7b67b8dd 100644
+--- a/src/shared/crypto-util.h
++++ b/src/shared/crypto-util.h
+@@ -37,7 +37,7 @@ int dlopen_libcrypto(int log_level);
+         SD_ELF_NOTE_DLOPEN("libcrypto",                                 \
+                            "Support for cryptographic operations",      \
+                            priority,                                    \
+-                           "libcrypto.so.3", "libcrypto.so.4")
++                           "libcrypto.so.4", "libcrypto.so.3")
+ 
+ #define DLOPEN_LIBCRYPTO(log_level, priority)                           \
+         ({                                                              \

diff --git a/systemd.spec b/systemd.spec
index e0b8792..4e780be 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -146,6 +146,9 @@ Patch:          0001-core-create-userdb-root-directory-with-correct-label.patch
 
 # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2415701
 Patch:          0002-machined-continue-without-resolve.hook-socket.patch
+
+# We want to depend on and load openssl-4 in preference
+Patch:          https://github.com/systemd/systemd/pull/42668.patch
 %endif
 
 %ifarch %{ix86} x86_64 aarch64 riscv64