diff mbox series

[meta-oe] c-ares: upgrade 1.34.5 -> 1.34.6

Message ID 20251213030430.350068-1-schonm@gmail.com
State Under Review
Headers show
Series [meta-oe] c-ares: upgrade 1.34.5 -> 1.34.6 | expand

Commit Message

Jason Schonberg Dec. 13, 2025, 3:04 a.m. UTC 
Drop memory leak patch which has already been included in this new version.

The new version also includes a fix for CVE 2025-62408.

Changelog: https://github.com/c-ares/c-ares/releases/tag/v1.34.6

Signed-off-by: Jason Schonberg <schonm@gmail.com>
---
 .../c-ares/0001-ares_uri-memory-leak.patch    | 21 -------------------
 .../{c-ares_1.34.5.bb => c-ares_1.34.6.bb}    |  3 +--
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 meta-oe/recipes-support/c-ares/c-ares/0001-ares_uri-memory-leak.patch
 rename meta-oe/recipes-support/c-ares/{c-ares_1.34.5.bb => c-ares_1.34.6.bb} (87%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/c-ares/c-ares/0001-ares_uri-memory-leak.patch b/meta-oe/recipes-support/c-ares/c-ares/0001-ares_uri-memory-leak.patch
deleted file mode 100644
index 4d08651be1..0000000000
--- a/meta-oe/recipes-support/c-ares/c-ares/0001-ares_uri-memory-leak.patch
+++ /dev/null
@@ -1,21 +0,0 @@ 
-fix memory leak in ares_uri (#1012)
-Dynamic memory, referenced by 'outpath', is allocated at ares_uri.c:527
-by calling function 'ares_buf_create' and lost at ares_uri.c:536.
-
-Signed-off-by: Felix The Cat (@F3lixTheCat)
-
---
-
-Upstream-Status: Backport [https://github.com/c-ares/c-ares/commit/ee2a1c3eff3c8164b09123005f4b49c571788b59]
-
---- a/src/lib/util/ares_uri.c	2025-08-10 15:59:17.501710307 -0400
-+++ b/src/lib/util/ares_uri.c	2025-08-10 16:00:35.867494819 -0400
-@@ -533,7 +533,7 @@
-   status = ares_buf_split_str_array(inpath, (const unsigned char *)"/", 1,
-                                     ARES_BUF_SPLIT_TRIM, 0, &arr);
-   if (status != ARES_SUCCESS) {
--    return NULL;
-+    goto done;
-   }
- 
-   for (i = 0; i < (ares_ssize_t)ares_array_len(arr); i++) {
diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb b/meta-oe/recipes-support/c-ares/c-ares_1.34.6.bb
similarity index 87%
rename from meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb
rename to meta-oe/recipes-support/c-ares/c-ares_1.34.6.bb
index b434886311..c9c54a9fa0 100644
--- a/meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb
+++ b/meta-oe/recipes-support/c-ares/c-ares_1.34.6.bb
@@ -6,9 +6,8 @@  LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d3e72a10e08191f2ca1be3f3228d78f3"
 
 SRC_URI = "https://github.com/c-ares/c-ares/releases/download/v${PV}/${BPN}-${PV}.tar.gz \
-           file://0001-ares_uri-memory-leak.patch \
            file://run-ptest"
-SRC_URI[sha256sum] = "7d935790e9af081c25c495fd13c2cfcda4792983418e96358ef6e7320ee06346"
+SRC_URI[sha256sum] = "912dd7cc3b3e8a79c52fd7fb9c0f4ecf0aaa73e45efda880266a2d6e26b84ef5"
 
 PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
 PACKAGECONFIG[manpages] = ""