From 25376fc0c720a43b5d71162a5f6b8544797c81e0 Mon Sep 17 00:00:00 2001 From: Vijay Anusuri Date: Fri, 30 Aug 2024 16:12:18 +0530 Subject: [PATCH] apr: upgrade 1.7.4 -> 1.7.5 Refreshed patch 0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch Includes security fix CVE-2023-49582 changelog: https://downloads.apache.org/apr/CHANGES-APR-1.7 (From OE-Core rev: e650030ec8fe37b84e6ae37a2305453cc59fda31) Signed-off-by: Vijay Anusuri Signed-off-by: Richard Purdie (cherry picked from commit c5d9498466526451910fa02862f8860b2bb81df8) Signed-off-by: Steve Sakoman --- ...1-configure-Remove-runtime-test-for-mmap-that-can-map-.patch | 2 +- meta/recipes-support/apr/{apr_1.7.4.bb => apr_1.7.5.bb} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/apr/{apr_1.7.4.bb => apr_1.7.5.bb} (98%) diff --git a/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch b/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch index a78b16284f..3480deaa4d 100644 --- a/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch +++ b/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch @@ -34,7 +34,7 @@ index 3663220..dce9789 100644 -#ifdef HAVE_SYS_MMAN_H -#include -#endif -- int main() +- int main(int argc, const char *argv[]) - { - int fd; - void *m; diff --git a/meta/recipes-support/apr/apr_1.7.4.bb b/meta/recipes-support/apr/apr_1.7.5.bb similarity index 98% rename from meta/recipes-support/apr/apr_1.7.4.bb rename to meta/recipes-support/apr/apr_1.7.5.bb index 4df741c766..78796476e2 100644 --- a/meta/recipes-support/apr/apr_1.7.4.bb +++ b/meta/recipes-support/apr/apr_1.7.5.bb @@ -25,7 +25,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \ file://0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch \ " -SRC_URI[sha256sum] = "fc648de983f3a2a6c9e78dea1f180639bd2fad6c06d556d4367a701fe5c35577" +SRC_URI[sha256sum] = "cd0f5d52b9ab1704c72160c5ee3ed5d3d4ca2df4a7f8ab564e3cb352b67232f2" inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script