Skip to content

Commit 2d1ffd6

Browse files
Upgraded mod_md to version 2.4.26 (microsoft#14624)
Co-authored-by: Aninda <[email protected]>
1 parent 890a5bf commit 2d1ffd6

File tree

5 files changed

+96
-54
lines changed

5 files changed

+96
-54
lines changed

SPECS-EXTENDED/mod_md/mod_md-2.0.8-tolerate-missing-res.patch

Lines changed: 0 additions & 22 deletions
This file was deleted.

SPECS-EXTENDED/mod_md/mod_md-2.2.6-warnfix.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"mod_md-2.2.7.tar.gz": "f1dc13bcb9ae652cabb448ab9b5dd3f7d617aef6a71dae102fff9c5e4d8ddb48"
3+
"mod_md-2.4.26.tar.gz": "bf5dd6bb26fca7b792ebf512bfa7130ab4fee20415c00c5b958cc1c42c532bce"
44
}
55
}

SPECS-EXTENDED/mod_md/mod_md.spec

Lines changed: 93 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,24 @@ Distribution: Azure Linux
44
%{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}
55

66
Name: mod_md
7-
Version: 2.2.7
8-
Release: 4%{?dist}
7+
Version: 2.4.26
8+
Release: 3%{?dist}
99
Summary: Certificate provisioning using ACME for the Apache HTTP Server
10-
License: ASL 2.0
10+
License: Apache-2.0
1111
URL: https://icing.github.io/mod_md/
1212
Source0: https://github.com/icing/mod_md/releases/download/v%{version}/mod_md-%{version}.tar.gz
13-
Patch2: mod_md-2.2.6-warnfix.patch
14-
Patch3: mod_md-2.0.8-tolerate-missing-res.patch
13+
14+
BuildRequires: make
1515
BuildRequires: gcc
16-
BuildRequires: pkgconfig, httpd-devel >= 2.4.41, openssl-devel >= 1.1.0, jansson-devel, libcurl-devel, xmlto
17-
Requires: httpd-mmn, mod_ssl
16+
BuildRequires: pkgconfig
17+
BuildRequires: httpd-devel >= 2.4.41
18+
BuildRequires: openssl-devel >= 1.1.0
19+
BuildRequires: jansson-devel
20+
BuildRequires: libcurl-devel
21+
BuildRequires: xmlto
22+
Requires: libxcrypt
23+
Requires: mod_ssl >= 2.4.41
24+
Provides: httpd-mmn = %{_httpd_mmn}
1825
Conflicts: httpd < 2.4.39-7
1926

2027
%description
@@ -24,12 +31,10 @@ certificate provisioning. Certificates will be configured for managed
2431
domains and their virtual hosts automatically, including at renewal.
2532

2633
%prep
27-
%setup -q
28-
%patch 2 -p1 -b .warnfix
29-
%patch 3 -p1 -b .tol_missing_res
34+
%autosetup -p1
3035

3136
%build
32-
%configure
37+
%configure --with-apxs=%{_httpd_apxs}
3338
# remove rpath
3439
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
3540
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -47,8 +52,8 @@ rm -rf %{buildroot}/etc/httpd/share/doc/
4752
rm -f %{buildroot}%{_httpd_moddir}/mod_md.so
4853
mv %{buildroot}%{_httpd_moddir}/mod_md.so.0.0.0 %{buildroot}%{_httpd_moddir}/mod_md.so
4954

50-
# create configuration
51-
mkdir -p %{buildroot}%{_httpd_modconfdir}
55+
# create configuration and state directory
56+
mkdir -p %{buildroot}%{_httpd_modconfdir} %{buildroot}%{_httpd_statedir}/md
5257
echo "LoadModule md_module modules/mod_md.so" > %{buildroot}%{_httpd_modconfdir}/01-md.conf
5358

