[Buildroot] [PATCH v2] package/apr: bump to version 1.7.5
Arnout Vandecappelle
arnout at rnout.be
Wed Apr 16 21:28:57 UTC 2025
On 07/04/2025 17:49, Dario Binacchi wrote:
> Release notes:
> https://downloads.apache.org/apr/CHANGES-APR-1.7
>
> Note: the upstream release note mention v1.7.5 is a security update.
> The package patch 0004-Merge-r1920082-from-1.8.x.patch in Buildroot
> was already fixing this security issue. This is why this commit is
> not marked as a security bump.
>
> Signed-off-by: Dario Binacchi <dario.binacchi at amarulasolutions.com>
Applied to 2025.02.x, 2024.11.x and 2024.02.x, thanks.
Regards,
Arnout
>
> ---
>
> Changes v1 -> v2:
> - Add 0003-Revert-Add-the-ability-to-cross-compile-APR.patch. It had
> been mistakenly removed and was causing test failures.
>
> ...Add-the-ability-to-cross-compile-APR.patch | 52 +++++++-------
> .../apr/0004-Merge-r1920082-from-1.8.x.patch | 71 -------------------
> package/apr/apr.hash | 4 +-
> package/apr/apr.mk | 5 +-
> 4 files changed, 30 insertions(+), 102 deletions(-)
> delete mode 100644 package/apr/0004-Merge-r1920082-from-1.8.x.patch
>
> diff --git a/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch
> index ad250d44279f..9d8fad13627c 100644
> --- a/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch
> +++ b/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch
> @@ -1,4 +1,4 @@
> -From ed1daed074fba0dabff825e63525d751b6bb7b8d Mon Sep 17 00:00:00 2001
> +From a8fd928dfab693278205e73286e3a6b622624aeb Mon Sep 17 00:00:00 2001
> From: Graham Leggett <minfrin at apache.org>
> Date: Tue, 31 Dec 2019 21:26:02 +0000
> Subject: [PATCH] Revert: Add the ability to cross compile APR.
> @@ -7,16 +7,18 @@ git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872147 13f7
>
> [Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c]
> Signed-off-by: Peter Seiderer <ps.report at gmx.net>
> +[Dario: adapt to 1.7.5]
> +Signed-off-by: Dario Binacchi <dario.binacchi at amarulasolutions.com>
> ---
> CHANGES | 2 --
> apr-config.in | 22 ----------------------
> 2 files changed, 24 deletions(-)
>
> diff --git a/CHANGES b/CHANGES
> -index 71b2f0e..e751c90 100644
> +index 793b0b6a46a4..4705b8476ff3 100644
> --- a/CHANGES
> +++ b/CHANGES
> -@@ -56,8 +56,6 @@ Changes for APR 1.7.1
> +@@ -119,8 +119,6 @@ Changes for APR 1.7.5
> *) Don't try to use PROC_PTHREAD by default when cross compiling.
> [Yann Ylavic]
>
> @@ -26,25 +28,25 @@ index 71b2f0e..e751c90 100644
> be executed at build time, use AX_PROG_CC_FOR_BUILD to
> build native tools/gen_test_char
> diff --git a/apr-config.in b/apr-config.in
> -index 4873fc0..84b4073 100644
> +index 1203d9a0d38e..bcd4a0c10399 100644
> --- a/apr-config.in
> +++ b/apr-config.in
> -@@ -48,14 +48,6 @@ APR_LIBNAME="@APR_LIBNAME@"
> - # NOTE: the following line is modified during 'make install': alter with care!
> - location=@APR_CONFIG_LOCATION@
> +@@ -61,14 +61,6 @@ if test "$cross_compiling" != "no"; then
> + # Remove trailing '/'
> + normalized_bindir=${normalized_bindir%/}
> +
> +- # absolute path, but not installed path - we're cross compiling
> +- case "$normalized_command" in
> +- "${normalized_bindir}/"*) ;;
> +- "/"*) location=crosscompile;
> +- APR_TARGET_DIR=${normalized_command%${normalized_bindir}/apr-${APR_MAJOR_VERSION}-config};
> +- ;;
> +- *) ;;
> +- esac
> + fi
>
> --# absolute path, but not installed path - we're cross compiling
> --case "$0" in
> -- "${bindir}/"*) ;;
> -- "/"*) location=crosscompile;
> -- APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;;
> -- *) ;;
> --esac
> --
> show_usage()
> - {
> - cat << EOF
> -@@ -101,8 +93,6 @@ fi
> +@@ -116,8 +108,6 @@ fi
>
> if test "$location" = "installed"; then
> LA_FILE="$libdir/lib${APR_LIBNAME}.la"
> @@ -53,7 +55,7 @@ index 4873fc0..84b4073 100644
> else
> LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la"
> fi
> -@@ -132,8 +122,6 @@ while test $# -gt 0; do
> +@@ -147,8 +137,6 @@ while test $# -gt 0; do
> --includedir)
> if test "$location" = "installed"; then
> flags="$includedir"
> @@ -62,7 +64,7 @@ index 4873fc0..84b4073 100644
> elif test "$location" = "source"; then
> flags="$APR_SOURCE_DIR/include"
> else
> -@@ -166,8 +154,6 @@ while test $# -gt 0; do
> +@@ -181,8 +169,6 @@ while test $# -gt 0; do
> --includes)
> if test "$location" = "installed"; then
> flags="$flags -I$includedir $EXTRA_INCLUDES"
> @@ -71,7 +73,7 @@ index 4873fc0..84b4073 100644
> elif test "$location" = "source"; then
> flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
> else
> -@@ -182,8 +168,6 @@ while test $# -gt 0; do
> +@@ -197,8 +183,6 @@ while test $# -gt 0; do
> --installbuilddir)
> if test "$location" = "installed"; then
> echo "${installbuilddir}"
> @@ -80,7 +82,7 @@ index 4873fc0..84b4073 100644
> elif test "$location" = "source"; then
> echo "$APR_SOURCE_DIR/build"
> else
> -@@ -200,8 +184,6 @@ while test $# -gt 0; do
> +@@ -215,8 +199,6 @@ while test $# -gt 0; do
> if test "$location" = "installed"; then
> ### avoid using -L if libdir is a "standard" location like /usr/lib
> flags="$flags -L$libdir -l${APR_LIBNAME}"
> @@ -89,7 +91,7 @@ index 4873fc0..84b4073 100644
> else
> ### this surely can't work since the library is in .libs?
> flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
> -@@ -219,8 +201,6 @@ while test $# -gt 0; do
> +@@ -234,8 +216,6 @@ while test $# -gt 0; do
> # Since the user is specifying they are linking with libtool, we
> # *know* that -R will be recognized by libtool.
> flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
> @@ -98,7 +100,7 @@ index 4873fc0..84b4073 100644
> else
> flags="$flags $LA_FILE"
> fi
> -@@ -245,8 +225,6 @@ while test $# -gt 0; do
> +@@ -260,8 +240,6 @@ while test $# -gt 0; do
> --apr-libtool)
> if test "$location" = "installed"; then
> echo "${installbuilddir}/libtool"
> @@ -108,5 +110,5 @@ index 4873fc0..84b4073 100644
> echo "$APR_BUILD_DIR/libtool"
> fi
> --
> -2.39.2
> +2.43.0
>
> diff --git a/package/apr/0004-Merge-r1920082-from-1.8.x.patch b/package/apr/0004-Merge-r1920082-from-1.8.x.patch
> deleted file mode 100644
> index 5d198def34cc..000000000000
> --- a/package/apr/0004-Merge-r1920082-from-1.8.x.patch
> +++ /dev/null
> @@ -1,71 +0,0 @@
> -From 36ea6d5a2bfc480dd8032cc8651e6793552bc2aa Mon Sep 17 00:00:00 2001
> -From: Eric Covener <covener at apache.org>
> -Date: Tue, 20 Aug 2024 21:50:42 +0000
> -Subject: [PATCH] Merge r1920082 from 1.8.x:
> -
> -use 0600 perms for named shared mem consistently
> -
> -
> -
> -
> -git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1920083 13f79535-47bb-0310-9956-ffa450edef68
> -Upstream: https://github.com/apache/apr/commit/36ea6d5a2bfc480dd8032cc8651e6793552bc2aa
> -Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
> ----
> - shmem/unix/shm.c | 18 +++++++-----------
> - 1 file changed, 7 insertions(+), 11 deletions(-)
> -
> -diff --git a/shmem/unix/shm.c b/shmem/unix/shm.c
> -index 096884d99..ea9b94277 100644
> ---- a/shmem/unix/shm.c
> -+++ b/shmem/unix/shm.c
> -@@ -287,10 +287,9 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
> - status = APR_SUCCESS;
> -
> - #if APR_USE_SHMEM_MMAP_TMP
> -- /* FIXME: Is APR_OS_DEFAULT sufficient? */
> -- status = apr_file_open(&file, filename,
> -- APR_READ | APR_WRITE | APR_CREATE | APR_EXCL,
> -- APR_OS_DEFAULT, pool);
> -+ status = apr_file_open(&file, filename,
> -+ APR_FOPEN_READ | APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_EXCL,
> -+ APR_FPROT_UREAD | APR_FPROT_UWRITE, pool);
> - if (status != APR_SUCCESS) {
> - return status;
> - }
> -@@ -319,8 +318,7 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
> - }
> - #endif /* APR_USE_SHMEM_MMAP_TMP */
> - #if APR_USE_SHMEM_MMAP_SHM
> -- /* FIXME: SysV uses 0600... should we? */
> -- tmpfd = shm_open(shm_name, O_RDWR | O_CREAT | O_EXCL, 0644);
> -+ tmpfd = shm_open(shm_name, O_RDWR | O_CREAT | O_EXCL, 0600);
> - if (tmpfd == -1) {
> - return errno;
> - }
> -@@ -361,10 +359,9 @@ APR_DECLARE(apr_status_t) apr_shm_create(apr_shm_t **m,
> - #elif APR_USE_SHMEM_SHMGET
> - new_m->realsize = reqsize;
> -
> -- /* FIXME: APR_OS_DEFAULT is too permissive, switch to 600 I think. */
> -- status = apr_file_open(&file, filename,
> -+ status = apr_file_open(&file, filename,
> - APR_FOPEN_WRITE | APR_FOPEN_CREATE | APR_FOPEN_EXCL,
> -- APR_OS_DEFAULT, pool);
> -+ APR_FPROT_UREAD | APR_FPROT_UWRITE, pool);
> - if (status != APR_SUCCESS) {
> - return status;
> - }
> -@@ -555,8 +552,7 @@ APR_DECLARE(apr_status_t) apr_shm_attach(apr_shm_t **m,
> - #if APR_USE_SHMEM_MMAP_SHM
> - const char *shm_name = make_shm_open_safe_name(filename, pool);
> -
> -- /* FIXME: SysV uses 0600... should we? */
> -- tmpfd = shm_open(shm_name, O_RDWR, 0644);
> -+ tmpfd = shm_open(shm_name, O_RDWR, 0600);
> - if (tmpfd == -1) {
> - return errno;
> - }
> ---
> -2.39.5
> -
> diff --git a/package/apr/apr.hash b/package/apr/apr.hash
> index 96f43d371002..7d231ee7cc57 100644
> --- a/package/apr/apr.hash
> +++ b/package/apr/apr.hash
> @@ -1,4 +1,4 @@
> -# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256
> -sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2
> +# From https://archive.apache.org/dist/apr/apr-1.7.5.tar.bz2.sha256
> +sha256 cd0f5d52b9ab1704c72160c5ee3ed5d3d4ca2df4a7f8ab564e3cb352b67232f2 apr-1.7.5.tar.bz2
> # Locally calculated
> sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE
> diff --git a/package/apr/apr.mk b/package/apr/apr.mk
> index 5a41891cef7c..d5b132658a1e 100644
> --- a/package/apr/apr.mk
> +++ b/package/apr/apr.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -APR_VERSION = 1.7.2
> +APR_VERSION = 1.7.5
> APR_SOURCE = apr-$(APR_VERSION).tar.bz2
> APR_SITE = https://archive.apache.org/dist/apr
> APR_LICENSE = Apache-2.0
> @@ -16,9 +16,6 @@ APR_INSTALL_STAGING = YES
> # so we need to autoreconf:
> APR_AUTORECONF = YES
>
> -# 0004-Merge-r1920082-from-1.8.x.patch
> -APR_IGNORE_CVES += CVE-2023-49582
> -
> APR_CONF_OPTS = --disable-sctp
>
> # avoid apr_hints.m4 by setting apr_preload_done=yes and set
More information about the buildroot
mailing list