From 730c5794e54ac1a26881b7a68992ae8baeb01e07 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Sat, 4 Apr 2020 18:00:23 +0200
Subject: [PATCH] - updated to 2.4.43

---
 apache-apxs.patch   |  2 +-
 apache-layout.patch | 12 +++++-------
 apache.spec         |  9 ++++++---
 3 files changed, 12 insertions(+), 11 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 f211aff..7f242cb 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.orig	2020-04-04 17:17:22.695000000 +0200
++++ httpd-2.4.43/config.layout	2020-04-04 17:19:28.210000000 +0200
+@@ -419,3 +419,27 @@
+     proxycachedir:   ${localstatedir}/cache/apache2
  </Layout>
-+
+ 
 +# TLD layout
 +<Layout TLD>
 +    prefix:        /usr
@@ -29,4 +28,3 @@
 +    proxycachedir: /var/cache/httpd
 +    installbuilddir: ${libexecdir}/build
 +</Layout>
-+
diff --git a/apache.spec b/apache.spec
index 811b3dc..bd72a34 100644
--- a/apache.spec
+++ b/apache.spec
@@ -35,12 +35,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
-Release:	2
+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
@@ -98,6 +98,7 @@ BuildRequires:	apr-util-devel >= %{apr_util_ver}
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 %{?with_distcache:BuildRequires:	distcache-devel}
+BuildRequires:	jansson-devel >= 0.6.0
 BuildRequires:	libbrotli-devel >= 0.6.0
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	libxml2-devel >= 2
@@ -2722,6 +2723,7 @@ CPPFLAGS="-DMAX_SERVER_LIMIT=200000 -DBIG_SECURITY_HOLE=1"
 install -d build; cd build
 ../%configure \
 	--enable-layout=TLD \
+	--disable-systemd \
 	--disable-v4-mapped \
 	--enable-exception-hook \
 	--enable-modules=all \
@@ -2764,6 +2766,7 @@ install -d build; cd build
 	--enable-log-forensic \
 	--enable-logio \
 	--enable-lua \
+	--enable-md \
 	--enable-mime-magic \
 	--enable-mpms-shared=all \
 %ifarch %{ix86}
-- 
2.44.0