diff --git a/.gitignore b/.gitignore index b165341..ebce9da 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /mod_md-2.0.3.tar.gz /mod_md-2.0.8.tar.gz +/mod_md-2.2.6.tar.gz diff --git a/mod_md-2.0.8-state_dir.patch b/mod_md-2.0.8-state_dir.patch index 970424f..ba4e9c4 100644 --- a/mod_md-2.0.8-state_dir.patch +++ b/mod_md-2.0.8-state_dir.patch @@ -1,21 +1,21 @@ Enable state_dir support for 2.4.x. ---- mod_md-2.0.8/src/mod_md_config.c.state_dir -+++ mod_md-2.0.8/src/mod_md_config.c -@@ -44,7 +44,7 @@ +--- mod_md-2.2.6/src/mod_md_config.c.state_dir ++++ mod_md-2.2.6/src/mod_md_config.c +@@ -54,7 +54,7 @@ /* Default settings for the global conf */ static md_mod_conf_t defmc = { NULL, /* list of mds */ -#if AP_MODULE_MAGIC_AT_LEAST(20180906, 2) +#if 1 - NULL, /* base dir by default state-dir-relative */ + NULL, /* base dirm by default state-dir-relative */ #else MD_DEFAULT_BASE_DIR, -@@ -898,7 +898,7 @@ +@@ -1039,7 +1039,7 @@ mc->hsts_header = apr_psprintf(p, "max-age=%d", mc->hsts_max_age); } - + -#if AP_MODULE_MAGIC_AT_LEAST(20180906, 2) +#if 1 if (mc->base_dir == NULL) { diff --git a/mod_md-2.2.6-warnfix.patch b/mod_md-2.2.6-warnfix.patch new file mode 100644 index 0000000..cc6d404 --- /dev/null +++ b/mod_md-2.2.6-warnfix.patch @@ -0,0 +1,11 @@ +--- 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 e23194a..5bd1ae7 100644 --- a/mod_md.spec +++ b/mod_md.spec @@ -2,13 +2,14 @@ %{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)} Name: mod_md -Version: 2.0.8 -Release: 5%{?dist} +Version: 2.2.6 +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: gcc BuildRequires: pkgconfig, httpd-devel >= 2.4.41, openssl-devel >= 1.1.0, jansson-devel, libcurl-devel Requires: httpd-mmn = %{_httpd_mmn}, mod_ssl >= 1:2.4.41 @@ -24,6 +25,7 @@ domains and their virtual hosts automatically, including at renewal. %prep %setup -q %patch1 -p1 -b .state_dir +%patch2 -p1 -b .warnfix %build %configure @@ -56,6 +58,9 @@ echo "LoadModule md_module modules/mod_md.so" > %{buildroot}%{_httpd_modconfdir} %{_bindir}/a2md %changelog +* Fri Feb 7 2020 Joe Orton - 1:2.2.6-1 +- update to 2.2.6 (#1799660) + * Wed Jan 29 2020 Fedora Release Engineering - 1:2.0.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 16f2ecf..4b9a846 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mod_md-2.0.8.tar.gz) = fc92b9a5e5db5b6e4f8d1d193a977d22590ab10ee0aa59de73cb3275a7bf7b07538136c9bc1347821aedf078983cf191bad9fd58a69e325b411959226a1fdae8 +SHA512 (mod_md-2.2.6.tar.gz) = 55f19ecbe2780a9215920b32eb00cd7d6aa2de1364a3a28cc0855b4a5d4e18854effa43461bd410650458a66a822982ca74458316606fd2f52438d9def79e543