import mod_md-2.0.8-7.module+el8.2.0+5531+7e4d69a2
This commit is contained in:
commit
e0cc2bad6a
2
.gitignore
vendored
Normal file
2
.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
SOURCES/a2md.xml
|
||||
SOURCES/mod_md-2.0.8.tar.gz
|
||||
2
.mod_md.metadata
Normal file
2
.mod_md.metadata
Normal file
@ -0,0 +1,2 @@
|
||||
c3e8fe59d72b01e93a40c7c53f18f9da6343876b SOURCES/a2md.xml
|
||||
6cec32070c6fd83701be0874a2d8b4f30d929d03 SOURCES/mod_md-2.0.8.tar.gz
|
||||
13
SOURCES/mod_md-2.0.8-duptrim-seg.patch
Normal file
13
SOURCES/mod_md-2.0.8-duptrim-seg.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/src/md_result.c b/src/md_result.c
|
||||
index 4076d5b..0e0b688 100644
|
||||
--- a/src/md_result.c
|
||||
+++ b/src/md_result.c
|
||||
@@ -32,7 +32,7 @@
|
||||
static const char *dup_trim(apr_pool_t *p, const char *s)
|
||||
{
|
||||
char *d = apr_pstrdup(p, s);
|
||||
- apr_collapse_spaces(d, d);
|
||||
+ if (d) apr_collapse_spaces(d, d);
|
||||
return d;
|
||||
}
|
||||
|
||||
23
SOURCES/mod_md-2.0.8-state_dir.patch
Normal file
23
SOURCES/mod_md-2.0.8-state_dir.patch
Normal file
@ -0,0 +1,23 @@
|
||||
|
||||
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 @@
|
||||
/* 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 */
|
||||
#else
|
||||
MD_DEFAULT_BASE_DIR,
|
||||
@@ -898,7 +898,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);
|
||||
}
|
||||
93
SPECS/mod_md.spec
Normal file
93
SPECS/mod_md.spec
Normal file
@ -0,0 +1,93 @@
|
||||
# Module Magic Numberfa
|
||||
%{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}
|
||||
|
||||
Name: mod_md
|
||||
Version: 2.0.8
|
||||
Release: 7%{?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
|
||||
# documentation
|
||||
Source10: a2md.xml
|
||||
Patch1: mod_md-2.0.8-state_dir.patch
|
||||
Patch2: mod_md-2.0.8-duptrim-seg.patch
|
||||
BuildRequires: gcc
|
||||
BuildRequires: pkgconfig, httpd-devel >= 2.4.37, openssl-devel >= 1.1.0, jansson-devel, libcurl-devel
|
||||
BuildRequires: xmlto
|
||||
Requires: httpd-mmn = %{_httpd_mmn}, mod_ssl >= 1:2.4.37-17
|
||||
Conflicts: httpd < 2.4.37-17
|
||||
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
|
||||
%setup -q
|
||||
%patch1 -p1 -b .state_dir
|
||||
%patch2 -p1 -b .dup_trim
|
||||
|
||||
xmlto man $RPM_SOURCE_DIR/a2md.xml
|
||||
|
||||
%build
|
||||
%configure
|
||||
# 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
|
||||
|
||||
%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
|
||||
|
||||
# Install man pages
|
||||
install -d $RPM_BUILD_ROOT%{_mandir}/man1
|
||||
install -m 644 -p a2md.1 $RPM_BUILD_ROOT%{_mandir}/man1
|
||||
|
||||
%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
|
||||
* Wed Jan 22 2020 Lubos Uhliarik <luhliari@redhat.com> - 1:2.0.8-7
|
||||
- Resolves: #1747912 - add a2md(1) documentation
|
||||
|
||||
* Mon Dec 09 2019 Lubos Uhliarik <luhliari@redhat.com> - 1:2.0.8-6
|
||||
- Resolves: #1781263 - mod_md ACMEv1 crash
|
||||
|
||||
* Thu Oct 03 2019 Lubos Uhliarik <luhliari@redhat.com> - 1:2.0.8-5
|
||||
- Resolves: #1747898 - add mod_md package
|
||||
|
||||
* Fri Aug 30 2019 Joe Orton <jorton@redhat.com> - 1:2.0.8-4
|
||||
- require mod_ssl, update package description
|
||||
|
||||
* Fri Aug 30 2019 Joe Orton <jorton@redhat.com> - 1:2.0.8-3
|
||||
- rebuild against 2.4.41
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:2.0.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Jul 12 2019 Joe Orton <jorton@redhat.com> - 1:2.0.8-1
|
||||
- update to 2.0.8
|
||||
|
||||
* Tue Jun 11 2019 Lubos Uhliarik <luhliari@redhat.com> - 2.0.3-1
|
||||
- Initial import (#1719248).
|
||||
Loading…
Reference in New Issue
Block a user