From ba18290d90d86a7c42594190353d7bf1eac3aa4f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 02 2021 21:29:20 +0000 Subject: import mod_md-2.4.0-3.el9 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..967ee42 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/mod_md-2.4.0.tar.gz diff --git a/.mod_md.metadata b/.mod_md.metadata new file mode 100644 index 0000000..cb35fe8 --- /dev/null +++ b/.mod_md.metadata @@ -0,0 +1 @@ +af092cdeee9aa21783e29da7f700324040599bf4 SOURCES/mod_md-2.4.0.tar.gz diff --git a/SOURCES/mod_md-2.0.8-state_dir.patch b/SOURCES/mod_md-2.0.8-state_dir.patch new file mode 100644 index 0000000..ba4e9c4 --- /dev/null +++ b/SOURCES/mod_md-2.0.8-state_dir.patch @@ -0,0 +1,23 @@ + +Enable state_dir support for 2.4.x. + +--- 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 dirm by default state-dir-relative */ + #else + MD_DEFAULT_BASE_DIR, +@@ -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) { + mc->base_dir = ap_state_dir_relative(p, MD_DEFAULT_BASE_DIR); + } diff --git a/SOURCES/mod_md-2.2.6-warnfix.patch b/SOURCES/mod_md-2.2.6-warnfix.patch new file mode 100644 index 0000000..cc6d404 --- /dev/null +++ b/SOURCES/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/SPECS/mod_md.spec b/SPECS/mod_md.spec new file mode 100644 index 0000000..f12cfcc --- /dev/null +++ b/SPECS/mod_md.spec @@ -0,0 +1,123 @@ +# Module Magic Number +%{!?_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} +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 +Conflicts: httpd < 2.4.39-7 +Epoch: 1 + +%description +This module manages common properties of domains for one or more +virtual hosts. Specifically it can use the ACME protocol to automate +certificate provisioning. Certificates will be configured for managed +domains and their virtual hosts automatically, including at renewal. + +%prep +%autosetup -p1 + +%build +%configure --with-apxs=%{_httpd_apxs} +# remove rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +# remove Werror +sed -i 's|-Werror ||' */Makefile Makefile + +%make_build V=1 + +%check +%make_build check + +%install +%make_install +rm -rf %{buildroot}/etc/httpd/share/doc/ + +# remove links and rename SO files +rm -f %{buildroot}%{_httpd_moddir}/mod_md.so +mv %{buildroot}%{_httpd_moddir}/mod_md.so.0.0.0 %{buildroot}%{_httpd_moddir}/mod_md.so + +# create configuration +mkdir -p %{buildroot}%{_httpd_modconfdir} +echo "LoadModule md_module modules/mod_md.so" > %{buildroot}%{_httpd_modconfdir}/01-md.conf + +%files +%doc README.md ChangeLog AUTHORS +%license LICENSE +%config(noreplace) %{_httpd_modconfdir}/01-md.conf +%{_httpd_moddir}/mod_md.so +%{_bindir}/a2md +%{_mandir}/man1/* + +%changelog +* Mon Aug 09 2021 Mohan Boddu - 1:2.4.0-3 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Wed Jun 16 2021 Mohan Boddu - 1:2.4.0-2 +- Rebuilt for RHEL 9 BETA for openssl 3.0 + Related: rhbz#1971065 + +* Tue May 18 2021 Lubos Uhliarik - 1:2.4.0-1 +- new version 2.4.0 +- Resolves: #1961242 - mod_md: rebase to 2.4.0 + +* Mon May 17 2021 Joe Orton - 1:2.3.7-3 +- don't build with -Werror (#1958041) + +* Fri Apr 16 2021 Mohan Boddu - 1:2.3.7-2 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* 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 + +* Fri Jan 22 2021 Joe Orton - 1:2.2.8-4 +- update to 2.2.8 + +* Fri Aug 28 2020 Joe Orton - 1:2.2.7-4 +- use _httpd_apxs macro + +* Tue Jul 28 2020 Fedora Release Engineering - 1:2.2.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 23 2020 Alexander Bokovoy - 1:2.2.7-2 +- mod_md does not work with ACME server that does not provide revokeCert or + keyChange resource (#1832841) + +* Tue Feb 11 2020 Joe Orton - 1:2.2.7-1 +- update to 2.2.7 + +* 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 + +* Fri Aug 30 2019 Joe Orton - 1:2.0.8-4 +- require mod_ssl, update package description + +* Fri Aug 30 2019 Joe Orton - 1:2.0.8-3 +- rebuild against 2.4.41 + +* Thu Jul 25 2019 Fedora Release Engineering - 1:2.0.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Jul 12 2019 Joe Orton - 1:2.0.8-1 +- update to 2.0.8 + +* Tue Jun 11 2019 Lubos Uhliarik - 2.0.3-1 +- Initial import (#1719248).