From d624566de607bbc4a80175f581881a5067d5e02b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Thu, 2 Apr 2020 09:06:55 +0200
Subject: [PATCH] - up to 2.4.43; fixes CVE-2020-1934, CVE-2020-1927

---
 apache-apxs.patch   |  2 +-
 apache-layout.patch | 14 ++++++++------
 apache.spec         |  9 +++++++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/apache-apxs.patch b/apache-apxs.patch
index 9cabf9c..309ee24 100644
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -28,7 +28,7 @@
 @@ -479,8 +480,8 @@
          $t =~ s|\.[^./\\]+$|\.so|;
          if ($opt_i) {
- 	    push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
+ 	    push(@cmds, $destdir . "$installbuilddir/instdso.sh SH_LIBTOOL='" .
 -                 "$libtool' $f $CFG_LIBEXECDIR");
 -	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
 +                 "$libtool' $f $CFG_DESTDIR$CFG_LIBEXECDIR");
diff --git a/apache-layout.patch b/apache-layout.patch
index 1f6d92b..34ea47d 100644
--- a/apache-layout.patch
+++ b/apache-layout.patch
@@ -1,10 +1,9 @@
---- httpd-2.4.3/config.layout.orig	2012-04-17 16:01:41.000000000 +0200
-+++ httpd-2.4.3/config.layout	2012-08-23 13:01:27.879147377 +0200
-@@ -370,3 +370,29 @@
-     logfiledir:      ${localstatedir}/log/httpd
-     proxycachedir:   ${localstatedir}/cache/httpd
+--- httpd-2.4.43/config.layout~	2020-02-21 01:39:22.000000000 +0100
++++ httpd-2.4.43/config.layout	2020-04-02 08:27:25.901641779 +0200
+@@ -106,6 +106,31 @@
+     proxycachedir: ${runtimedir}/proxy
  </Layout>
-+
+ 
 +# PLD layout
 +<Layout PLD>
 +    prefix:        /usr
@@ -30,3 +29,6 @@
 +    installbuilddir: ${libexecdir}/build
 +</Layout>
 +
+ #   Red Hat Linux 7.x layout
+ <Layout RedHat>
+     prefix:        /usr
diff --git a/apache.spec b/apache.spec
index adeb99f..3b57eff 100644
--- a/apache.spec
+++ b/apache.spec
@@ -33,12 +33,12 @@ Summary(pt_BR.UTF-8):	Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):	Самый популярный веб-сервер
 Summary(tr.UTF-8):	Lider WWW tarayıcı
 Name:		apache
-Version:	2.4.41
+Version:	2.4.43
 Release:	1
 License:	Apache v2.0
 Group:		Networking/Daemons/HTTP
 Source0:	http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
-# Source0-md5:	dfc674f8f454e3bc2d4ccd73ad3b5f1e
+# Source0-md5:	791c986b1e70fe61eb44060aacc89a64
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
@@ -114,6 +114,7 @@ BuildRequires:	rpm-build >= 4.4.0
 BuildRequires:	rpm-perlprov >= 4.1-13
 BuildRequires:	rpmbuild(macros) >= 1.647
 BuildRequires:	sed >= 4.0
+BuildRequires:	systemd-devel
 BuildRequires:	zlib-devel
 Requires:	%{name}-errordocs = %{version}-%{release}
 Requires:	%{name}-mod_alias = %{version}-%{release}
@@ -2813,6 +2814,7 @@ install -d build; cd build
 	--enable-speling \
 	%{?with_ssl:--enable-ssl %{?with_distcache:--enable-distcache}} \
 	--enable-suexec \
+	--enable-systemd \
 	--enable-unique-id \
 	--enable-usertrack \
 	--enable-vhost-alias \
@@ -2981,6 +2983,7 @@ modules="
 	socache_shmcb
 	speling
 	substitute
+	systemd
 	unique_id
 	usertrack
 	version
@@ -3284,6 +3287,7 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_common.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mpm.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_systemd.conf
 %attr(640,root,root) %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/vhosts.d/example.net.conf
 %attr(640,root,root) %{_sysconfdir}/magic
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/httpd
@@ -3318,6 +3322,7 @@ fi
 %attr(755,root,root) %{_libexecdir}/mod_mpm_event.so
 %attr(755,root,root) %{_libexecdir}/mod_mpm_prefork.so
 %attr(755,root,root) %{_libexecdir}/mod_mpm_worker.so
+%attr(755,root,root) %{_libexecdir}/mod_systemd.so
 %attr(755,root,root) %{_libexecdir}/mod_unixd.so
 
 %files doc -f manual.files
-- 
2.44.0