public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/systemd] rawhide: Load libssl.so.4 rather than libssl.so.3
Date: Sat, 27 Jun 2026 20:13:40 GMT	[thread overview]
Message-ID: <178259122020.1.4843783410155318697.rpms-systemd-9c87a3f8ad4b@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/systemd
Branch : rawhide
Commit : 9c87a3f8ad4b172ee08640aee5e125dd60d46891
Author : Zbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Date   : 2026-06-27T22:10:56+02:00
Stats  : +39/-0 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/systemd/c/9c87a3f8ad4b172ee08640aee5e125dd60d46891?branch=rawhide

Log:
Load libssl.so.4 rather than libssl.so.3

---
diff --git a/7be9032019015ddd61985e6a6721d813d62dad0b.patch b/7be9032019015ddd61985e6a6721d813d62dad0b.patch
new file mode 100644
index 0000000..c1de086
--- /dev/null
+++ b/7be9032019015ddd61985e6a6721d813d62dad0b.patch
@@ -0,0 +1,38 @@
+From 7be9032019015ddd61985e6a6721d813d62dad0b Mon Sep 17 00:00:00 2001
+From: Luca Boccassi <luca.boccassi@gmail.com>
+Date: Sat, 20 Jun 2026 15:21:26 +0100
+Subject: [PATCH] ssl-util: prefer OpenSSL 4
+
+For the next version we can switch to preferring the new version
+---
+ src/shared/ssl-util.c | 3 +--
+ src/shared/ssl-util.h | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/shared/ssl-util.c b/src/shared/ssl-util.c
+index 226120c70e66f..4b7ab2ec29f74 100644
+--- a/src/shared/ssl-util.c
++++ b/src/shared/ssl-util.c
+@@ -40,8 +40,7 @@ int dlopen_libssl(int log_level) {
+ 
+         LIBSSL_NOTE(SD_ELF_NOTE_DLOPEN_PRIORITY_SUGGESTED);
+ 
+-        // FIXME: switch order to prefer libssl.so.4 in a future version once it has stabilized
+-        FOREACH_STRING(soname, "libssl.so.3", "libssl.so.4") {
++        FOREACH_STRING(soname, "libssl.so.4", "libssl.so.3") {
+                 r = dlopen_many_sym_or_warn(
+                                 &libssl_dl,
+                                 soname,
+diff --git a/src/shared/ssl-util.h b/src/shared/ssl-util.h
+index aa3b8308665ba..77b5c049f9e3a 100644
+--- a/src/shared/ssl-util.h
++++ b/src/shared/ssl-util.h
+@@ -12,7 +12,7 @@ int dlopen_libssl(int log_level);
+         SD_ELF_NOTE_DLOPEN("libssl",                                    \
+                            "Support for TLS",                           \
+                            priority,                                    \
+-                           "libssl.so.3", "libssl.so.4")
++                           "libssl.so.4", "libssl.so.3")
+ 
+ #define DLOPEN_LIBSSL(log_level, priority)                              \
+         ({                                                              \

diff --git a/systemd.spec b/systemd.spec
index fd85426..882fe63 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -149,6 +149,7 @@ 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
+Patch:          https://github.com/systemd/systemd/commit/7be9032019015ddd61985e6a6721d813d62dad0b.patch
 %endif
 
 %ifarch %{ix86} x86_64 aarch64 riscv64

                 reply	other threads:[~2026-06-27 20:13 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178259122020.1.4843783410155318697.rpms-systemd-9c87a3f8ad4b@fedoraproject.org \
    --to=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox