diff options
| author | Jason Schonberg <schonm@gmail.com> | 2025-12-29 15:51:43 +0100 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@oss.qualcomm.com> | 2026-01-06 18:07:46 +0530 |
| commit | 1a7e2ac7763664aabafe7b5e824d5a462950d338 (patch) | |
| tree | 4a1e05805af6bd86ed4ebe5d12d289e277b017e1 /meta-oe | |
| parent | efde0fec54685a06a34a2117a94ffef79e413372 (diff) | |
| download | meta-openembedded-1a7e2ac7763664aabafe7b5e824d5a462950d338.tar.gz | |
c-ares: upgrade 1.34.5 -> 1.34.6
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>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 996768e0800a008e06d6c8d305f443198d4df847)
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Anuj Mittal <anuj.mittal@oss.qualcomm.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-support/c-ares/c-ares/0001-ares_uri-memory-leak.patch | 21 | ||||
| -rw-r--r-- | meta-oe/recipes-support/c-ares/c-ares_1.34.6.bb (renamed from meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb) | 3 |
2 files changed, 1 insertions, 23 deletions
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 @@ | |||
| 1 | fix memory leak in ares_uri (#1012) | ||
| 2 | Dynamic memory, referenced by 'outpath', is allocated at ares_uri.c:527 | ||
| 3 | by calling function 'ares_buf_create' and lost at ares_uri.c:536. | ||
| 4 | |||
| 5 | Signed-off-by: Felix The Cat (@F3lixTheCat) | ||
| 6 | |||
| 7 | -- | ||
| 8 | |||
| 9 | Upstream-Status: Backport [https://github.com/c-ares/c-ares/commit/ee2a1c3eff3c8164b09123005f4b49c571788b59] | ||
| 10 | |||
| 11 | --- a/src/lib/util/ares_uri.c 2025-08-10 15:59:17.501710307 -0400 | ||
| 12 | +++ b/src/lib/util/ares_uri.c 2025-08-10 16:00:35.867494819 -0400 | ||
| 13 | @@ -533,7 +533,7 @@ | ||
| 14 | status = ares_buf_split_str_array(inpath, (const unsigned char *)"/", 1, | ||
| 15 | ARES_BUF_SPLIT_TRIM, 0, &arr); | ||
| 16 | if (status != ARES_SUCCESS) { | ||
| 17 | - return NULL; | ||
| 18 | + goto done; | ||
| 19 | } | ||
| 20 | |||
| 21 | 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 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" | |||
| 6 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d3e72a10e08191f2ca1be3f3228d78f3" | 6 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d3e72a10e08191f2ca1be3f3228d78f3" |
| 7 | 7 | ||
| 8 | SRC_URI = "https://github.com/c-ares/c-ares/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ | 8 | SRC_URI = "https://github.com/c-ares/c-ares/releases/download/v${PV}/${BPN}-${PV}.tar.gz \ |
| 9 | file://0001-ares_uri-memory-leak.patch \ | ||
| 10 | file://run-ptest" | 9 | file://run-ptest" |
| 11 | SRC_URI[sha256sum] = "7d935790e9af081c25c495fd13c2cfcda4792983418e96358ef6e7320ee06346" | 10 | SRC_URI[sha256sum] = "912dd7cc3b3e8a79c52fd7fb9c0f4ecf0aaa73e45efda880266a2d6e26b84ef5" |
| 12 | 11 | ||
| 13 | PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" | 12 | PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" |
| 14 | PACKAGECONFIG[manpages] = "" | 13 | PACKAGECONFIG[manpages] = "" |