5459
%files
@@ -60,12 +65,82 @@ echo "LoadModule md_module modules/mod_md.so" > %{buildroot}%{_httpd_modconfdir}
6065
%{_mandir}/man1/*
6166

6267
%changelog
63-
* Mon Nov 01 2021 Muhammad Falak <[email protected]> - 2.2.7-4
64-
- Remove epoch
68+
* Mon Dec 06 2025 Aninda Pradhan <[email protected]> - 2.4.26-3
69+
- Initial Azure Linux import from Fedora 41 (license: MIT)
70+
- License verified
71+
- Removed epoch
72+
- Removed "mod_md-2.0.8-state_dir.patch" to make the build skip sections not supported by Azure Linux.
73+
74+
* Thu Jul 18 2024 Fedora Release Engineering <[email protected]> - 1:2.4.26-2
75+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
76+
77+
* Thu Jan 25 2024 Joe Orton <[email protected]> - 1:2.4.26-1
78+
- update to 2.4.26
79+
80+
* Thu Jan 25 2024 Fedora Release Engineering <[email protected]> - 1:2.4.25-3
81+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
82+
83+
* Sun Jan 21 2024 Fedora Release Engineering <[email protected]> - 1:2.4.25-2
84+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
85+
86+
* Tue Nov 28 2023 Joe Orton <[email protected]> - 1:2.4.25-1
87+
- update to 2.4.25
88+
89+
* Mon Sep 11 2023 Luboš Uhliarik <[email protected]> - 1:2.4.24-1
90+
- new version 2.4.24
91+
92+
* Thu Jul 20 2023 Fedora Release Engineering <[email protected]> - 1:2.4.21-2
93+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
94+
95+
* Thu Jun 01 2023 Luboš Uhliarik <[email protected]> - 1:2.4.21-1
96+
- new version 2.4.21
97+
- SPDX migration
98+
99+
* Thu Jan 19 2023 Fedora Release Engineering <[email protected]> - 1:2.4.19-3
100+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
101+
102+
* Mon Dec 19 2022 Joe Orton <[email protected]> - 1:2.4.19-2
103+
- package the "md" directory (#2154348)
104+
105+
* Thu Oct 6 2022 Joe Orton <[email protected]> - 1:2.4.19-1
106+
- update to 2.4.19
107+
108+
* Thu Jul 21 2022 Fedora Release Engineering <[email protected]> - 1:2.4.10-3
109+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
110+
111+
* Thu Jan 20 2022 Fedora Release Engineering <[email protected]> - 1:2.4.10-2
112+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
113+
114+
* Fri Dec 3 2021 Joe Orton <[email protected]> - 1:2.4.10-1
115+
- update to 2.4.10
116+
117+
* Fri Sep 17 2021 Joe Orton <[email protected]> - 1:2.4.7-1
118+
- update to 2.4.7
119+
120+
* Tue Sep 14 2021 Sahana Prasad <[email protected]> - 1:2.4.0-3
121+
- Rebuilt with OpenSSL 3.0.0
122+
123+
* Thu Jul 22 2021 Fedora Release Engineering <[email protected]> - 1:2.4.0-2
124+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
125+
126+
* Tue Mar 9 2021 Joe Orton <[email protected]> - 1:2.4.0-1
127+
- update to 2.4.0
128+
129+
* Tue Feb 2 2021 Joe Orton <[email protected]> - 1:2.3.7-1
130+
- update to 2.3.7 (beta)
131+
- use autosetup macro
132+
133+
* Tue Jan 26 2021 Fedora Release Engineering <[email protected]> - 1:2.2.8-5
134+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
135+
136+
* Fri Jan 22 2021 Joe Orton <[email protected]> - 1:2.2.8-4
137+
- update to 2.2.8
138+
139+
* Fri Aug 28 2020 Joe Orton <[email protected]> - 1:2.2.7-4
140+
- use _httpd_apxs macro
65141

66-
* Mon Sep 20 2021 Pawel Winogrodzki <[email protected]> - 1:2.2.7-3
67-
- Initial CBL-Mariner import from Fedora 32 (license: MIT).
68-
- Removing "mod_md-2.0.8-state_dir.patch" to make the build skip sections not supported in CBL-Mariner.
142+
* Tue Jul 28 2020 Fedora Release Engineering <[email protected]> - 1:2.2.7-3
143+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
69144

70145
* Tue Jun 23 2020 Alexander Bokovoy <[email protected]> - 1:2.2.7-2
71146
- mod_md does not work with ACME server that does not provide revokeCert or

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13542,8 +13542,8 @@
1354213542
"type": "other",
1354313543
"other": {
1354413544
"name": "mod_md",
13545-
"version": "2.2.7",
13546-
"downloadUrl": "https://github.com/icing/mod_md/releases/download/v2.2.7/mod_md-2.2.7.tar.gz"
13545+
"version": "2.4.26",
13546+
"downloadUrl": "https://github.com/icing/mod_md/releases/download/v2.4.26/mod_md-2.4.26.tar.gz"
1354713547
}
1354813548
}
1354913549
},

0 commit comments

Comments
 (0)