From patchwork Sun Jun 1 13:55:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 64021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBD20C83026 for ; Sun, 1 Jun 2025 13:55:56 +0000 (UTC) Received: from a27-23.smtp-out.us-west-2.amazonses.com (a27-23.smtp-out.us-west-2.amazonses.com [54.240.27.23]) by mx.groups.io with SMTP id smtpd.web11.27775.1748786129144655672 for ; Sun, 01 Jun 2025 06:55:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=j46ser6a2yusdzubpv7m7ewqgesde2ie header.b=EvaIaqAf; dkim=pass header.i=@amazonses.com header.s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx header.b=F1k2WDFF; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.23, mailfrom: 010101972bc7002b-cb4e1eaa-7fe8-4fa2-9e95-421461e14581-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=j46ser6a2yusdzubpv7m7ewqgesde2ie; d=yoctoproject.org; t=1748786151; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=L/r2AigpT2b/R8bSg/KfV3S9mTxrLamLU3Q/CHWA+ho=; b=EvaIaqAfWDqWBp8Wv2p3ebHiqoTiPrsrhPQ8ET6KVVNEc1+/Dk09rF5/F5YTcJCV IKHyN72HinK0SK87oEI+g9m67rHMgHEVi5NAhTZV260abz8wTdpq+2aU8szVmkyrgB8 QboNfTPWGtZVWHsKDMpafqMczgQm8ZLGpGdx5uRw= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=gdwg2y3kokkkj5a55z2ilkup5wp5hhxx; d=amazonses.com; t=1748786151; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=L/r2AigpT2b/R8bSg/KfV3S9mTxrLamLU3Q/CHWA+ho=; b=F1k2WDFFq7JaLMlrPrwhsAEKIZxNxhSGHj5c3oiBHNHmn5Wxmv9xZT63+59VKyRH acDMZNs5Tv9bvlL9q4FUx8o+qXgEFpS5PKq6ouyPlCUBE6qaWvedH2prmn9lHa5XQkW oeabMggqJRU9SOklqyGbpBTY7nho8zOm0YCxjepU= MIME-Version: 1.0 From: auh@yoctoproject.org To: Hongxu Jia Cc: openembedded-core@lists.openembedded.org Subject: [AUH] apr: upgrading to 1.7.6 SUCCEEDED Message-ID: <010101972bc7002b-cb4e1eaa-7fe8-4fa2-9e95-421461e14581-000000@us-west-2.amazonses.com> Date: Sun, 1 Jun 2025 13:55:51 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2025.06.01-54.240.27.23 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 01 Jun 2025 13:55:56 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/217661 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *apr* to *1.7.6* has Succeeded. Next steps: - apply the patch: git am 0001-apr-upgrade-1.7.5-1.7.6.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 185b55b92c4f617358b577efd51cfa3a7edd8fca Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sun, 1 Jun 2025 13:19:29 +0000 Subject: [PATCH] apr: upgrade 1.7.5 -> 1.7.6 --- ...ion-to-disable-timed-dependant-tests.patch | 11 +++++----- ...-runtime-test-for-mmap-that-can-map-.patch | 7 +++---- ...Check-for-NULL-handle-in-apr_dso_sym.patch | 5 +---- ...ir-path-references-from-installed-ap.patch | 9 ++++---- ...04-Fix-packet-discards-HTTP-redirect.patch | 7 ++----- ...-LTFLAGS-to-make-it-work-with-ccache.patch | 11 ++++------ .../apr/apr/autoconf-2.73.patch | 21 ++++++++++++------- .../apr/{apr_1.7.5.bb => apr_1.7.6.bb} | 2 +- 8 files changed, 34 insertions(+), 39 deletions(-) rename meta/recipes-support/apr/{apr_1.7.5.bb => apr_1.7.6.bb} (98%) diff --git a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch index b46dc76a86..63d5f562ac 100644 --- a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch +++ b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch @@ -1,4 +1,4 @@ -From 225abf37cd0b49960664b59f08e515a4c4ea5ad0 Mon Sep 17 00:00:00 2001 +From 525ef54051b7c15fd76b651cfbffaf1ddb755f01 Mon Sep 17 00:00:00 2001 From: Jeremy Puhlman Date: Thu, 26 Mar 2020 18:30:36 +0000 Subject: [PATCH] Add option to disable timed dependant tests @@ -9,7 +9,6 @@ a timer or other timing related issues. Upstream-Status: Submitted [https://github.com/apache/apr/pull/54] Signed-off-by: Jeremy Puhlman - --- configure.in | 6 ++++++ include/apr.h.in | 1 + @@ -17,10 +16,10 @@ Signed-off-by: Jeremy Puhlman 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in -index bfd488b..3663220 100644 +index 0ce20ab..3d42953 100644 --- a/configure.in +++ b/configure.in -@@ -3023,6 +3023,12 @@ AC_ARG_ENABLE(timedlocks, +@@ -3119,6 +3119,12 @@ AC_ARG_ENABLE(timedlocks, ) AC_SUBST(apr_has_timedlocks) @@ -34,10 +33,10 @@ index bfd488b..3663220 100644 # so getaddrinfo/gai_strerror are not used. if test $have_ipv6 = 0; then diff --git a/include/apr.h.in b/include/apr.h.in -index ee99def..c46a5f4 100644 +index 637ed38..e7cb9b9 100644 --- a/include/apr.h.in +++ b/include/apr.h.in -@@ -298,6 +298,7 @@ extern "C" { +@@ -307,6 +307,7 @@ extern "C" { #define APR_HAS_XTHREAD_FILES @apr_has_xthread_files@ #define APR_HAS_OS_UUID @osuuid@ #define APR_HAS_TIMEDLOCKS @apr_has_timedlocks@ 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 3480deaa4d..dbdc2871ba 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 @@ -1,4 +1,4 @@ -From 316b81c462f065927d7fec56aadd5c8cb94d1cf0 Mon Sep 17 00:00:00 2001 +From 4a90ec801fbe0e6ad18b70b647985ce91fface4a Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 26 Aug 2022 00:28:08 -0700 Subject: [PATCH] configure: Remove runtime test for mmap that can map @@ -10,16 +10,15 @@ mutexes Upstream-Status: Inappropriate [Cross-compile specific] Signed-off-by: Khem Raj - --- configure.in | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/configure.in b/configure.in -index 3663220..dce9789 100644 +index 3d42953..7e43b0f 100644 --- a/configure.in +++ b/configure.in -@@ -1303,36 +1303,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ +@@ -1391,36 +1391,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \ APR_CHECK_DEFINE(MAP_ANON, sys/mman.h) AC_CHECK_FILE(/dev/zero) diff --git a/meta/recipes-support/apr/apr/0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch b/meta/recipes-support/apr/apr/0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch index 8ba181b887..e5dc410ef7 100644 --- a/meta/recipes-support/apr/apr/0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch +++ b/meta/recipes-support/apr/apr/0001-dso-Check-for-NULL-handle-in-apr_dso_sym.patch @@ -1,4 +1,4 @@ -From a25be1aaa92a6d2e7f4cc3fdfbb92e5a10b63035 Mon Sep 17 00:00:00 2001 +From 43c460db7a0e885659ed53ab5de2aca033ef6985 Mon Sep 17 00:00:00 2001 From: Greg Beard Date: Sat, 25 Mar 2023 08:31:36 +0000 Subject: [PATCH] dso: Check for NULL handle in apr_dso_sym @@ -32,6 +32,3 @@ index fdd56f1..583d5de 100644 #if defined(DSO_USE_SHL) void *symaddr = NULL; int status; --- -2.42.0 - diff --git a/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch index d63423f3a1..2eaa0596b2 100644 --- a/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch +++ b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch @@ -1,4 +1,4 @@ -From 689a8db96a6d1e1cae9cbfb35d05ac82140a6555 Mon Sep 17 00:00:00 2001 +From 26c834c09a510819de0efdb56fb7ba020439e7c5 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 30 Jan 2018 09:39:06 +0800 Subject: [PATCH] apr: Remove workdir path references from installed apr files @@ -13,16 +13,15 @@ packages at target run time, the workdir path caused confusion. Rebase to 1.6.3 Signed-off-by: Hongxu Jia - --- apr-config.in | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/apr-config.in b/apr-config.in -index bed47ca..47874e5 100644 +index 626d3b0..42be269 100644 --- a/apr-config.in +++ b/apr-config.in -@@ -164,16 +164,7 @@ while test $# -gt 0; do +@@ -179,16 +179,7 @@ while test $# -gt 0; do flags="$flags $LDFLAGS" ;; --includes) @@ -39,7 +38,7 @@ index bed47ca..47874e5 100644 ;; --srcdir) echo $APR_SOURCE_DIR -@@ -197,33 +188,14 @@ while test $# -gt 0; do +@@ -212,33 +203,14 @@ while test $# -gt 0; do exit 0 ;; --link-ld) diff --git a/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch b/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch index 30fc07d4a0..e525194f95 100644 --- a/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch +++ b/meta/recipes-support/apr/apr/0004-Fix-packet-discards-HTTP-redirect.patch @@ -1,7 +1,7 @@ -From 7925eb1766a00ccee05c6e80b1d34f163a04b7b1 Mon Sep 17 00:00:00 2001 +From 7c29986101ceefc7bb2f4cd4f7fb046db7f8772e Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 30 Jan 2018 09:43:34 +0800 -Subject: [PATCH 4/7] Fix packet discards HTTP redirect. +Subject: [PATCH] Fix packet discards HTTP redirect. Disconnect the connection by poll() timeout. If timeout=0 and apr_wait_for_io_or_timeout()=APR_TIMEUP then @@ -34,6 +34,3 @@ index 4c0e0a6..1bdafba 100644 if (arv != APR_SUCCESS) { *len = 0; return arv; --- -1.8.3.1 - diff --git a/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch b/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch index 02634e6fde..67851298d3 100644 --- a/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch +++ b/meta/recipes-support/apr/apr/0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch @@ -1,7 +1,7 @@ -From 2e66cece0c3adff92733332111204ddc1d730a07 Mon Sep 17 00:00:00 2001 +From 5efa5286bd4c986333cd0cc4e41f31c4c853c62e Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 19 Nov 2015 18:25:38 -0800 -Subject: [PATCH 5/7] configure.in: fix LTFLAGS to make it work with ccache +Subject: [PATCH] configure.in: fix LTFLAGS to make it work with ccache When ccache is enabled, libtool requires --tag=CC when use ccache, otherwise when building apr-util with ccache enabled: @@ -19,10 +19,10 @@ Signed-off-by: Robert Yang 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.in b/configure.in -index 361120f..3b10422 100644 +index b0457e2..0ce20ab 100644 --- a/configure.in +++ b/configure.in -@@ -249,7 +249,7 @@ case $host in +@@ -266,7 +266,7 @@ case $host in ;; *) if test "x$LTFLAGS" = "x"; then @@ -31,6 +31,3 @@ index 361120f..3b10422 100644 fi if test "$experimental_libtool" = "yes"; then # Use a custom-made libtool replacement --- -1.8.3.1 - diff --git a/meta/recipes-support/apr/apr/autoconf-2.73.patch b/meta/recipes-support/apr/apr/autoconf-2.73.patch index a8b7a77566..1e24c0a576 100644 --- a/meta/recipes-support/apr/apr/autoconf-2.73.patch +++ b/meta/recipes-support/apr/apr/autoconf-2.73.patch @@ -1,13 +1,20 @@ -To work with autoconf 2.73, tweak the macro ordering in configure.in. +From 37753451f5b9f9fa058246a33f03e35d2d093e47 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Thu, 27 Jul 2023 20:47:55 -0700 +Subject: [PATCH] To work with autoconf 2.73, tweak the macro ordering in + configure.in. Upstream-Status: Pending Signed-off-by: Richard Purdie +--- + configure.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -Index: apr-1.7.2/configure.in -=================================================================== ---- apr-1.7.2.orig/configure.in -+++ apr-1.7.2/configure.in -@@ -430,6 +430,8 @@ if test "$host" = "i586-pc-beos"; then +diff --git a/configure.in b/configure.in +index 7e43b0f..f954ee7 100644 +--- a/configure.in ++++ b/configure.in +@@ -442,6 +442,8 @@ if test "$host" = "i586-pc-beos"; then ) dnl fi @@ -16,7 +23,7 @@ Index: apr-1.7.2/configure.in # this is the place to put specific options for platform/compiler # combinations case "$host:$CC" in -@@ -2384,7 +2386,6 @@ AC_MSG_RESULT([$msg]) +@@ -2480,7 +2482,6 @@ AC_MSG_RESULT([$msg]) AC_SUBST(have_union_semun) dnl Checks for libraries. diff --git a/meta/recipes-support/apr/apr_1.7.5.bb b/meta/recipes-support/apr/apr_1.7.6.bb similarity index 98% rename from meta/recipes-support/apr/apr_1.7.5.bb rename to meta/recipes-support/apr/apr_1.7.6.bb index 83d84bfdb6..13fa5daa3c 100644 --- a/meta/recipes-support/apr/apr_1.7.5.bb +++ b/meta/recipes-support/apr/apr_1.7.6.bb @@ -24,7 +24,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] = "cd0f5d52b9ab1704c72160c5ee3ed5d3d4ca2df4a7f8ab564e3cb352b67232f2" +SRC_URI[sha256sum] = "49030d92d2575da735791b496dc322f3ce5cff9494779ba8cc28c7f46c5deb32" inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script