From 427c3e1ed6c1f909638976d74325945b549590cb Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Tue, 22 Mar 2022 12:46:16 +0800 Subject: apache2: upgrade 2.4.52 -> 2.4.53 ChangeLog: https://downloads.apache.org/httpd/CHANGES_2.4.53 Security fixes: CVE-2022-23943 CVE-2022-22721 CVE-2022-22720 CVE-2022-22719 Refresh patches. Signed-off-by: Yi Zhao Signed-off-by: Khem Raj (cherry picked from commit 81bbe65791459538ab578ac13e612f7dc6f692f0) Signed-off-by: Armin Kuster (cherry picked from commit d6c8d3a1bad2276001c3bdc09de4dee107357a1d) [Fixup for hardknott context, overrides] Signed-off-by: Armin Kuster --- ...-apxs.in-force-destdir-to-be-empty-string.patch | 49 ---------------------- 1 file changed, 49 deletions(-) delete mode 100644 meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch (limited to 'meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch') diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch b/meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch deleted file mode 100644 index bdedd146c2..0000000000 --- a/meta-webserver/recipes-httpd/apache2/apache2/0001-support-apxs.in-force-destdir-to-be-empty-string.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 705c0a7e9d9c1e64ee09fc0b54f6b5a4e27de1ca Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin -Date: Fri, 17 Apr 2020 06:31:35 -0700 -Subject: [PATCH] support/apxs.in: force destdir to be empty string - -If destdir is assigned to anything other than the empty string, the -search path for apache2 config files is appended to itself, and -related packages like apache-websocket will be unable to locate them: - -| cannot open -/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot//usr/share/apache2/build/config_vars.mk: -No such file or directory at -/ala-lpggp31/tgamblin/yocto/poky.git/build/tmp/work/core2-64-poky-linux/apache-websocket/0.1.1+gitAUTOINC+6968083264-r0/recipe-sysroot/usr/bin/crossscripts/apxs -line 213. - -Ensure that it is always the empty string so that apache-websocket -is able to find the required config files. - -Upstream-Status: Inappropriate (embedded-specific) - -Signed-off-by: Trevor Gamblin ---- - support/apxs.in | 10 ++++++---- - 1 file changed, 6 insertions(+), 4 deletions(-) - -diff --git a/support/apxs.in b/support/apxs.in -index 65e1288527..9d96e33728 100644 ---- a/support/apxs.in -+++ b/support/apxs.in -@@ -28,10 +28,12 @@ package apxs; - # is the empty string. - - my $destdir = ""; --my $ddi = rindex($0, "@exp_bindir@"); --if ($ddi >= 0) { -- $destdir = substr($0, 0, $ddi); --} -+# Comment out assignment of destdir so that it doesn't affect bitbake -+# cross-compilation setup -+#my $ddi = rindex($0, "@exp_bindir@"); -+#if ($ddi >= 0) { -+# $destdir = substr($0, 0, $ddi); -+#} - - my %config_vars = (); - --- -2.17.1 - -- cgit 1.2.3-korg