From 06f020ed1a5b73502ca0fe565173aff4c5f8db96 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Tue, 7 Jul 2020 11:57:10 +0100
Subject: [PATCH 1/2] Fix build w/o glibc 2.30.

---
 httpd-2.4.43-gettid.patch | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/httpd-2.4.43-gettid.patch b/httpd-2.4.43-gettid.patch
index 894696a..f80b3a7 100644
--- a/httpd-2.4.43-gettid.patch
+++ b/httpd-2.4.43-gettid.patch
@@ -16,7 +16,7 @@ diff --git a/configure.in b/configure.in
 index 423d58d4b9a..60cbf7b7f81 100644
 --- httpd-2.4.43/configure.in.gettid
 +++ httpd-2.4.43/configure.in
-@@ -500,7 +500,8 @@
+@@ -478,7 +500,8 @@
  timegm \
  getpgid \
  fopen64 \
@@ -26,7 +26,7 @@ index 423d58d4b9a..60cbf7b7f81 100644
  )
  
  dnl confirm that a void pointer is large enough to store a long integer
-@@ -511,16 +512,19 @@
+@@ -489,16 +512,19 @@
     APR_ADDTO(HTTPD_LIBS, [-lselinux])
  ])
  
@@ -52,6 +52,15 @@ index 423d58d4b9a..60cbf7b7f81 100644
  dnl ## Check for the tm_gmtoff field in struct tm to get the timezone diffs
 --- httpd-2.4.43/server/log.c.gettid
 +++ httpd-2.4.43/server/log.c
+@@ -55,7 +55,7 @@
+ #include "ap_mpm.h"
+ #include "ap_listen.h"
+ 
+-#if HAVE_GETTID
++#if HAVE_SYS_GETTID
+ #include <sys/syscall.h>
+ #include <sys/types.h>
+ #endif
 @@ -625,14 +625,18 @@
  #if APR_HAS_THREADS
      int result;

From 45e08a9e5e792f3ac7c90723f8c0ab7fedafc561 Mon Sep 17 00:00:00 2001
From: Lubos Uhliarik <luhliari@redhat.com>
Date: Thu, 9 Jul 2020 17:07:39 +0200
Subject: [PATCH 2/2] Remove %ghosted /etc/sysconfig/httpd file (#1850082)

---
 httpd.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/httpd.spec b/httpd.spec
index 15bddb5..3b80a87 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -13,7 +13,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.43
-Release: 4%{?dist}
+Release: 5%{?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
@@ -647,7 +647,6 @@ exit $rv
 %exclude %{_sysconfdir}/httpd/conf.modules.d/01-session.conf
 
 %config(noreplace) %{_sysconfdir}/sysconfig/htcacheclean
-%ghost %{_sysconfdir}/sysconfig/httpd
 %{_prefix}/lib/tmpfiles.d/httpd.conf
 
 %dir %{_libexecdir}/initscripts/legacy-actions/httpd
@@ -754,6 +753,9 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Thu Jul 09 2020 Lubos Uhliarik <luhliari@redhat.com> - 2.4.43-5
+- Remove %ghosted /etc/sysconfig/httpd file (#1850082)
+
 * Tue Jul  7 2020 Joe Orton <jorton@redhat.com> - 2.4.43-4
 - use gettid() directly and use it for built-in ErrorLogFormat