diff options
author | Dylan Turner <dylan.turner@ni.com> | 2023-11-27 10:14:29 -0600 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-11-27 13:39:53 -0800 |
commit | 9f0b5053410d5958e089351b93199efd3473d3de (patch) | |
tree | e0719f2e8845a1875406d07f155048068992257e /meta-webserver | |
parent | eff650e3f6d5e28bedd855fa761f3f3f706f74bb (diff) | |
download | meta-openembedded-9f0b5053410d5958e089351b93199efd3473d3de.tar.gz |
apache2: v2.4.57 to v2.4.58 to fix CVE-2023-43622
Note that patch 0011-modules... is no longer needed as it's included in
the upgrade as well.
CVE: CVE-2023-43622
Signed-off-by: Dylan Turner <dylan.turner@ni.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch | 31 | ||||
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb (renamed from meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb) | 3 |
2 files changed, 1 insertions, 33 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch b/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch deleted file mode 100644 index 9accbf18a..000000000 --- a/meta-webserver/recipes-httpd/apache2/apache2/0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 5c9257fa34335ff83f7c01581cf953111072a457 Mon Sep 17 00:00:00 2001 | ||
2 | From: Valeria Petrov <valeria.petrov@spinetix.com> | ||
3 | Date: Tue, 18 Apr 2023 15:38:53 +0200 | ||
4 | Subject: [PATCH] * modules/mappers/config9.m4: Add 'server' directory to | ||
5 | include path if mod_rewrite is enabled. | ||
6 | |||
7 | Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1909241] | ||
8 | |||
9 | --- | ||
10 | modules/mappers/config9.m4 | 5 +++++ | ||
11 | 1 file changed, 5 insertions(+) | ||
12 | |||
13 | diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4 | ||
14 | index 55a97ab993..7120b729b7 100644 | ||
15 | --- a/modules/mappers/config9.m4 | ||
16 | +++ b/modules/mappers/config9.m4 | ||
17 | @@ -14,6 +14,11 @@ APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , mos | ||
18 | APACHE_MODULE(alias, mapping of requests to different filesystem parts, , , yes) | ||
19 | APACHE_MODULE(rewrite, rule based URL manipulation, , , most) | ||
20 | |||
21 | +if test "x$enable_rewrite" != "xno"; then | ||
22 | + # mod_rewrite needs test_char.h | ||
23 | + APR_ADDTO(INCLUDES, [-I\$(top_builddir)/server]) | ||
24 | +fi | ||
25 | + | ||
26 | APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current]) | ||
27 | |||
28 | APACHE_MODPATH_FINISH | ||
29 | -- | ||
30 | 2.25.1 | ||
31 | |||
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb b/meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb index bbc1c6c48..e4f7e1ceb 100644 --- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.57.bb +++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.58.bb | |||
@@ -16,7 +16,6 @@ SRC_URI = "${APACHE_MIRROR}/httpd/httpd-${PV}.tar.bz2 \ | |||
16 | file://0008-Fix-perl-install-directory-to-usr-bin.patch \ | 16 | file://0008-Fix-perl-install-directory-to-usr-bin.patch \ |
17 | file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \ | 17 | file://0009-support-apxs.in-force-destdir-to-be-empty-string.patch \ |
18 | file://0001-make_exports.awk-not-expose-the-path.patch \ | 18 | file://0001-make_exports.awk-not-expose-the-path.patch \ |
19 | file://0011-modules-mappers-config9.m4-Add-server-directory-to-i.patch \ | ||
20 | " | 19 | " |
21 | 20 | ||
22 | SRC_URI:append:class-target = " \ | 21 | SRC_URI:append:class-target = " \ |
@@ -28,7 +27,7 @@ SRC_URI:append:class-target = " \ | |||
28 | " | 27 | " |
29 | 28 | ||
30 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" | 29 | LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" |
31 | SRC_URI[sha256sum] = "dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a" | 30 | SRC_URI[sha256sum] = "fa16d72a078210a54c47dd5bef2f8b9b8a01d94909a51453956b3ec6442ea4c5" |
32 | 31 | ||
33 | S = "${WORKDIR}/httpd-${PV}" | 32 | S = "${WORKDIR}/httpd-${PV}" |
34 | 33 | ||