From 26aa6e6f2d0b0f4a01fd1d4afb7978453ce7f5df Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Tue, 3 Nov 2026 06:20:35 +0000 Subject: [PATCH] apr-util: upgrade 1.6.5 -> 1.6.6 Changes with APR-util 1.6.6 *) Fix crypto/apr_passwd.c compilation errors on older systems. PR 70283. *) Fix crashes in apr_crypto_get_block_key_types() with default cmake builds on Windows. PR 70260. --- .../recipes-support/apr/apr-util/configfix.patch | 16 ++++++++++++---- .../apr/{apr-util_1.6.5.bb => apr-util_1.6.6.bb} | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) rename meta/recipes-support/apr/{apr-util_1.6.5.bb => apr-util_1.6.6.bb} (97%) diff --git a/meta/recipes-support/apr/apr-util/configfix.patch b/meta/recipes-support/apr/apr-util/configfix.patch index 4cc0ad79ae..5322e73d29 100644 --- a/meta/recipes-support/apr/apr-util/configfix.patch +++ b/meta/recipes-support/apr/apr-util/configfix.patch @@ -1,9 +1,17 @@ +From f05a53c7e957b215743359ff787eff3040f51e89 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Mon, 12 Jan 2009 17:34:52 +0000 +Subject: [PATCH] apr/apr-util: Fix some other config path gremlins breaking + Upstream-Status: Inappropriate [configuration] +--- + apu-config.in | 27 +-------------------------- + 1 file changed, 1 insertion(+), 26 deletions(-) -Index: apr-util-1.3.4/apu-config.in -=================================================================== ---- apr-util-1.3.4.orig/apu-config.in 2009-01-12 17:08:06.000000000 +0000 -+++ apr-util-1.3.4/apu-config.in 2009-01-12 17:09:00.000000000 +0000 +diff --git a/apu-config.in b/apu-config.in +index 82109e5..12d9fca 100644 +--- a/apu-config.in ++++ b/apu-config.in @@ -139,14 +139,7 @@ while test $# -gt 0; do exit 0 ;; diff --git a/meta/recipes-support/apr/apr-util_1.6.5.bb b/meta/recipes-support/apr/apr-util_1.6.6.bb similarity index 97% rename from meta/recipes-support/apr/apr-util_1.6.5.bb rename to meta/recipes-support/apr/apr-util_1.6.6.bb index ba1e3359ff..ebefffcd0d 100644 --- a/meta/recipes-support/apr/apr-util_1.6.5.bb +++ b/meta/recipes-support/apr/apr-util_1.6.6.bb @@ -14,7 +14,7 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "f43a1c8c79eef497a022ec6c99dddbdf57e42001da6ccbfae259631ed5aa2805" +SRC_URI[sha256sum] = "acd5f38440eda830e40c4fe35c2a6b8119493cfdba9c9d73d985c317beb4e4f8" EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \ --without-odbc \ -- 2.47.1