From patchwork Sun Apr 6 15:09:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3897 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B08C740D2B for ; Sun, 6 Apr 2025 17:09:36 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-5e5be5ec846sf3070931a12.2 for ; Sun, 06 Apr 2025 08:09:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1743952176; cv=pass; d=google.com; s=arc-20240605; b=fcc25jUtjCt8cox2jWF/BehA8nrkEZWKOke9Qkw8IT1P33Vn7OiHnb5BfdeSbsKlSN 71KRU0XXu9S7tWWpjhV6mGLUh8ZQAUuQCrlSWJJUQVDj0romjis0AqXSvTZh1SDG0NE8 C+/zKtV0mTNixw2Azteis12vbHjWNjcSDIFlVjL/88/w0CrP37A+u4SJ+Zj+UKme1VB+ u3KXQoWiHFeh6FS/U0gzxNaYzGn4ZfHXeKUXSa7dvfSCFRgicAvuVXUM3RlSoplBC92T JJmG1fXtMFlm931qDy3wweKFpty2+5aRSjm8s5GV+zE1zCMAa0hhbH3uq9NSX0U0L/uA ObVQ== 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=Z/BL/ozh2gOj0SPumBHgNE0cjT2ufjP1hsse9ftJl84=; fh=9l9ceV9DGCEdcFLOpL+2FLuNmhlX8nLRAiXL2lQkgZ0=; b=EFYZBU3S9Ua2hXkb1uJORavUMBsVuUby4OWXZcsdOG83/I52S+aHvr2vGpvIiupQ9S vBFsaDfiED0eG+2k/KkvM60tca8D98zHQmWJkhIp/J6/++92ZHbQAdZbIkBbbzOBNOC8 Nt38HD+8UM5mEiKPKkkvKy1mqn04/pWRyE3QujLgqGKXD8q6dOVM/yLgfdEcUksgmzH4 CQT7gB9I/2QVCQ0YL5QixhYDIAKh7veRhf/5Ewk6LYs0qHrN0VqoFN8AzBaLzvgyPobe bWmO+PIhiEfWYrhFcqpY6cuEpfnlCNJkWpiB+l0/lgy1F+CAmXGEdjs07MRPGTNS+Dqw oKpA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=rl46va1p; 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=1743952176; x=1744556976; 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=Z/BL/ozh2gOj0SPumBHgNE0cjT2ufjP1hsse9ftJl84=; b=CB/L0S1lUu4MeHN1773QleDDofFd3Rhvu/WxH/lomclCDkm+iXOb9nqgKGWd9y/z0E /LdG/SK7AZf8xMLq8jhHVHDym28SCIPgoGqnVjRyeUb4MrDgQ5Y+RvQx3r+MVvAbsAiX XdaWWlKp/pFrGr7LtjBRb/Rjbh3Kh1OTxLdm0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743952176; x=1744556976; 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=Z/BL/ozh2gOj0SPumBHgNE0cjT2ufjP1hsse9ftJl84=; b=a/Yi2ifTIZYIADGgBnn4aDkxuSiOB3Jk7pe4JLNtXGrPyapPObczPL5R3WsQ4S1M1V MRBRc3qH4ngpTuiL3zHEgickGenWDz7kzHGu5VwBAqePWXi2JgOqt08u0Qe7v5vuC2+W FblLyNmv7IO+h9viacoNWvL9fAo8XZtGV9DZdy4Oeu17fFsNA5fCQsaN3DB1Rg7jGTBy jV7HxlDTG8ld/93LwEEyBgEDa8cBjTewLeQai9EjNot/BNUCHY0lBa2AsnAxeZXY0jGY vdjt2RxY32i+HfOXbqK8h4Bvp+w7tRSsvjU9A5KZTFM48Q6h020Syr4Sp+zC6BtUX1FA bhog== X-Forwarded-Encrypted: i=2; AJvYcCXeDCBcO7O97Cw44FMtLxALtaox6UrI/Gv0KwA8ipns6WIrDXW+zbcgkYnxegXOi74m1LFZoQsldBUtgLX5@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yz9Bc3Bvkzu4bDI9hkoi6T4KvZOL5ytHC/WG5pmCQueiNqhinnl WhTIE0FIcveZwoAqnvX30Lij9Zzp7eDq8cqA+1d3PvBZ1eZLHms8M4Ay+Tm/yqxqWQ== X-Google-Smtp-Source: AGHT+IE09vRPaXASBG+FneylJ0g+tlhMMXtys3WL9N4ElqTQZQLiGuxe1rGuVptFNbcLh0KI6yVjiA== X-Received: by 2002:a05:6402:34c1:b0:5e5:bfab:51f with SMTP id 4fb4d7f45d1cf-5f0b5c43ba6mr8056901a12.0.1743952175836; Sun, 06 Apr 2025 08:09:35 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=ARLLPAItIddu9jynLyTePbXhvmIG5aSiIRFnfwakS9kAAZQ+YA== Received: by 2002:a50:d793:0:b0:5dc:d1a6:1880 with SMTP id 4fb4d7f45d1cf-5f0845b1340ls137436a12.2.-pod-prod-07-eu; Sun, 06 Apr 2025 08:09:33 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVJKDD5QaucorxGR3K55ASXJsw/dwd+sxwqiGan/c7hZKgUqY10l9N0F+XehmBwkFgu7NQIOtBAJu9cufbL@amarulasolutions.com X-Received: by 2002:a17:907:2cc5:b0:ac7:391a:e2d5 with SMTP id a640c23a62f3a-ac7d6e9fedfmr807240266b.60.1743952173259; Sun, 06 Apr 2025 08:09:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743952173; cv=none; d=google.com; s=arc-20240605; b=a3D1O4/WzpvWkLEQu1bXTWTJz3Cx1K++5pqQZInu8i8+T2nrh2AJxupriPnGAM08wm 3KbAFwIJpYgUnXUjG2MA//tR0a0p/RJzCdQzTarWE5qKhrtqC/wfbER3BrPFAJSJmPYS mvNnkLd4FIQqf8SYlmCTI7ji08SBXz662qbmysoJpOvoNSGsMb6vJsYJr+WyiOW8/uUj npW/0qoEE2JYopbQCe+BFKIQOnbReUE9RAWSrY82Fd9ElYRBKbGqxz4ckHkyhaKBK6Es igw7BPItsrKg/3e5rWCIZnZkFm3Dt3wqJJJHOW9Y/QRYNdm2UPFfsp/I8km6yqdO1QT0 DZ0Q== 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=sviwo2sgd7Pc8Un5AlX0UEmbAj9ratKuPJ7+nfPsp28=; fh=s8toYUg55tV6jjiIXadNdNfb5rTEJ81KoqO3VLu4Sxs=; b=KygNjncbO0mknEnSdZn9248H6qgLD/x+Ugfwch7DWyQaJt1an29CQCCh68j06pBJLS bK1LtI0GQD9gV3hp6aXK8JPVErXnr1yB/BDsrkuxsBmDfxkPT1yY61Cy/bnKdJ069OjP 3s10cWytSLdxgPJrvVPaMMiQvoDGFfv+ksSjMhkDGKR4A6x97Cz7mE0wopO4No0gqbDb PjzwSFSyq25HzK9Da+lZwq0cjrEgphRJhPXN2qMIHwIKHeAmhS3UUNOquola4/cJi3UK gYhdMNc0yzgaND7Q/H9gVcA/DRMKvD015OkoLI/CaVEBRnw0xJo2jbla4Fqdjrz0iXVo 9DUA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=rl46va1p; 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 a640c23a62f3a-ac7c08d6a93sor326100066b.5.2025.04.06.08.09.33 for (Google Transport Security); Sun, 06 Apr 2025 08:09:33 -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; AJvYcCVqcQEN2S1EtZC4XWd2ZB8izxNad5GNL/xdS5Cwusy98CymO2q0jKwNSoup70bvGR8INUZngWsrxue1v+Pm@amarulasolutions.com X-Gm-Gg: ASbGncsLJLX7EDROt/thAvHhX5H9qUrm3JW4fMuhnnadcZo8CnrCezTJQkGhLNNPCwi 8k5TMsXOQzEK2pymlIsBgTFneuYIU+JA+3kpTNzcosncjsaJnvanFsVlPXgM3k5K2UClChRFx4d vfaHRJRmXtXpNHoJoARL4+6e0+e+YLEY5npOuiNcRUqzzRrCHyOC/RPnMik+VOiY40xMJS3eBXn F7JFPa+4LdJxJvGIVQ5c88jkoFDMGxJaFNvDl/80AKdgl6xC16QPS8HwR1IB8Y7gcN8XpUfS3Ko IWt4oXlPD0K1saCWhXGEQ9guPuLtJcTg5egh1yoftxCYL5OiQyASEbWakm6+xhsvefd1yi0wreW xheWY9I72OwRnM+71EBL0/68kOQ+QBI1Pf09RC8CmaODNlK75IgLVwIHTf2kyMB/kGlPiaHaaEI 7Lu5hggglsB60= X-Received: by 2002:a17:907:6d0f:b0:ac1:e1e1:1f30 with SMTP id a640c23a62f3a-ac7d6e06422mr611052966b.38.1743952172528; Sun, 06 Apr 2025 08:09:32 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-25-86-232.retail.telecomitalia.it. [79.25.86.232]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ac7bfeed008sm589425666b.85.2025.04.06.08.09.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Apr 2025 08:09:32 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Bernd Kuhls , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/apr: bump to version 1.7.5 Date: Sun, 6 Apr 2025 17:09:29 +0200 Message-ID: <20250406150929.691964-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=rl46va1p; 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 The removal of patches: - 0003-Revert-Add-the-ability-to-cross-compile-APR.patch - 0004-Merge-r1920082-from-1.8.x.patch is respectively related to commits [1] and [2] included in the new release. [1] https://github.com/apache/apr/commit/6ab04292969c5d85f0b51f3c9eba9aabf4c44ab0 [2] https://github.com/apache/apr/commit/36ea6d5a2bfc480dd8032cc8651e6793552bc2aa Signed-off-by: Dario Binacchi --- .checkpackageignore | 1 - ...Add-the-ability-to-cross-compile-APR.patch | 112 ------------------ .../apr/0004-Merge-r1920082-from-1.8.x.patch | 71 ----------- package/apr/apr.hash | 4 +- package/apr/apr.mk | 5 +- 5 files changed, 3 insertions(+), 190 deletions(-) delete mode 100644 package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch delete mode 100644 package/apr/0004-Merge-r1920082-from-1.8.x.patch diff --git a/.checkpackageignore b/.checkpackageignore index 1a61aa1ac016..d8929cf83688 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -269,7 +269,6 @@ package/apitrace/0002-gltrace-Avoid-__libc_dlsym-and-__libc_dlopen_mode-on-GLIBC package/apr-util/0001-remove-checkapr.patch lib_patch.Upstream package/apr/0001-sys-param-h.patch lib_patch.Upstream package/apr/0002-Revert-Backport-r1872164.-Fix-the-name-of-libtool-wh.patch lib_patch.Upstream -package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch lib_patch.Upstream package/arptables/0001-Fix-musl-build-issue.patch lib_patch.Upstream package/arptables/0002-libarptc-libarptc_incl.c-fix-build-with-O0.patch lib_patch.Upstream package/asterisk/0001-sounds-do-not-download-and-check-sha1s.patch lib_patch.Upstream 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 deleted file mode 100644 index ad250d44279f..000000000000 --- a/package/apr/0003-Revert-Add-the-ability-to-cross-compile-APR.patch +++ /dev/null @@ -1,112 +0,0 @@ -From ed1daed074fba0dabff825e63525d751b6bb7b8d 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. - -git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872147 13f79535-47bb-0310-9956-ffa450edef68 - -[Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c] -Signed-off-by: Peter Seiderer ---- - CHANGES | 2 -- - apr-config.in | 22 ---------------------- - 2 files changed, 24 deletions(-) - -diff --git a/CHANGES b/CHANGES -index 71b2f0e..e751c90 100644 ---- a/CHANGES -+++ b/CHANGES -@@ -56,8 +56,6 @@ Changes for APR 1.7.1 - *) Don't try to use PROC_PTHREAD by default when cross compiling. - [Yann Ylavic] - -- *) Add the ability to cross compile APR. [Graham Leggett] -- - *) While cross-compiling, the tools/gen_test_char could not - 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 ---- 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@ - --# 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 - - if test "$location" = "installed"; then - LA_FILE="$libdir/lib${APR_LIBNAME}.la" --elif test "$location" = "crosscompile"; then -- LA_FILE="$APR_TARGET_DIR/$libdir/lib${APR_LIBNAME}.la" - else - LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la" - fi -@@ -132,8 +122,6 @@ while test $# -gt 0; do - --includedir) - if test "$location" = "installed"; then - flags="$includedir" -- elif test "$location" = "crosscompile"; then -- flags="$APR_TARGET_DIR/$includedir" - elif test "$location" = "source"; then - flags="$APR_SOURCE_DIR/include" - else -@@ -166,8 +154,6 @@ while test $# -gt 0; do - --includes) - if test "$location" = "installed"; then - flags="$flags -I$includedir $EXTRA_INCLUDES" -- elif test "$location" = "crosscompile"; then -- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES" - elif test "$location" = "source"; then - flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES" - else -@@ -182,8 +168,6 @@ while test $# -gt 0; do - --installbuilddir) - if test "$location" = "installed"; then - echo "${installbuilddir}" -- elif test "$location" = "crosscompile"; then -- echo "$APR_TARGET_DIR/${installbuilddir}" - elif test "$location" = "source"; then - echo "$APR_SOURCE_DIR/build" - else -@@ -200,8 +184,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}" -- elif test "$location" = "crosscompile"; then -- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}" - 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 - # 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}" -- elif test "$location" = "crosscompile"; then -- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}" - else - flags="$flags $LA_FILE" - fi -@@ -245,8 +225,6 @@ while test $# -gt 0; do - --apr-libtool) - if test "$location" = "installed"; then - echo "${installbuilddir}/libtool" -- elif test "$location" = "crosscompile"; then -- echo "$APR_TARGET_DIR/${installbuilddir}/build" - else - echo "$APR_BUILD_DIR/libtool" - fi --- -2.39.2 - 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