Skip to content

Commit f93449c

Browse files
Upgrade: mod_http2 version to 2.0.29 (#12921)
1 parent 97c618e commit f93449c

4 files changed

Lines changed: 104 additions & 33 deletions

File tree

SPECS-EXTENDED/mod_http2/mod_http2-1.14.1-buildfix.patch

Lines changed: 0 additions & 14 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_http2-1.15.14.tar.gz": "1574fda39d6776841eb11eb1263e584382ce4858d03f252ab5c82852f00836ab"
3+
"mod_http2-2.0.29.tar.gz": "8c4e6219f87f35879fb166a3c08574dea4f454814f3b739b854675a03c6f2d4e"
44
}
55
}

SPECS-EXTENDED/mod_http2/mod_http2.spec

Lines changed: 101 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,43 @@
1-
Vendor: Microsoft Corporation
2-
Distribution: Azure Linux
31
# Module Magic Number
42
%{!?_httpd_mmn: %global _httpd_mmn %(cat %{_includedir}/httpd/.mmn 2>/dev/null || echo 0-0)}
53

64
Name: mod_http2
7-
Version: 1.15.14
8-
Release: 2%{?dist}
5+
Version: 2.0.29
6+
Release: 3%{?dist}
97
Summary: module implementing HTTP/2 for Apache 2
10-
License: ASL 2.0
8+
License: Apache-2.0
9+
Vendor: Microsoft Corporation
10+
Distribution: Azure Linux
1111
URL: https://icing.github.io/mod_h2/
1212
Source0: https://github.com/icing/mod_h2/releases/download/v%{version}/mod_http2-%{version}.tar.gz
13-
Patch1: mod_http2-1.14.1-buildfix.patch
13+
BuildRequires: make
1414
BuildRequires: gcc
15-
BuildRequires: pkgconfig, httpd-devel >= 2.4.20, libnghttp2-devel >= 1.7.0, openssl-devel >= 1.0.2
16-
Requires: httpd-mmn
17-
Conflicts: httpd < 2.4.25-8
15+
BuildRequires: pkgconfig
16+
BuildRequires: httpd-devel >= 2.4.20
17+
BuildRequires: libnghttp2-devel >= 1.7.0
18+
BuildRequires: openssl-devel >= 1.0.2
19+
BuildRequires: autoconf
20+
BuildRequires: libtool
21+
BuildRequires: /usr/bin/hostname
22+
Requires: httpd-mmn
23+
Conflicts: httpd < 2.4.48
24+
# https://bugzilla.redhat.com/show_bug.cgi?id=2131458
25+
Conflicts: libnghttp2 < 1.50.0-1
1826

1927
%description
2028
The mod_h2 Apache httpd module implements the HTTP2 protocol (h2+h2c) on
2129
top of libnghttp2 for httpd 2.4 servers.
2230

2331
%prep
24-
%setup -q
25-
%patch 1 -p1 -b .buildfix
32+
%autosetup
2633

2734
%build
28-
%configure
29-
make %{?_smp_mflags} V=1
35+
autoreconf -i
36+
%configure --with-apxs=%{_httpd_apxs}
37+
%make_build
3038

3139
%install
32-
make DESTDIR=%{buildroot} install
40+
%make_install
3341
rm -rf %{buildroot}/etc/httpd/share/doc/
3442

3543
# create configuration
@@ -46,8 +54,85 @@ echo "LoadModule proxy_http2_module modules/mod_proxy_http2.so" > %{buildroot}%{
4654
%{_httpd_moddir}/mod_proxy_http2.so
4755

4856
%changelog
49-
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 1.15.14-2
50-
- Initial CBL-Mariner import from Fedora 33 (license: MIT).
57+
* Wed Mar 12 2025 Akhila Guruju <v-guakhila@microsoft.com> - 2.0.29-3
58+
- Initial Azure Linux import from Fedora 41 (license: MIT).
59+
- License verified
60+
61+
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.29-2
62+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
63+
64+
* Thu Jul 11 2024 Luboš Uhliarik <luhliari@redhat.com> - 2.0.29-1
65+
- new version 2.0.29
66+
67+
* Fri Apr 5 2024 Joe Orton <jorton@redhat.com> - 2.0.27-1
68+
- update to 2.0.27
69+
70+
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.26-3
71+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
72+
73+
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.26-2
74+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
75+
76+
* Wed Jan 17 2024 Luboš Uhliarik <luhliari@redhat.com> - 2.0.26-1
77+
- new version 2.0.26
78+
79+
* Sat Oct 21 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.0.25-1
80+
- new version 2.0.25
81+
82+
* Mon Sep 11 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.0.22-1
83+
- new version 2.0.22
84+
85+
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.18-2
86+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
87+
88+
* Thu Jun 01 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.0.18-1
89+
- new version 2.0.18
90+
- SPDX migration
91+
92+
* Wed Apr 12 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.0.14-1
93+
- new version 2.0.14
94+
95+
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-2
96+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
97+
98+
* Tue Dec 20 2022 Joe Orton <jorton@redhat.com> - 2.0.11-1
99+
- update to 2.0.11
100+
- fix conflict with older libnghttp2
101+
102+
* Thu Oct 6 2022 Joe Orton <jorton@redhat.com> - 2.0.9-1
103+
- update to 2.0.9
104+
105+
* Fri Sep 23 2022 Joe Orton <jorton@redhat.com> - 2.0.7-1
106+
- update to 2.0.7
107+
108+
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.24-3
109+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
110+
111+
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.24-2
112+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
113+
114+
* Fri Sep 17 2021 Joe Orton <jorton@redhat.com> - 1.15.24-1
115+
- update to 1.15.24
116+
117+
* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 1.15.23-2
118+
- Rebuilt with OpenSSL 3.0.0
119+
120+
* Fri Aug 6 2021 Joe Orton <jorton@redhat.com> - 1.15.23-1
121+
- update to 1.15.23
122+
123+
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.19-2
124+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
125+
126+
* Fri Jun 11 2021 Luboš Uhliarik <luhliari@redhat.com> - 1.15.19-1
127+
- new version 1.15.19
128+
- Resolves: #1968014 - CVE-2021-31618 httpd: NULL pointer dereference on
129+
specially crafted HTTP/2 request
130+
131+
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.14-3
132+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
133+
134+
* Thu Aug 27 2020 Joe Orton <jorton@redhat.com> - 1.15.14-2
135+
- use apxs via _httpd_apxs macro
51136

52137
* Mon Aug 17 2020 Joe Orton <jorton@redhat.com> - 1.15.14-1
53138
- update to 1.15.14

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13502,8 +13502,8 @@
1350213502
"type": "other",
1350313503
"other": {
1350413504
"name": "mod_http2",
13505-
"version": "1.15.14",
13506-
"downloadUrl": "https://github.com/icing/mod_h2/releases/download/v1.15.14/mod_http2-1.15.14.tar.gz"
13505+
"version": "2.0.29",
13506+
"downloadUrl": "https://github.com/icing/mod_h2/releases/download/v2.0.29/mod_http2-2.0.29.tar.gz"
1350713507
}
1350813508
}
1350913509
},

0 commit comments

Comments
 (0)