On 4/15/20 7:02 PM, Peter Kjellerstedt wrote:
-----Original Message-----
From: [email protected] <openembedded-
[email protected]> On Behalf Of Trevor Gamblin
Sent: den 15 april 2020 02:10
To: Khem Raj <[email protected]>
Cc: openembeded-devel <[email protected]>
Subject: Re: [oe] [meta-webserver][PATCH] apache2: upgrade 2.4.41 ->
2.4.43
On 4/14/20 6:38 PM, Khem Raj wrote:
apache-websockets does not like it
https://errors.yoctoproject.org/Errors/Details/403771/
Thanks, will take a look at it and re-send.
It appears they have added cross compilation support to apxs, but
it clashes with the changes done in OE to make it support cross
compilation. I tried to solve it by basically removing the OE
changes, but it was not as simple as that. In the end we worked
around it with this quick fix:
apache_sysroot_preprocess_append() {
# Disable apxs' built in cross compilation support and rely on what the
# recipe sets up.
sed -i 's!$destdir = .*!$destdir = "";!'
${SYSROOT_DESTDIR}${bindir_crossscripts}/apxs
}
However, I hope you can come up with a better solution that
actually makes use of what they did upstream and thus lessen
the changes that have to be applied by OE.
Hi Peter,
Ironically I'm seeing your email just as I submit a v2 reverting their
cross-compilation changes. I wasn't able to find a better workaround
than just reverting the destdir stuff that they added, but I did it via
a patch file instead of within the recipe itself. I do like your
approach better though, as it avoids adding a patch file that'll have to
be maintained. Do you want to submit your fix in lieu of mine?
Cheers,
Trevor
//Peter
On Tue, Apr 14, 2020 at 12:49 PM Trevor Gamblin
<[email protected]> wrote:
LICENSE file was updated due to a typo fix.
Note that this upgrade fixes two CVES affecting versions
2.4.41 and earlier:
CVE: CVE-2020-1927
CVE: CVE-2020-1934
See:
https://nvd.nist.gov/vuln/detail/CVE-2020-1927
https://nvd.nist.gov/vuln/detail/CVE-2020-1934
Signed-off-by: Trevor Gamblin <[email protected]>
---
.../apache2/{apache2_2.4.41.bb => apache2_2.4.43.bb} | 6 +++-
--
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta-webserver/recipes-httpd/apache2/{apache2_2.4.41.bb =>
apache2_2.4.43.bb} (97%)
diff --git a/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb
b/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb
similarity index 97%
rename from meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb
rename to meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb
index a34734c20..2fff153fc 100644
--- a/meta-webserver/recipes-httpd/apache2/apache2_2.4.41.bb
+++ b/meta-webserver/recipes-httpd/apache2/apache2_2.4.43.bb
@@ -24,9 +24,9 @@ SRC_URI_append_class-target = " \
file://volatiles.04_apache2 \
"
-LIC_FILES_CHKSUM =
"file://LICENSE;md5=d52d0fd0bc788f068e647116c01ddfcd"
-SRC_URI[md5sum] = "dfc674f8f454e3bc2d4ccd73ad3b5f1e"
-SRC_URI[sha256sum] =
"133d48298fe5315ae9366a0ec66282fa4040efa5d566174481077ade7d18ea40"
+LIC_FILES_CHKSUM =
"file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
+SRC_URI[md5sum] = "791c986b1e70fe61eb44060aacc89a64"
+SRC_URI[sha256sum] =
"a497652ab3fc81318cdc2a203090a999150d86461acff97c1065dc910fe10f43"
S = "${WORKDIR}/httpd-${PV}"
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#83956):
https://lists.openembedded.org/g/openembedded-devel/message/83956
Mute This Topic: https://lists.openembedded.org/mt/73018511/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
