diff --git a/.gitignore b/.gitignore index 967ee42..0148465 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mod_md-2.4.0.tar.gz +SOURCES/mod_md-2.4.19.tar.gz diff --git a/.mod_md.metadata b/.mod_md.metadata index cb35fe8..a74737f 100644 --- a/.mod_md.metadata +++ b/.mod_md.metadata @@ -1 +1 @@ -af092cdeee9aa21783e29da7f700324040599bf4 SOURCES/mod_md-2.4.0.tar.gz +21de4b6f6ecb3d0f613217339f4790aba5e7ac86 SOURCES/mod_md-2.4.19.tar.gz diff --git a/SOURCES/mod_md-2.2.6-warnfix.patch b/SOURCES/mod_md-2.2.6-warnfix.patch deleted file mode 100644 index cc6d404..0000000 --- a/SOURCES/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/SPECS/mod_md.spec b/SPECS/mod_md.spec index f12cfcc..57ac144 100644 --- a/SPECS/mod_md.spec +++ b/SPECS/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 - 1:2.4.19-1 +- Resolves: #2140979 - mod_md rebase to 2.4.19 + * Mon Aug 09 2021 Mohan Boddu - 1:2.4.0-3 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688