summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch47
-rw-r--r--meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2310-5872.patch41
-rw-r--r--meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2924-5814.patch36
-rw-r--r--meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2925-5739.patch52
-rw-r--r--meta-oe/recipes-support/hdf5/files/0001-Fixes-CVE-2025-6750-5856.patch87
-rw-r--r--meta-oe/recipes-support/hdf5/files/0001-Refix-of-the-attempts-in-PR-5209-5722.patch47
-rw-r--r--meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch48
-rw-r--r--meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch20
-rw-r--r--meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb (renamed from meta-oe/recipes-support/hdf5/hdf5_1.14.6.bb)19
9 files changed, 39 insertions, 358 deletions
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch
deleted file mode 100644
index 4b31718dea..0000000000
--- a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2153-5795.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 183c8aeb601a02a38dd6815bcb651a7317b1b647 Mon Sep 17 00:00:00 2001
2From: Glenn Song <43005495+glennsong09@users.noreply.github.com>
3Date: Thu, 9 Oct 2025 07:51:49 -0500
4Subject: [PATCH] Fix CVE-2025-2153 (#5795)
5
6This PR fixes #5329. Previously, the message flags field was able to be modified such that a message that is not sharable according to the share_flags field in H5O_msg_class_t could be treated as sharable. A check has been added to make sure messages that are not sharable can't be modified so that they indicate they can be shared.
7
8The bug was first reproduced using the fuzzer and the POC file from #5329. With this change, the heap based buffer overflow no longer occurs.
9
10CVE: CVE-2025-2153
11Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/38954615fc079538aa45d48097625a6d76aceef0]
12
13Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
14---
15 src/H5Ocache.c | 4 ++--
16 src/H5Omessage.c | 3 +++
17 2 files changed, 5 insertions(+), 2 deletions(-)
18
19diff --git a/src/H5Ocache.c b/src/H5Ocache.c
20index 87f321c..12c30cf 100644
21--- a/src/H5Ocache.c
22+++ b/src/H5Ocache.c
23@@ -1399,8 +1399,8 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t
24 else {
25 /* Check for message of unshareable class marked as "shareable"
26 */
27- if ((flags & H5O_MSG_FLAG_SHAREABLE) && H5O_msg_class_g[id] &&
28- !(H5O_msg_class_g[id]->share_flags & H5O_SHARE_IS_SHARABLE))
29+ if (((flags & H5O_MSG_FLAG_SHARED) || (flags & H5O_MSG_FLAG_SHAREABLE)) &&
30+ H5O_msg_class_g[id] && !(H5O_msg_class_g[id]->share_flags & H5O_SHARE_IS_SHARABLE))
31 HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL,
32 "message of unshareable class flagged as shareable");
33
34diff --git a/src/H5Omessage.c b/src/H5Omessage.c
35index 7190e46..fb9006c 100644
36--- a/src/H5Omessage.c
37+++ b/src/H5Omessage.c
38@@ -354,6 +354,9 @@ H5O__msg_write_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type, unsigned m
39 */
40 assert(!(mesg_flags & H5O_MSG_FLAG_DONTSHARE));
41
42+ /* Sanity check to see if the type is not sharable */
43+ assert(type->share_flags & H5O_SHARE_IS_SHARABLE);
44+
45 /* Remove the old message from the SOHM index */
46 /* (It would be more efficient to try to share the message first, then
47 * delete it (avoiding thrashing the index in the case the ref.
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2310-5872.patch b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2310-5872.patch
deleted file mode 100644
index f15a7f9644..0000000000
--- a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2310-5872.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 7cc3c76f681fb4ca739457950352654aecd647a9 Mon Sep 17 00:00:00 2001
2From: Matt L <124107509+mattjala@users.noreply.github.com>
3Date: Thu, 9 Oct 2025 16:10:23 -0500
4Subject: [PATCH] Fix CVE-2025-2310 (#5872)
5
6Malformed files can have a zero name-length, which when subtracted lead to an overflow and an out-of-bounds read.
7
8Check that name length is not too small in addition to checking for an overflow directly.
9
10CVE: CVE-2025-2310
11Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/6c86f97e03c6dc7d7bd2bae9acc422bdc3438ff4]
12
13Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
14---
15 src/H5Oattr.c | 6 ++++++
16 1 file changed, 6 insertions(+)
17
18diff --git a/src/H5Oattr.c b/src/H5Oattr.c
19index 6d1d237..2f8c259 100644
20--- a/src/H5Oattr.c
21+++ b/src/H5Oattr.c
22@@ -167,6 +167,11 @@ H5O__attr_decode(H5F_t *f, H5O_t *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, u
23 if (H5_IS_BUFFER_OVERFLOW(p, 2, p_end))
24 HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding");
25 UINT16DECODE(p, name_len); /* Including null */
26+
27+ /* Verify that retrieved name length (including null byte) is valid */
28+ if (name_len <= 1)
29+ HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, NULL, "decoded name length is invalid");
30+
31 if (H5_IS_BUFFER_OVERFLOW(p, 2, p_end))
32 HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding");
33 UINT16DECODE(p, attr->shared->dt_size);
34@@ -190,6 +195,7 @@ H5O__attr_decode(H5F_t *f, H5O_t *open_oh, unsigned H5_ATTR_UNUSED mesg_flags, u
35 */
36 if (H5_IS_BUFFER_OVERFLOW(p, name_len, p_end))
37 HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding");
38+
39 if (NULL == (attr->shared->name = H5MM_strndup((const char *)p, name_len - 1)))
40 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
41
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2924-5814.patch b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2924-5814.patch
deleted file mode 100644
index a86b5a491b..0000000000
--- a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2924-5814.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From f76c5adea55edec75680fdd7365cc97abc112d0e Mon Sep 17 00:00:00 2001
2From: Glenn Song <43005495+glennsong09@users.noreply.github.com>
3Date: Mon, 15 Sep 2025 07:56:54 -0500
4Subject: [PATCH] Fix CVE-2025-2924 (#5814)
5
6CVE: CVE-2025-2924
7Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/0a57195ca67d278f1cf7d01566c121048e337a59]
8
9Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
10---
11 src/H5HLcache.c | 5 +++++
12 1 file changed, 5 insertions(+)
13
14diff --git a/src/H5HLcache.c b/src/H5HLcache.c
15index d0836fe..7f412d2 100644
16--- a/src/H5HLcache.c
17+++ b/src/H5HLcache.c
18@@ -225,6 +225,7 @@ H5HL__fl_deserialize(H5HL_t *heap)
19 /* check arguments */
20 assert(heap);
21 assert(!heap->freelist);
22+ HDcompile_assert(sizeof(hsize_t) == sizeof(uint64_t));
23
24 /* Build free list */
25 free_block = heap->free_block;
26@@ -232,6 +233,10 @@ H5HL__fl_deserialize(H5HL_t *heap)
27 const uint8_t *image; /* Pointer into image buffer */
28
29 /* Sanity check */
30+
31+ if (free_block > UINT64_MAX - (2 * heap->sizeof_size))
32+ HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "decoded heap block address overflow");
33+
34 if ((free_block + (2 * heap->sizeof_size)) > heap->dblk_size)
35 HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "bad heap free list");
36
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2925-5739.patch b/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2925-5739.patch
deleted file mode 100644
index 7a0afba423..0000000000
--- a/meta-oe/recipes-support/hdf5/files/0001-Fix-CVE-2025-2925-5739.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From ad959fdac99810ea64504d7bdfc7724c5ca25e21 Mon Sep 17 00:00:00 2001
2From: Glenn Song <43005495+glennsong09@users.noreply.github.com>
3Date: Thu, 9 Oct 2025 14:48:55 -0500
4Subject: [PATCH] Fix CVE-2025-2925 (#5739)
5
6This PR fixes issue #5383, which was occurring due to actual_len + H5C_IMAGE_EXTRA_SPACE being 0. When realloc was called, it freed image, but gets sent to done before new_image can be assigned to image. Because the pointer for image isn't null, it attempts to free it here again, causing the double free to occur. This PR addresses Quincey's concern and fixes the issue while preserving new_image and image.
7
8The bug was first reproduced using the fuzzer and the POC file from #5383. With this change, the double free no longer occurs.
9
10CVE: CVE-2025-2925
11Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/4310c19608455c17a213383d07715efb2918defc]
12
13Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
14---
15 src/H5Centry.c | 10 ++++++++++
16 1 file changed, 10 insertions(+)
17
18diff --git a/src/H5Centry.c b/src/H5Centry.c
19index 1ca7479..77bc00d 100644
20--- a/src/H5Centry.c
21+++ b/src/H5Centry.c
22@@ -1051,9 +1051,14 @@ H5C__load_entry(H5F_t *f,
23 */
24 do {
25 if (actual_len != len) {
26+ /* Verify that the length isn't a bad value */
27+ if (len == 0)
28+ HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "len is a bad value");
29+
30 if (NULL == (new_image = H5MM_realloc(image, len + H5C_IMAGE_EXTRA_SPACE)))
31 HGOTO_ERROR(H5E_CACHE, H5E_CANTALLOC, NULL, "image null after H5MM_realloc()");
32 image = (uint8_t *)new_image;
33+
34 #if H5C_DO_MEMORY_SANITY_CHECKS
35 H5MM_memcpy(image + len, H5C_IMAGE_SANITY_VALUE, H5C_IMAGE_EXTRA_SPACE);
36 #endif /* H5C_DO_MEMORY_SANITY_CHECKS */
37@@ -1104,10 +1109,15 @@ H5C__load_entry(H5F_t *f,
38 if (H5C__verify_len_eoa(f, type, addr, &actual_len, true) < 0)
39 HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "actual_len exceeds EOA");
40
41+ /* Verify that the length isn't 0 */
42+ if (actual_len == 0)
43+ HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, NULL, "actual_len is a bad value");
44+
45 /* Expand buffer to new size */
46 if (NULL == (new_image = H5MM_realloc(image, actual_len + H5C_IMAGE_EXTRA_SPACE)))
47 HGOTO_ERROR(H5E_CACHE, H5E_CANTALLOC, NULL, "image null after H5MM_realloc()");
48 image = (uint8_t *)new_image;
49+
50 #if H5C_DO_MEMORY_SANITY_CHECKS
51 H5MM_memcpy(image + actual_len, H5C_IMAGE_SANITY_VALUE, H5C_IMAGE_EXTRA_SPACE);
52 #endif /* H5C_DO_MEMORY_SANITY_CHECKS */
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Fixes-CVE-2025-6750-5856.patch b/meta-oe/recipes-support/hdf5/files/0001-Fixes-CVE-2025-6750-5856.patch
deleted file mode 100644
index cf8687f010..0000000000
--- a/meta-oe/recipes-support/hdf5/files/0001-Fixes-CVE-2025-6750-5856.patch
+++ /dev/null
@@ -1,87 +0,0 @@
1From 7159488b73fb429a78f79763f7b3775a3c160fad Mon Sep 17 00:00:00 2001
2From: bmribler <39579120+bmribler@users.noreply.github.com>
3Date: Fri, 26 Sep 2025 11:46:50 -0400
4Subject: [PATCH] Fixes CVE-2025-6750 (#5856)
5
6* Fixes CVE-2025-6750
7
8A heap buffer overflow occurred because an mtime message was not properly decoded, resulting in a buffer of size 0 being passed into the encoder.
9
10This PR added decoding for both old and new mtime messages which will allow invalid message size to be detected.
11
12Fixes #5549
13
14CVE: CVE-2025-6750
15Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/86149a098837a37b2513746e9baf84010f75fb54]
16
17Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
18---
19 src/H5Ocache.c | 41 +++++++++++++++++++++++++++++++++++------
20 1 file changed, 35 insertions(+), 6 deletions(-)
21
22diff --git a/src/H5Ocache.c b/src/H5Ocache.c
23index 12c30cf..e6095a7 100644
24--- a/src/H5Ocache.c
25+++ b/src/H5Ocache.c
26@@ -1265,6 +1265,9 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t
27 if (mesg_size != H5O_ALIGN_OH(oh, mesg_size))
28 HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "message not aligned");
29
30+ if (H5_IS_BUFFER_OVERFLOW(chunk_image, mesg_size, p_end))
31+ HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "message size exceeds buffer end");
32+
33 /* Message flags */
34 if (H5_IS_BUFFER_OVERFLOW(chunk_image, 1, p_end))
35 HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, FAIL, "ran off end of input buffer while decoding");
36@@ -1297,12 +1300,6 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t
37 }
38 }
39
40- /* Try to detect invalidly formatted object header message that
41- * extends past end of chunk.
42- */
43- if (chunk_image + mesg_size > eom_ptr)
44- HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "corrupt object header");
45-
46 /* Increment count of null messages */
47 if (H5O_NULL_ID == id)
48 nullcnt++;
49@@ -1449,6 +1446,38 @@ H5O__chunk_deserialize(H5O_t *oh, haddr_t addr, size_t chunk_size, const uint8_t
50 HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't decode refcount");
51 oh->nlink = *refcount;
52 }
53+ /* Check if message is an old mtime message */
54+ else if (H5O_MTIME_ID == id) {
55+ time_t *mtime = NULL;
56+
57+ /* Decode mtime message */
58+ mtime =
59+ (time_t *)(H5O_MSG_MTIME->decode)(udata->f, NULL, 0, &ioflags, mesg->raw_size, mesg->raw);
60+
61+ /* Save the decoded old format mtime */
62+ if (!mtime)
63+ HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, FAIL, "can't decode old format mtime");
64+
65+ /* Save 'native' form of mtime message and its value */
66+ mesg->native = mtime;
67+ oh->ctime = *mtime;
68+ }
69+ /* Check if message is an new mtime message */
70+ else if (H5O_MTIME_NEW_ID == id) {
71+ time_t *mtime = NULL;
72+
73+ /* Decode mtime message */
74+ mtime = (time_t *)(H5O_MSG_MTIME_NEW->decode)(udata->f, NULL, 0, &ioflags, mesg->raw_size,
75+ mesg->raw);
76+
77+ /* Save the decoded new format mtime */
78+ if (!mtime)
79+ HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, FAIL, "can't decode new format mtime");
80+
81+ /* Save 'native' form of mtime message and its value */
82+ mesg->native = mtime;
83+ oh->ctime = *mtime;
84+ }
85 /* Check if message is a link message */
86 else if (H5O_LINK_ID == id) {
87 /* Increment the count of link messages */
diff --git a/meta-oe/recipes-support/hdf5/files/0001-Refix-of-the-attempts-in-PR-5209-5722.patch b/meta-oe/recipes-support/hdf5/files/0001-Refix-of-the-attempts-in-PR-5209-5722.patch
deleted file mode 100644
index bb18879b5e..0000000000
--- a/meta-oe/recipes-support/hdf5/files/0001-Refix-of-the-attempts-in-PR-5209-5722.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1From 0354419c3b5c6832c994b005903372f156b5fddb Mon Sep 17 00:00:00 2001
2From: bmribler <39579120+bmribler@users.noreply.github.com>
3Date: Wed, 13 Aug 2025 14:45:41 -0400
4Subject: [PATCH] Refix of the attempts in PR-5209 (#5722)
5
6This PR addresses the root cause of the issue by adding a sanity-check immediately
7after reading the file space page size from the file.
8
9The same fuzzer in GH-5376 was used to verify that the assert before the vulnerability
10had occurred and that an error indicating a corrupted file space page size replaced it.
11
12CVE: CVE-2025-2914
13Upstream-Status: Backport [https://github.com/HDFGroup/hdf5/commit/804f3bace997e416917b235dbd3beac3652a8a05]
14
15Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
16---
17 src/H5Fsuper.c | 2 ++
18 src/H5Ofsinfo.c | 3 +++
19 2 files changed, 5 insertions(+)
20
21diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
22index d9fe3a7..1c8dc6c 100644
23--- a/src/H5Fsuper.c
24+++ b/src/H5Fsuper.c
25@@ -746,6 +746,8 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, bool initial_read)
26 if (!(flags & H5O_MSG_FLAG_WAS_UNKNOWN)) {
27 H5O_fsinfo_t fsinfo; /* File space info message from superblock extension */
28
29+ memset(&fsinfo, 0, sizeof(H5O_fsinfo_t));
30+
31 /* f->shared->null_fsm_addr: Whether to drop free-space to the floor */
32 /* The h5clear tool uses this property to tell the library
33 * to drop free-space to the floor
34diff --git a/src/H5Ofsinfo.c b/src/H5Ofsinfo.c
35index 5b69235..2bb6ea6 100644
36--- a/src/H5Ofsinfo.c
37+++ b/src/H5Ofsinfo.c
38@@ -182,6 +182,9 @@ H5O__fsinfo_decode(H5F_t *f, H5O_t H5_ATTR_UNUSED *open_oh, unsigned H5_ATTR_UNU
39 if (H5_IS_BUFFER_OVERFLOW(p, H5F_sizeof_size(f), p_end))
40 HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding");
41 H5F_DECODE_LENGTH(f, p, fsinfo->page_size); /* File space page size */
42+ /* Basic sanity check */
43+ if (fsinfo->page_size == 0 || fsinfo->page_size > H5F_FILE_SPACE_PAGE_SIZE_MAX)
44+ HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "invalid page size in file space info");
45
46 if (H5_IS_BUFFER_OVERFLOW(p, 2, p_end))
47 HGOTO_ERROR(H5E_OHDR, H5E_OVERFLOW, NULL, "ran off end of input buffer while decoding");
diff --git a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch
index 77e77d88f6..8ccf4a3a13 100644
--- a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch
+++ b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch
@@ -9,46 +9,45 @@ to improve reproducibility.
9Upstream-Status: Inappropriate [oe specific] 9Upstream-Status: Inappropriate [oe specific]
10 10
11Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 11Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
12
13Updated for v2.0.0
14Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
15
12--- 16---
13 src/libhdf5.settings.cmake.in | 18 +++++++++--------- 17 src/libhdf5.settings.cmake.in | 18 +++++++++---------
14 1 file changed, 9 insertions(+), 9 deletions(-) 18 1 file changed, 9 insertions(+), 9 deletions(-)
15 19
16diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in 20diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in
17index deb07ed..6f255c4 100644 21index deb07ed..6f255c4 100644
18--- a/src/libhdf5.settings.cmake.in 22--- a/src/libhdf5.settings.in
19+++ b/src/libhdf5.settings.cmake.in 23+++ b/src/libhdf5.settings.in
20@@ -23,23 +23,23 @@ Linking Options: 24@@ -4,7 +4,7 @@
21 ---------------- 25 General Information:
22 Libraries: @BUILD_NAME_EXT@ 26 -------------------
23 Statically Linked Executables: @BUILD_STATIC_EXECS@ 27 HDF5 Version: @HDF5_PACKAGE_VERSION_STRING@
24- LDFLAGS: @CMAKE_SHARED_LINKER_FLAGS@ 28- Configured on: @CONFIG_DATE@
25+ LDFLAGS: 29+ Configured on:
26 H5_LDFLAGS: @H5_LDFLAGS@ 30 Configured by: @CMAKE_GENERATOR@
27 AM_LDFLAGS: @AM_LDFLAGS@ 31 Host system: @CMAKE_HOST_SYSTEM@
28 Extra libraries: @LINK_LIBS@ 32 Uname information: @CMAKE_SYSTEM_NAME@
29- Archiver: @CMAKE_AR@ 33@@ -34,12 +34,12 @@
30- AR_FLAGS:
31- Ranlib: @CMAKE_RANLIB@
32+ Archiver:
33+ AR_FLAGS:
34+ Ranlib:
35
36 Languages: 34 Languages:
37 ---------- 35 ----------
38 C: YES 36 C: YES
39- C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@ 37- C Compiler: @CMAKE_C_COMPILER@ @CMAKE_C_COMPILER_VERSION@
38- CPPFLAGS: @CPPFLAGS@
40+ C Compiler: 39+ C Compiler:
41 CPPFLAGS: @CPPFLAGS@ 40+ CPPFLAGS:
42 H5_CPPFLAGS: @H5_CPPFLAGS@ 41 H5_CPPFLAGS: @H5_CPPFLAGS@
43 AM_CPPFLAGS: @AM_CPPFLAGS@ 42 AM_CPPFLAGS: @AM_CPPFLAGS@
44- CFLAGS: @CMAKE_C_FLAGS@ 43- CFLAGS: @CMAKE_C_FLAGS@ @HDF5_BUILD_MODE_C_FLAGS@
45- H5_CFLAGS: @HDF5_CMAKE_C_FLAGS@ 44- H5_CFLAGS: @HDF5_CMAKE_C_FLAGS@
46+ CFLAGS: 45+ CFLAGS:
47+ H5_CFLAGS: 46+ H5_CFLAGS:
48 AM_CFLAGS: @AM_CFLAGS@ 47 AM_CFLAGS: @AM_CFLAGS@
49 Shared C Library: @H5_ENABLE_SHARED_LIB@ 48 Shared C Library: @H5_ENABLE_SHARED_LIB@
50 Static C Library: @H5_ENABLE_STATIC_LIB@ 49 Static C Library: @H5_ENABLE_STATIC_LIB@
51@@ -51,11 +51,11 @@ Languages: 50@@ -51,11 +51,11 @@
52 AM Fortran Flags: @AM_FCFLAGS@ 51 AM Fortran Flags: @AM_FCFLAGS@
53 Shared Fortran Library: @H5_ENABLE_SHARED_LIB@ 52 Shared Fortran Library: @H5_ENABLE_SHARED_LIB@
54 Static Fortran Library: @H5_ENABLE_STATIC_LIB@ 53 Static Fortran Library: @H5_ENABLE_STATIC_LIB@
@@ -57,11 +56,8 @@ index deb07ed..6f255c4 100644
57 56
58 C++: @HDF5_BUILD_CPP_LIB@ 57 C++: @HDF5_BUILD_CPP_LIB@
59 C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@ 58 C++ Compiler: @CMAKE_CXX_COMPILER@ @CMAKE_CXX_COMPILER_VERSION@
60- C++ Flags: @CMAKE_CXX_FLAGS@ 59- C++ Flags: @CMAKE_CXX_FLAGS@ @HDF5_BUILD_MODE_CXX_FLAGS@
61+ C++ Flags: 60+ C++ Flags:
62 H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ 61 H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
63 AM C++ Flags: @AM_CXXFLAGS@ 62 AM C++ Flags: @AM_CXXFLAGS@
64 Shared C++ Library: @H5_ENABLE_SHARED_LIB@ 63 Shared C++ Library: @H5_ENABLE_SHARED_LIB@
65--
662.25.1
67
diff --git a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch
index f0eb05a1e7..33ba78042a 100644
--- a/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch
+++ b/meta-oe/recipes-support/hdf5/files/0002-Remove-suffix-shared-from-shared-library-name.patch
@@ -6,18 +6,23 @@ Subject: [PATCH 2/2] Remove suffix `-shared' from shared library name
6Upstream-Status: Inappropriate [OE specific] 6Upstream-Status: Inappropriate [OE specific]
7 7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9
10Adapted to v2.0.0
11Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
12
9--- 13---
10 CMakeLists.txt | 24 ++++++++++++------------ 14 CMakeLists.txt | 24 ++++++++++++------------
11 1 file changed, 12 insertions(+), 12 deletions(-) 15 1 file changed, 12 insertions(+), 12 deletions(-)
12 16
13--- a/CMakeLists.txt 17--- a/CMakeLists.txt
14+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
15@@ -191,19 +191,19 @@ set (HDF5_HL_F90_C_LIB_TARGET "${HDF 19@@ -278,20 +278,20 @@
16 set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}") 20 set (HDF5_F90_C_TEST_LIB_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}-static")
17 set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}") 21 set (HDF5_HL_F90_LIB_TARGET "${HDF5_HL_F90_LIB_CORENAME}-static")
18 set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}") 22 set (HDF5_HL_F90_C_LIB_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-static")
19-set (HDF5_LIBSH_TARGET "${HDF5_LIB_CORENAME}-shared") 23-set (HDF5_LIBSH_TARGET "${HDF5_LIB_CORENAME}-shared")
20-set (HDF5_TEST_LIBSH_TARGET "${HDF5_TEST_LIB_CORENAME}-shared") 24-set (HDF5_TEST_LIBSH_TARGET "${HDF5_TEST_LIB_CORENAME}-shared")
25-set (HDF5_TEST_PAR_LIBSH_TARGET "${HDF5_TEST_PAR_LIB_CORENAME}-shared")
21-set (HDF5_CPP_LIBSH_TARGET "${HDF5_CPP_LIB_CORENAME}-shared") 26-set (HDF5_CPP_LIBSH_TARGET "${HDF5_CPP_LIB_CORENAME}-shared")
22-set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}-shared") 27-set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}-shared")
23-set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}-shared") 28-set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}-shared")
@@ -31,6 +36,7 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
31-set (HDF5_HL_F90_C_LIBSH_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-shared") 36-set (HDF5_HL_F90_C_LIBSH_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}-shared")
32+set (HDF5_LIBSH_TARGET "${HDF5_LIB_CORENAME}") 37+set (HDF5_LIBSH_TARGET "${HDF5_LIB_CORENAME}")
33+set (HDF5_TEST_LIBSH_TARGET "${HDF5_TEST_LIB_CORENAME}") 38+set (HDF5_TEST_LIBSH_TARGET "${HDF5_TEST_LIB_CORENAME}")
39+set (HDF5_TEST_PAR_LIBSH_TARGET "${HDF5_TEST_PAR_LIB_CORENAME}")
34+set (HDF5_CPP_LIBSH_TARGET "${HDF5_CPP_LIB_CORENAME}") 40+set (HDF5_CPP_LIBSH_TARGET "${HDF5_CPP_LIB_CORENAME}")
35+set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}") 41+set (HDF5_HL_LIBSH_TARGET "${HDF5_HL_LIB_CORENAME}")
36+set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}") 42+set (HDF5_HL_CPP_LIBSH_TARGET "${HDF5_HL_CPP_LIB_CORENAME}")
@@ -42,6 +48,6 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
42+set (HDF5_F90_C_TEST_LIBSH_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}") 48+set (HDF5_F90_C_TEST_LIBSH_TARGET "${HDF5_F90_C_TEST_LIB_CORENAME}")
43+set (HDF5_HL_F90_LIBSH_TARGET "${HDF5_HL_F90_LIB_CORENAME}") 49+set (HDF5_HL_F90_LIBSH_TARGET "${HDF5_HL_F90_LIB_CORENAME}")
44+set (HDF5_HL_F90_C_LIBSH_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}") 50+set (HDF5_HL_F90_C_LIBSH_TARGET "${HDF5_HL_F90_C_LIB_CORENAME}")
45 51 set (HDF5_JAVA_JNI_LIB_TARGET "${HDF5_JAVA_JNI_LIB_CORENAME}")
46 #----------------------------------------------------------------------------- 52 set (HDF5_JAVA_HDF5_LIB_TARGET "${HDF5_JAVA_HDF5_LIB_CORENAME}")
47 # Define some CMake variables for use later in the project 53 set (HDF5_JAVA_TEST_LIB_TARGET "${HDF5_JAVA_TEST_LIB_CORENAME}")
diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.6.bb b/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb
index 7d75f0e7dc..79ce8a018d 100644
--- a/meta-oe/recipes-support/hdf5/hdf5_1.14.6.bb
+++ b/meta-oe/recipes-support/hdf5/hdf5_2.0.0.bb
@@ -4,24 +4,18 @@ extremely large and complex data collections"
4HOMEPAGE = "https://www.hdfgroup.org/" 4HOMEPAGE = "https://www.hdfgroup.org/"
5SECTION = "libs" 5SECTION = "libs"
6 6
7LICENSE = "HDF5" 7LICENSE = "BSD-3-Clause"
8LIC_FILES_CHKSUM = "file://COPYING;md5=adebb1ecf1b3b80c13359e18ef67301e" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=71a191398102f76050a4e56e78cb4891"
9 9
10inherit cmake siteinfo qemu multilib_header multilib_script 10inherit cmake siteinfo qemu multilib_header multilib_script
11 11
12DEPENDS += "qemu-native zlib" 12DEPENDS += "qemu-native zlib"
13 13
14SRC_URI = "https://support.hdfgroup.org/releases/hdf5/v1_14/v1_14_6/downloads/${BPN}-${PV}.tar.gz \ 14SRC_URI = "https://support.hdfgroup.org/releases/hdf5/v2_0/v2_0_0/downloads/${BPN}-${PV}.tar.gz \
15 file://0002-Remove-suffix-shared-from-shared-library-name.patch \ 15 file://0002-Remove-suffix-shared-from-shared-library-name.patch \
16 file://0001-cmake-remove-build-flags.patch \ 16 file://0001-cmake-remove-build-flags.patch \
17 file://0001-Fix-CVE-2025-2153-5795.patch \
18 file://0001-Fix-CVE-2025-2310-5872.patch \
19 file://0001-Refix-of-the-attempts-in-PR-5209-5722.patch \
20 file://0001-Fix-CVE-2025-2924-5814.patch \
21 file://0001-Fix-CVE-2025-2925-5739.patch \
22 file://0001-Fixes-CVE-2025-6750-5856.patch \
23 " 17 "
24SRC_URI[sha256sum] = "e4defbac30f50d64e1556374aa49e574417c9e72c6b1de7a4ff88c4b1bea6e9b" 18SRC_URI[sha256sum] = "6e45a4213cb11bb5860e1b0a7645688ab55562cc2d55c6ff9bcb0984ed12b22b"
25 19
26FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" 20FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*"
27 21
@@ -58,11 +52,6 @@ do_configure:append() {
58do_install:append() { 52do_install:append() {
59 # Used for generating config files on target 53 # Used for generating config files on target
60 oe_multilib_header H5pubconf.h 54 oe_multilib_header H5pubconf.h
61 # remove the buildpath
62 sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc
63 sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/hdf5-targets.cmake
64 sed -i -e 's|${RECIPE_SYSROOT_NATIVE}||g' ${D}${bindir}/h5hlcc
65 sed -i -e 's|${RECIPE_SYSROOT_NATIVE}||g' ${D}${bindir}/h5cc
66} 55}
67 56
68BBCLASSEXTEND = "native" 57BBCLASSEXTEND = "native"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-23 13:35:35 +0000