From 245929fca502fbd230f3ff49821a9c7d659e9b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Uhliarik?= <luhliari@redhat.com>
Date: Tue, 8 Nov 2022 21:26:16 +0100
Subject: [PATCH] Resolves: #2140979 - mod_md rebase to 2.4.19

---
 .gitignore                 |  1 +
 mod_md-2.2.6-warnfix.patch | 11 -----------
 mod_md.spec                | 10 ++++++----
 sources                    |  2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 mod_md-2.2.6-warnfix.patch

diff --git a/.gitignore b/.gitignore
index 516d129..0cdb22b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /mod_md-2.2.7.tar.gz
 /mod_md-2.2.8.tar.gz
 /mod_md-2.3.7.tar.gz
+/mod_md-2.4.19.tar.gz
diff --git a/mod_md-2.2.6-warnfix.patch b/mod_md-2.2.6-warnfix.patch
deleted file mode 100644
index cc6d404..0000000
--- a/mod_md-2.2.6-warnfix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mod_md-2.2.6/src/md_store_fs.c.warnfix
-+++ mod_md-2.2.6/src/md_store_fs.c
-@@ -502,7 +502,7 @@
-             }
-         }
-     }
--    md_log_perror(MD_LOG_MARK, MD_LOG_TRACE3, 0, p, "mk_group_dir %d %s", group, name);
-+    md_log_perror(MD_LOG_MARK, MD_LOG_TRACE3, 0, p, "mk_group_dir %d %s", group, name ? name : "(none)");
-     return rv;
- }
- 
diff --git a/mod_md.spec b/mod_md.spec
index f12cfcc..57ac144 100644
--- a/mod_md.spec
+++ b/mod_md.spec
@@ -2,18 +2,17 @@
 %{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}
 
 Name:           mod_md
-Version:        2.4.0
-Release:        3%{?dist}
+Version:        2.4.19
+Release:        1%{?dist}
 Summary:        Certificate provisioning using ACME for the Apache HTTP Server
 License:        ASL 2.0
 URL:            https://icing.github.io/mod_md/
 Source0:        https://github.com/icing/mod_md/releases/download/v%{version}/mod_md-%{version}.tar.gz
 Patch1:         mod_md-2.0.8-state_dir.patch
-Patch2:         mod_md-2.2.6-warnfix.patch
 BuildRequires:  make
 BuildRequires:  gcc
 BuildRequires:  pkgconfig, httpd-devel >= 2.4.41, openssl-devel >= 1.1.0, jansson-devel, libcurl-devel, xmlto
-Requires:       httpd-mmn = %{_httpd_mmn}, mod_ssl >= 1:2.4.41
+Requires:       httpd-mmn = %{_httpd_mmn}, mod_ssl >= 1:2.4.41, httpd >= 2.4.48
 Conflicts:      httpd < 2.4.39-7
 Epoch:          1
 
@@ -60,6 +59,9 @@ echo "LoadModule md_module modules/mod_md.so" > %{buildroot}%{_httpd_modconfdir}
 %{_mandir}/man1/*
 
 %changelog
+* Tue Nov 08 2022 Luboš Uhliarik <luhliari@redhat.com> - 1:2.4.19-1
+- Resolves: #2140979 - mod_md rebase to 2.4.19
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:2.4.0-3
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688
diff --git a/sources b/sources
index 7342796..4223b8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mod_md-2.4.0.tar.gz) = dcd8da4c4545aa32d5f2fe24fb4cea57d668dbbd6ae74808e1ccdf5c75ff1b2a8b0b586b3160a7ab7084a66976f117ede55d5a38ea1b12cde5f84cac45a2928b
+SHA512 (mod_md-2.4.19.tar.gz) = cea1c59f80ba932e722be33ebbf372f28aa13b7655ad9ab2b722bb9700e9f99a44d6edd5761429880b3d267d4e350f07ab99d2ee80fa0bde1f47a4c6627397d6