From ee221cb72ccb1e6405dbef1634654f58d5c417a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Uhliarik?= <luhliari@redhat.com>
Date: Thu, 7 Apr 2022 14:41:27 +0200
Subject: [PATCH] Related: #2070517 - fix issue when mod_systemd is not loaded

---
 httpd-2.4.53-separate-systemd-fns.patch | 8 +++++---
 httpd.spec                              | 7 +++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/httpd-2.4.53-separate-systemd-fns.patch b/httpd-2.4.53-separate-systemd-fns.patch
index f495a44..88b99ff 100644
--- a/httpd-2.4.53-separate-systemd-fns.patch
+++ b/httpd-2.4.53-separate-systemd-fns.patch
@@ -166,7 +166,7 @@ index 877a593..bd52a98 100644
  /** @} */
  
 diff --git a/server/listen.c b/server/listen.c
-index e2e028a..aa6f91c 100644
+index e2e028a..5d1c0e1 100644
 --- a/server/listen.c
 +++ b/server/listen.c
 @@ -34,10 +34,6 @@
@@ -224,7 +224,7 @@ index e2e028a..aa6f91c 100644
 +    find_systemd_socket = APR_RETRIEVE_OPTIONAL_FN(ap_find_systemd_socket);
 +
 +    if (!find_systemd_socket)
-+       return "Systemd socket activation is used, but mod_systemd is probably"
++       return "Systemd socket activation is used, but mod_systemd is probably "
 +               "not loaded";
 +
      int fd = find_systemd_socket(process, port);
@@ -270,7 +270,7 @@ index e2e028a..aa6f91c 100644
  
      if (err != NULL) {
          return err;
-@@ -973,7 +957,10 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
+@@ -973,7 +957,12 @@ AP_DECLARE_NONSTD(const char *) ap_set_listener(cmd_parms *cmd, void *dummy,
      }
  #ifdef HAVE_SYSTEMD
      if (use_systemd == -1) {
@@ -278,6 +278,8 @@ index e2e028a..aa6f91c 100644
 +        systemd_listen_fds = APR_RETRIEVE_OPTIONAL_FN(ap_systemd_listen_fds);
 +        if (systemd_listen_fds != NULL) {
 +            use_systemd = systemd_listen_fds(0) > 0;
++        } else {
++            use_systemd = 0;
 +        }
      }
  #endif
diff --git a/httpd.spec b/httpd.spec
index ffbc289..12b67c8 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -13,7 +13,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.53
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
@@ -246,7 +246,7 @@ written in the Lua programming language.
 %patch41 -p1 -b .r1861793+
 %patch42 -p1 -b .r1828172+
 %patch45 -p1 -b .logjournal
-%patch46 -p1 -b .separatesystemd
+#patch46 -p1 -b .separatesystemd
 
 %patch60 -p1 -b .enable-sslv3
 %patch61 -p1 -b .r1878890
@@ -814,6 +814,9 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Thu Apr 07 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.53-3
+- Related: #2070517 - fix issue when mod_systemd is not loaded
+
 * Wed Mar 30 2022 Luboš Uhliarik <luhliari@redhat.com> - 2.4.53-2
 - Resolves: #2070517 - Allow install httpd with smaller footprint
 - try to minimize httpd dependencies (new httpd-core package)