diff --git a/.gitignore b/.gitignore index ee78efd..516d129 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /mod_md-2.2.6.tar.gz /mod_md-2.2.7.tar.gz /mod_md-2.2.8.tar.gz +/mod_md-2.3.7.tar.gz diff --git a/mod_md-2.0.8-tolerate-missing-res.patch b/mod_md-2.0.8-tolerate-missing-res.patch deleted file mode 100644 index 37819cc..0000000 --- a/mod_md-2.0.8-tolerate-missing-res.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/md_acme.c b/src/md_acme.c -index d2cc00a..005a387 100644 ---- a/src/md_acme.c -+++ b/src/md_acme.c -@@ -728,8 +728,15 @@ static apr_status_t update_directory(const md_http_response_t *res) - acme->api.v2.revoke_cert = md_json_dups(acme->p, json, "revokeCert", NULL); - acme->api.v2.key_change = md_json_dups(acme->p, json, "keyChange", NULL); - acme->api.v2.new_nonce = md_json_dups(acme->p, json, "newNonce", NULL); -- if (acme->api.v2.new_account && acme->api.v2.new_order -- && acme->api.v2.revoke_cert && acme->api.v2.key_change -+ /* RFC 8555 only requires "directory" and "newNonce" resources. -+ * mod_md uses "newAccount" and "newOrder" so check for them. -+ * But mod_md does not use the "revokeCert" or "keyChange" -+ * resources, so tolerate the absense of those keys. In the -+ * future if mod_md implements revocation or key rollover then -+ * the use of those features should be predicated on the -+ * server's advertised capabilities. */ -+ if (acme->api.v2.new_account -+ && acme->api.v2.new_order - && acme->api.v2.new_nonce) { - acme->version = MD_ACME_VERSION_2; - } diff --git a/mod_md.spec b/mod_md.spec index 4e38214..241d334 100644 --- a/mod_md.spec +++ b/mod_md.spec @@ -2,15 +2,14 @@ %{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)} Name: mod_md -Version: 2.2.8 -Release: 5%{?dist} +Version: 2.3.7 +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 -Patch3: mod_md-2.0.8-tolerate-missing-res.patch BuildRequires: make BuildRequires: gcc BuildRequires: pkgconfig, httpd-devel >= 2.4.41, openssl-devel >= 1.1.0, jansson-devel, libcurl-devel, xmlto @@ -25,10 +24,7 @@ certificate provisioning. Certificates will be configured for managed domains and their virtual hosts automatically, including at renewal. %prep -%setup -q -%patch1 -p1 -b .state_dir -%patch2 -p1 -b .warnfix -%patch3 -p1 -b .tol_missing_res +%autosetup -p1 %build %configure --with-apxs=%{_httpd_apxs} @@ -62,6 +58,10 @@ echo "LoadModule md_module modules/mod_md.so" > %{buildroot}%{_httpd_modconfdir} %{_mandir}/man1/* %changelog +* Tue Feb 2 2021 Joe Orton - 1:2.3.7-1 +- update to 2.3.7 (beta) +- use autosetup macro + * Tue Jan 26 2021 Fedora Release Engineering - 1:2.2.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 0d96ed8..589c680 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mod_md-2.2.8.tar.gz) = c456dc6c6e0aa5cb14649fdc3fc1218288201a1c4cb3f48b6da6fe4a1ec2427134cfa6b4653ecdbed2f77a0f39b44032bfabef36bcf8aab036e05f5db8a1d9e9 +SHA512 (mod_md-2.3.7.tar.gz) = b7172fa47cc8f8c21dd5db227365c3512c94f2e49f10152b361e4b82f7e0eda22e3760e9183bd5f321e049946b46242c5988f3068ece72651ba51282560d0628