From patchwork Mon Apr 7 15:49:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3898 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 488253F0CA for ; Mon, 7 Apr 2025 17:49:35 +0200 (CEST) Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-43941ad86d4sf25775135e9.2 for ; Mon, 07 Apr 2025 08:49:35 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1744040975; cv=pass; d=google.com; s=arc-20240605; b=SvCwhiEy+meDCwlikyQm1rl8C9hV3Ii4yDKu/AyxGVndMRu5i6oXrVIEIezHK5b13l 5m74H3pC9EDy50AqEsgnp2a0ggEx4WO4GUwdrTOtwi6OsCbmM3VWdiffmAkkbM8KBeO9 ZjjrrXah6uKoc1YEKeveGRtD6Jv7r7ksa+GlnrThY7GHkPQbbgG1E67o1fOn4/47m290 luWrceSrdhWzY8ephvWmdhmNsUMxbyqQVEg+veXf4PSgwFzNu3l3BNIZt0/+O/2GBNwZ +u9YKXSQT9FX5rKcY48FABpke336EDfBUeeSd8SLHKkCQ4JKj1cuk6IeK6p103vs42i9 tMJw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=8Vr1EPF0m4ZXOLdqwvWSQiQCkzQdNx+rcncTdlFfKUo=; fh=UDhtoYTArbYpSX/OSxZP7zADqG41D2mGOIkJaY4uelw=; b=Nix9I9F6K/DdLHYbfyJe8vhC85FFhQ406GhpdJF3DA8hAPAMvAbnXEStUmZ2ykBIpr z4W89hVM24bSVv2Srb7aSc7aTHOWzhCbLQcuCRXDip6uZ8+sM9v0GQ2/yYBoxpEo0tBK UISSUsN/Sg7/E+darun73KgnonPLtuNwE2sPbJWj79F5u4Y9SIklUdp6ivkufdVCTLyX 7keHb3UKRsgbnrwGcud64zBcrOEF04RucLr5ASujHmHEXRiPzg84BVpZzrMdyPHQbS2M grR1L5ifc46FqfBrJomQTeNXC9NmF/3TjOGDdOAbBGwU16DhZ58X/yFXB/XlJucpRIlG JHvw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Yy+ywp+Z; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1744040975; x=1744645775; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=8Vr1EPF0m4ZXOLdqwvWSQiQCkzQdNx+rcncTdlFfKUo=; b=AhGEKItANGLvAJI9ENGaDBu6UxBRF8WjKvMyNSOcI/u1goavNKQhSMotLkaOUCC700 nOgHposfWj+p8k6qebyidiedBMUZGT8VOl5dB3m9UNGhmvCNEKQzqFO6qjc0iyaZHYMx oP1ZeTCVmrFfcrpTor+fnA0J+SE3mLGKrFYZs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744040975; x=1744645775; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8Vr1EPF0m4ZXOLdqwvWSQiQCkzQdNx+rcncTdlFfKUo=; b=bYVFZu8bYvVZAwqttT1v9rD2iY4CC+I0qJhB2Djha4oaLbWRY8d2LT+erFvv3+AGTJ ekwVJqr3R7fQtyvs/vqM7ECzbZ11SWV9MG0U8JNO0FWdpptFy26hRNzd/Dctg1K7AJno 6XRLKqAmxsPwDwIsgxwUVeQjNFtD9p5erm79ycnvCSeydWz4O1NM/Fhknom9uafVktCN GS1gF2w31WhQeRHxFly85dc7HhciiTsN4+wMfDnS222zesF1xUyG38Dvhf8lKtn7d+UM YaECihI26qyj4BaH93liyHDN7scoNHtWRCGCeWNHecps4Riw8fEX2uqkSgsTDL6aHz3o H4Pw== X-Forwarded-Encrypted: i=2; AJvYcCUj+Z1T2y/DIeUwgDmqk4tBXHuRN/mW2OPnP6UqTyjhfqiCWOlhU5pXjvipnXS2LZGSDv8KiV+FpogRU7DL@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YyW5Y7EJ4Fe8pEklPwmUr0V508cDq8hymGyiG931udObDSgmjf2 wh7yYz9paK/J9HgvRT14tSYq8SFplZeqDlW7N1SxHoFebACXLeq4Ymsur1rcN6DknA== X-Google-Smtp-Source: AGHT+IGU1bpauoCS3bK+Ufo1UKIUsy2YpDUxAZfogIOtqEAVzubK1dYs+nljUed+Q/nqnkGpfgCsJQ== X-Received: by 2002:a05:600c:3b1b:b0:43c:ec4c:25b1 with SMTP id 5b1f17b1804b1-43ee076d701mr68685475e9.23.1744040974437; Mon, 07 Apr 2025 08:49:34 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=ARLLPAIImoMf+IFWWPj+YMwM/EdHzavsWNbdslpsyE7JRgzM+g== Received: by 2002:a05:600c:b58:b0:43c:f009:43c2 with SMTP id 5b1f17b1804b1-43ebea4903fls21053745e9.0.-pod-prod-03-eu; Mon, 07 Apr 2025 08:49:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUbBanFR96JUpcrjPDrrSHyzMGo1zkesdO7gP9pcBks50WqvYZeBvoFdQEgF9tHruCG1IBSOUCy5uoXnBRJ@amarulasolutions.com X-Received: by 2002:a05:600c:19cc:b0:43d:300f:fa51 with SMTP id 5b1f17b1804b1-43ee06605f9mr78870555e9.9.1744040972091; Mon, 07 Apr 2025 08:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744040972; cv=none; d=google.com; s=arc-20240605; b=QzdiD5Hmy0+5bTEJYWJbNmtfOrsYzk7eTJImzfKZysypuhYFEe8/BvNQo02Y9YVrer XotBkaI9da7sEJ5uOzVbL0gOl/3t+ahMCaZ0Q55JNyDcwyKnx+6fGNz5bucr50wpvcqo jCOk7/H+oYCzsHNsPbrJ8Ft6vgWAotrKHVlJ+rRKmtvDLyj69r2bbNg7fdgcnrepJUNi L0NSmAilWgU9fK7gEj4hFE5sC9ahNcFEcPTnEnEory5D2x5oAQtqQVxMwhFBg5y31QeV LsS8MSwtk1FdrugbonOuc1xU4NemcjSBKba2FF+yeldKbueaBsW89BUIueF9XhRh58wm QCIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=diEPgktqV2gabSutUH6KV2Bo3GfStt63eDZFVyzFtPY=; fh=DG7p33Jr9uQoqMC88OIaULXy8SpulzUnkhm6zmc+230=; b=eXOMYG+5p1L2qnn7Yrly5rXqeHT9FOumQb7cDil62UPBn9KRKOfhvFIKRBBX9JKCMm xoP2KrjEf2ypEnfR/VO7WxZF4LQYVB74OA35Zz9PzK5jZScOSVV4GJGVLIHD9r0K2Nr6 jBYiAPZ+LKAhvaiFhG/WhtIDljSKfLg+XDHueBqerbqn8q5OKuLmBkU0bRI6seoOmjCb gEpTADPXWhsk6wrrdBV/3gZud9j6wE3nwWapzp9KuuEQpz7x/ej2e+d2bZl19ja1FVLb gJ8U22StN6HhNpwes6xQ/CRJuZN+sfLGz2AmOYeRgOGzAoes1uT2abNtfOK8nqscAW+b nzKw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Yy+ywp+Z; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id 5b1f17b1804b1-43ec266b942sor39150365e9.1.2025.04.07.08.49.31 for (Google Transport Security); Mon, 07 Apr 2025 08:49:32 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCUL+r19PRTjmq+Zy05dEwUVeATJGDrcthsChtSJAEArwuN8ScD1CaK5UZ+2MehMgW8P2nJGfpOukAW6Dwg2@amarulasolutions.com X-Gm-Gg: ASbGnctaDHU64bv9bYoBi9W6EilfablAb9Vlk5CAtVYglnhWIv/TlMwWFKefdhnBWij uRdPsHT0hD1UspVTTmQuclKkfKuFatUcB+wICCvRXMBwuO8gQhTSmBSHfZCpsWorp870q/5ZA4I OUyR9wo5AF7pg2POtG8yn8iPmpqJuwrPOJdAT8I0yTHw8wtSI2jMGAy9FaHyKM6ZGDLXceaesk3 GclB67imIoFCR60cSu5XyFATBUark6L4pxLq9v7wWSyGnOrPZ/vJt3LVqAz63fx8vuXLnpFMN1K wS8vskWvuEGpajpBEqUJgM37/V3QA0QQS2LJeGs76MNRW03WURFTyVgD1CL59yMy8WHlF+Ov9uf VeacjzNYRro0/cjoiTij8yvpXIvUkjycNygBpZfBsvIiH9g== X-Received: by 2002:a05:6000:40c9:b0:39c:dcc:6451 with SMTP id ffacd0b85a97d-39d6fce0e99mr7536173f8f.43.1744040971557; Mon, 07 Apr 2025 08:49:31 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.42.133]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ea8d1673dsm154843435e9.0.2025.04.07.08.49.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Apr 2025 08:49:31 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Bernd Kuhls , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2] package/apr: bump to version 1.7.5 Date: Mon, 7 Apr 2025 17:49:28 +0200 Message-ID: <20250407154928.1511637-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Yy+ywp+Z; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- 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 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 +[Dario: adapt to 1.7.5] +Signed-off-by: Dario Binacchi --- 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 -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 ---- - 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