21 files changed, 281 insertions, 509 deletions

diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch
deleted file mode 100644
index 5c6e097493..0000000000
--- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-From 01c98d5d5d044d9a125abcdbb2f3d771966365b0 Mon Sep 17 00:00:00 2001
-From: mirabilos <m@mirbsd.org>
-Date: Thu, 1 Feb 2018 15:34:07 +0100
-Subject: [PATCH] Instead of doing preprocessor magic, just output off_t as
- long long
-
-Fix warnings abot PRIdoff_t in libmtd.c, in mtd_read (and mtd_write):
-
-In file included from ../git/lib/libmtd.c:40:0:
-../git/lib/libmtd.c: In function 'mtd_read':
-../git/include/common.h:110:18: warning: format '%ld' expects argument of
- type 'long int', but argument 5 has type 'off_t {aka long long int}'
- [-Wformat=]
-
-../git/include/common.h:120:2: note: in expansion of macro 'errmsg'
-  errmsg(fmt, ##__VA_ARGS__);                                         \
-  ^~~~~~
-../git/lib/libmtd.c:1082:10: note: in expansion of macro 'sys_errmsg'
-   return sys_errmsg("cannot seek mtd%d to offset %"PRIdoff_t,
-          ^~~~~~~~~~
-
-/usr/lib/klibc/include/inttypes.h:28:17: note: format string is defined here
- #define PRId32 "d"
-
-Upstream-Status: Submitted
-
-Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
----
- include/common.h                    | 18 ------------------
- jffsX-utils/mkfs.jffs2.c            | 20 ++++++++++----------
- lib/libmtd.c                        |  8 ++++----
- misc-utils/flash_erase.c            |  6 +++---
- misc-utils/flash_otp_write.c        |  2 +-
- misc-utils/ftl_check.c              |  2 +-
- misc-utils/mtd_debug.c              |  4 ++--
- misc-utils/serve_image.c            |  4 ++--
- tests/fs-tests/integrity/integck.c  |  4 ++--
- tests/mtd-tests/nandpagetest.c      |  4 ++--
- tests/ubi-tests/integ.c             |  6 +++---
- ubifs-utils/mkfs.ubifs/mkfs.ubifs.c |  6 +++---
- 12 files changed, 33 insertions(+), 51 deletions(-)
-
-diff --git a/include/common.h b/include/common.h
-index f8f72ea..642c212 100644
---- a/include/common.h
-+++ b/include/common.h
-@@ -70,24 +70,6 @@ extern "C" {
- #define O_CLOEXEC 0
- #endif
- 
--/* define a print format specifier for off_t */
--#if (SIZEOF_OFF_T >= 8)
--#define PRIxoff_t PRIx64
--#define PRIdoff_t PRId64
--#else
--#define PRIxoff_t "l"PRIx32
--#define PRIdoff_t "l"PRId32
--#endif
--
--/* define a print format specifier for loff_t */
--#if (SIZEOF_LOFF_T >= 8)
--#define PRIxloff_t PRIx64
--#define PRIdloff_t PRId64
--#else
--#define PRIxloff_t "l"PRIx32
--#define PRIdloff_t "l"PRId32
--#endif
--
- /* Verbose messages */
- #define bareverbose(verbose, fmt, ...) do {                        \
-        if (verbose)                                               \
-diff --git a/jffsX-utils/mkfs.jffs2.c b/jffsX-utils/mkfs.jffs2.c
-index 9aa6c39..0661786 100644
---- a/jffsX-utils/mkfs.jffs2.c
-+++ b/jffsX-utils/mkfs.jffs2.c
-@@ -1237,8 +1237,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir)
-                } else switch (e->sb.st_mode & S_IFMT) {
-                        case S_IFDIR:
-                                if (verbose) {
--                                       printf("\td %04o %9" PRIdoff_t "             %5d:%-3d %s\n",
--                                                       e->sb.st_mode & ~S_IFMT, e->sb.st_size,
-+                                       printf("\td %04o %9lld             %5d:%-3d %s\n",
-+                                                       e->sb.st_mode & ~S_IFMT, (long long)e->sb.st_size,
-                                                        (int) (e->sb.st_uid), (int) (e->sb.st_gid),
-                                                        e->name);
-                                }
-@@ -1247,8 +1247,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir)
-                                break;
-                        case S_IFSOCK:
-                                if (verbose) {
--                                       printf("\ts %04o %9" PRIdoff_t "             %5d:%-3d %s\n",
--                                                       e->sb.st_mode & ~S_IFMT, e->sb.st_size,
-+                                       printf("\ts %04o %9lld             %5d:%-3d %s\n",
-+                                                       e->sb.st_mode & ~S_IFMT, (long long)e->sb.st_size,
-                                                        (int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
-                                }
-                                write_pipe(e);
-@@ -1256,8 +1256,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir)
-                                break;
-                        case S_IFIFO:
-                                if (verbose) {
--                                       printf("\tp %04o %9" PRIdoff_t "             %5d:%-3d %s\n",
--                                                       e->sb.st_mode & ~S_IFMT, e->sb.st_size,
-+                                       printf("\tp %04o %9lld             %5d:%-3d %s\n",
-+                                                       e->sb.st_mode & ~S_IFMT, (long long)e->sb.st_size,
-                                                        (int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
-                                }
-                                write_pipe(e);
-@@ -1285,8 +1285,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir)
-                                break;
-                        case S_IFLNK:
-                                if (verbose) {
--                                       printf("\tl %04o %9" PRIdoff_t "             %5d:%-3d %s -> %s\n",
--                                                       e->sb.st_mode & ~S_IFMT, e->sb.st_size,
-+                                       printf("\tl %04o %9lld             %5d:%-3d %s -> %s\n",
-+                                                       e->sb.st_mode & ~S_IFMT, (long long)e->sb.st_size,
-                                                        (int) e->sb.st_uid, (int) e->sb.st_gid, e->name,
-                                                        e->link);
-                                }
-@@ -1297,8 +1297,8 @@ static void recursive_populate_directory(struct filesystem_entry *dir)
-                                wrote = write_regular_file(e);
-                                write_xattr_entry(e);
-                                if (verbose) {
--                                       printf("\tf %04o %9" PRIdoff_t " (%9u) %5d:%-3d %s\n",
--                                                       e->sb.st_mode & ~S_IFMT, e->sb.st_size, wrote,
-+                                       printf("\tf %04o %9lld (%9u) %5d:%-3d %s\n",
-+                                                       e->sb.st_mode & ~S_IFMT, (long long)e->sb.st_size, wrote,
-                                                        (int) e->sb.st_uid, (int) e->sb.st_gid, e->name);
-                                }
-                                break;
-diff --git a/lib/libmtd.c b/lib/libmtd.c
-index 86c89ae..f375381 100644
---- a/lib/libmtd.c
-+++ b/lib/libmtd.c
-@@ -1079,8 +1079,8 @@ int mtd_read(const struct mtd_dev_info *mtd, int fd, int eb, int offs,
-        /* Seek to the beginning of the eraseblock */
-        seek = (off_t)eb * mtd->eb_size + offs;
-        if (lseek(fd, seek, SEEK_SET) != seek)
--               return sys_errmsg("cannot seek mtd%d to offset %"PRIdoff_t,
--                                 mtd->mtd_num, seek);
-+               return sys_errmsg("cannot seek mtd%d to offset %lld",
-+                                 mtd->mtd_num, (long long)seek);
- 
-        while (rd < len) {
-                ret = read(fd, buf + rd, len - rd);
-@@ -1188,8 +1188,8 @@ int mtd_write(libmtd_t desc, const struct mtd_dev_info *mtd, int fd, int eb,
-        if (data) {
-                /* Seek to the beginning of the eraseblock */
-                if (lseek(fd, seek, SEEK_SET) != seek)
--                       return sys_errmsg("cannot seek mtd%d to offset %"PRIdoff_t,
--                                       mtd->mtd_num, seek);
-+                       return sys_errmsg("cannot seek mtd%d to offset %lld",
-+                                       mtd->mtd_num, (long long)seek);
-                ret = write(fd, data, len);
-                if (ret != len)
-                        return sys_errmsg("cannot write %d bytes to mtd%d "
-diff --git a/misc-utils/flash_erase.c b/misc-utils/flash_erase.c
-index 0c9449f..ec4b2e1 100644
---- a/misc-utils/flash_erase.c
-+++ b/misc-utils/flash_erase.c
-@@ -53,8 +53,8 @@ int target_endian = __BYTE_ORDER;
- static void show_progress(struct mtd_dev_info *mtd, off_t start, int eb,
-                          int eb_start, int eb_cnt)
- {
--       bareverbose(!quiet, "\rErasing %d Kibyte @ %"PRIxoff_t" -- %2i %% complete ",
--               mtd->eb_size / 1024, start, ((eb - eb_start) * 100) / eb_cnt);
-+       bareverbose(!quiet, "\rErasing %d Kibyte @ %llx -- %2i %% complete ",
-+               mtd->eb_size / 1024, (unsigned long long)start, ((eb - eb_start) * 100) / eb_cnt);
-        fflush(stdout);
- }
- 
-@@ -210,7 +210,7 @@ int main(int argc, char *argv[])
-                if (!noskipbad) {
-                        int ret = mtd_is_bad(&mtd, fd, eb);
-                        if (ret > 0) {
--                               verbose(!quiet, "Skipping bad block at %08"PRIxoff_t, offset);
-+                               verbose(!quiet, "Skipping bad block at %08llx", (unsigned long long)offset);
-                                continue;
-                        } else if (ret < 0) {
-                                if (errno == EOPNOTSUPP) {
-diff --git a/misc-utils/flash_otp_write.c b/misc-utils/flash_otp_write.c
-index b02d0b0..04c96c6 100644
---- a/misc-utils/flash_otp_write.c
-+++ b/misc-utils/flash_otp_write.c
-@@ -76,7 +76,7 @@ int main(int argc,char *argv[])
-                return errno;
-        }
- 
--       printf("Writing OTP user data on %s at offset 0x%"PRIxoff_t"\n", argv[2], offset);
-+       printf("Writing OTP user data on %s at offset 0x%llx\n", argv[2], (unsigned long long)offset);
- 
-        if (mtd_type_is_nand_user(&mtdInfo))
-                len = mtdInfo.writesize;
-diff --git a/misc-utils/ftl_check.c b/misc-utils/ftl_check.c
-index a853cf4..e854922 100644
---- a/misc-utils/ftl_check.c
-+++ b/misc-utils/ftl_check.c
-@@ -131,7 +131,7 @@ static void check_partition(int fd)
-                        perror("read failed");
-                        break;
-                }
--               printf("\nErase unit %"PRIdoff_t":\n", i);
-+               printf("\nErase unit %lld:\n", (long long)i);
-                if ((hdr2.FormattedSize != hdr.FormattedSize) ||
-                                (hdr2.NumEraseUnits != hdr.NumEraseUnits) ||
-                                (hdr2.SerialNumber != hdr.SerialNumber))
-diff --git a/misc-utils/mtd_debug.c b/misc-utils/mtd_debug.c
-index ac37e23..d65ad36 100644
---- a/misc-utils/mtd_debug.c
-+++ b/misc-utils/mtd_debug.c
-@@ -160,7 +160,7 @@ retry:
-        if (buf != NULL)
-                free(buf);
-        close(outfd);
--       printf("Copied %zu bytes from address 0x%.8"PRIxoff_t" in flash to %s\n", len, offset, filename);
-+       printf("Copied %zu bytes from address 0x%.8llx in flash to %s\n", len, (unsigned long long)offset, filename);
-        return 0;
- 
- err2:
-@@ -225,7 +225,7 @@ retry:
-        if (buf != NULL)
-                free(buf);
-        fclose(fp);
--       printf("Copied %d bytes from %s to address 0x%.8"PRIxoff_t" in flash\n", len, filename, offset);
-+       printf("Copied %d bytes from %s to address 0x%.8llx in flash\n", len, filename, (unsigned long long)offset);
-        return 0;
- }
- 
-diff --git a/misc-utils/serve_image.c b/misc-utils/serve_image.c
-index f2475d6..6c8c8fb 100644
---- a/misc-utils/serve_image.c
-+++ b/misc-utils/serve_image.c
-@@ -129,8 +129,8 @@ int main(int argc, char **argv)
-        }
- 
-        if (st.st_size % erasesize) {
--               fprintf(stderr, "Image size %" PRIdoff_t " bytes is not a multiple of erasesize %d bytes\n",
--                               st.st_size, erasesize);
-+               fprintf(stderr, "Image size %lld bytes is not a multiple of erasesize %d bytes\n",
-+                               (long long)st.st_size, erasesize);
-                exit(1);
-        }
-        image = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, rfd, 0);
-diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
-index 84753d6..0a7f142 100644
---- a/tests/fs-tests/integrity/integck.c
-+++ b/tests/fs-tests/integrity/integck.c
-@@ -897,8 +897,8 @@ static ssize_t file_write_data(struct file_info *file, int fd, off_t offset,
-        remains = size;
-        actual = 0;
-        written = IO_BUFFER_SIZE;
--       v("write %zd bytes, offset %"PRIdoff_t", file %s",
--         size, offset, get_file_name(file));
-+       v("write %zd bytes, offset %lld, file %s",
-+         size, (long long)offset, get_file_name(file));
-        while (remains) {
-                /* Fill up buffer with random data */
-                if (written < IO_BUFFER_SIZE) {
-diff --git a/tests/mtd-tests/nandpagetest.c b/tests/mtd-tests/nandpagetest.c
-index c6812df..465e548 100644
---- a/tests/mtd-tests/nandpagetest.c
-+++ b/tests/mtd-tests/nandpagetest.c
-@@ -232,8 +232,8 @@ static int verify_eraseblock(int ebnum)
-                        return err;
- 
-                if (lseek(fd, addr, SEEK_SET) != addr) {
--                       fprintf(stderr, "cannot seek mtd%d to offset %"PRIdloff_t,
--                                       mtd.mtd_num, addr);
-+                       fprintf(stderr, "cannot seek mtd%d to offset %lld",
-+                                       mtd.mtd_num, (long long)addr);
-                        return -1;
-                }
- 
-diff --git a/tests/ubi-tests/integ.c b/tests/ubi-tests/integ.c
-index 26c2ce5..1cd0649 100644
---- a/tests/ubi-tests/integ.c
-+++ b/tests/ubi-tests/integ.c
-@@ -243,7 +243,7 @@ static void check_erase_block(struct erase_block_info *erase_block, int fd)
-                        while (size)
-                                if (read_buffer[--size] != 0xff) {
-                                        fprintf(stderr, "block no. = %d\n" , erase_block->block_number);
--                                       fprintf(stderr, "offset = %"PRIdoff_t"\n" , gap_start);
-+                                       fprintf(stderr, "offset = %lld\n" , (long long)gap_start);
-                                        fprintf(stderr, "size = %ld\n" , (long) bytes_read);
-                                        error_exit("verify 0xff failed");
-                                }
-@@ -254,7 +254,7 @@ static void check_erase_block(struct erase_block_info *erase_block, int fd)
-                errno = 0;
-                bytes_read = read(fd, read_buffer, w->size);
-                if (bytes_read != w->size) {
--                       fprintf(stderr, "offset = %"PRIdoff_t"\n" , w->offset);
-+                       fprintf(stderr, "offset = %lld\n" , (long long)w->offset);
-                        fprintf(stderr, "size = %ld\n" , (long) w->size);
-                        fprintf(stderr, "bytes_read = %ld\n" , (long) bytes_read);
-                        error_exit("read failed");
-@@ -279,7 +279,7 @@ static void check_erase_block(struct erase_block_info *erase_block, int fd)
-                while (size)
-                        if (read_buffer[--size] != 0xff) {
-                                fprintf(stderr, "block no. = %d\n" , erase_block->block_number);
--                               fprintf(stderr, "offset = %"PRIdoff_t"\n" , gap_start);
-+                               fprintf(stderr, "offset = %lld\n" , (long long)gap_start);
-                                fprintf(stderr, "size = %ld\n" , (long) bytes_read);
-                                error_exit("verify 0xff failed!");
-                        }
-diff --git a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
-index c916f48..f0237ab 100644
---- a/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
-+++ b/ubifs-utils/mkfs.ubifs/mkfs.ubifs.c
-@@ -772,11 +772,11 @@ int write_leb(int lnum, int len, void *buf)
-                        return sys_err_msg("ubi_leb_change_start failed");
- 
-        if (lseek(out_fd, pos, SEEK_SET) != pos)
--               return sys_err_msg("lseek failed seeking %"PRIdoff_t, pos);
-+               return sys_err_msg("lseek failed seeking %lld", (long long)pos);
- 
-        if (write(out_fd, buf, c->leb_size) != c->leb_size)
--               return sys_err_msg("write failed writing %d bytes at pos %"PRIdoff_t,
--                                  c->leb_size, pos);
-+               return sys_err_msg("write failed writing %d bytes at pos %lld",
-+                                  c->leb_size, (long long)pos);
- 
-        return 0;
- }
--- 
-2.7.4
-
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0005-common.h-replace-getline-with-fgets.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0005-common.h-replace-getline-with-fgets.patch
deleted file mode 100644
index a556ed3d87..0000000000
--- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0005-common.h-replace-getline-with-fgets.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2137eb1a6cd0326510bd3b9faf8037d9bf34ca3d Mon Sep 17 00:00:00 2001
-From: Andrea Adami <andrea.adami@gmail.com>
-Date: Wed, 23 May 2018 15:52:34 +0200
-Subject: [PATCH] common.h: replace getline() with fgets
-
-There is an unofficial upstream patch adding a simple getline()
-to libmissing.h. Unfortunately the patch creates issues if the
-toolchain is using glibc (autotools cache?) so for the moment
-keep the old hack and wait for commits upstream.
-
-Fix:
-
-| ubi-utils/ubiformat.o: In function `prompt.constprop.4':
-| ubiformat.c:(.text+0x70): undefined reference to `getline'
-
-Upstream-Status: Inappropriate [klibc specific]
-
-Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
----
- include/common.h | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/include/common.h b/include/common.h
-index a1d59d0..96b0bdb 100644
---- a/include/common.h
-+++ b/include/common.h
-@@ -126,15 +126,26 @@ extern "C" {
-  */
- static inline bool prompt(const char *msg, bool def)
- {
-+
-+#ifndef __KLIBC__
-        char *line = NULL;
-        size_t len;
-+#else
-+       char *line;
-+       const int sizeof_line = 2;
-+       line = malloc(sizeof_line);
-+#endif
-        bool ret = def;
- 
-        do {
-                normsg_cont("%s (%c/%c) ", msg, def ? 'Y' : 'y', def ? 'n' : 'N');
-                fflush(stdout);
- 
-+#ifndef __KLIBC__
-                while (getline(&line, &len, stdin) == -1) {
-+#else
-+               while (fgets(line, sizeof_line, stdin) == NULL) {
-+#endif
-                        printf("failed to read prompt; assuming '%s'\n",
-                                def ? "yes" : "no");
-                        break;
--- 
-2.7.4
-
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.3.0/0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch
index 4ee9bd9a18..26a07688e9 100644
--- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.3.0/0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch
@@ -23,9 +23,9 @@ diff --git a/include/libmissing.h b/include/libmissing.h
 index 0196033..832c372 100644
 --- a/include/libmissing.h
 +++ b/include/libmissing.h
-@@ -3,9 +3,11 @@
- 
- #include "config.h"
+@@ -1,9 +1,11 @@
+ #ifndef LIBMISSING_H
+ #define LIBMISSING_H
  
 +#ifndef __KLIBC__
  #ifdef HAVE_EXECINFO_H
@@ -35,6 +35,3 @@ index 0196033..832c372 100644
  
  #ifndef HAVE_EXECINFO_H
  int backtrace(void **buffer, int size);
--- 
-2.7.4
-
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-make-Add-compiler-includes-in-cflags.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.3.0/0001-make-Add-compiler-includes-in-cflags.patch
index 778d830128..d58cdfd5c4 100644
--- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0001-make-Add-compiler-includes-in-cflags.patch
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.3.0/0001-make-Add-compiler-includes-in-cflags.patch
@@ -19,14 +19,11 @@ diff --git a/Makefile.am b/Makefile.am
 index 5a6e77c..f0003d5 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -9,6 +9,7 @@ endif
- if WITHOUT_LZO
- AM_CPPFLAGS += -DWITHOUT_LZO
+@@ -26,6 +26,7 @@ endif
+ if WITH_CRYPTO
+ AM_CPPFLAGS += -DWITH_CRYPTO
  endif
 +AM_CPPFLAGS += -I$(shell $(CC) -print-file-name=include)
  
  sbin_PROGRAMS =
  sbin_SCRIPTS =
--- 
-2.30.0
-
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0003-Makefile.am-only-build-ubi-utils.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.3.0/0003-Makefile.am-only-build-ubi-utils.patch
index 38ab7a91cb..de36c3c8d9 100644
--- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0003-Makefile.am-only-build-ubi-utils.patch
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.3.0/0003-Makefile.am-only-build-ubi-utils.patch
@@ -16,7 +16,7 @@ diff --git a/Makefile.am b/Makefile.am
 index 5a6e77c..98715dd 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -34,9 +34,9 @@ EXTRA_DIST += $(GLOBAL_HEADER) $(GLOBAL_EXTRA)
+@@ -46,9 +46,9 @@ EXTRA_DIST = COPYING CHANGELOG.md README.txt
  
  include lib/Makemodule.am
  include ubi-utils/Makemodule.am
@@ -29,6 +29,3 @@ index 5a6e77c..98715dd 100644
  
  if BUILD_UBIFS
  include ubifs-utils/Makemodule.am
--- 
-2.7.4
-
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.3.0/0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch
index 2844a5020c..2844a5020c 100644
--- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.0.2/0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.3.0/0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.3.0.bb
index 461d75e625..3fcda333c9 100644
--- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.0.2.bb
+++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_2.3.0.bb
@@ -9,18 +9,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
 
 inherit autotools pkgconfig klibc
 
-SRCREV = "64f61a9dc71b158c7084006cbce4ea23886f0b47"
-SRC_URI = "git://git.infradead.org/mtd-utils.git;branch=master \
+SRCREV = "4594fc1f4496a0ed55cabd31fbeba4e3fbf05602"
+SRC_URI = "git://git.infraroot.at/mtd-utils.git;protocol=https;branch=master \
              file://0001-libmissing.h-fix-klibc-build-when-using-glibc-toolch.patch \
-             file://0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch \
              file://0003-Makefile.am-only-build-ubi-utils.patch \
              file://0004-mtd-utils-common.h-no-features.h-for-klibc-builds.patch \
-             file://0005-common.h-replace-getline-with-fgets.patch \
              file://0001-make-Add-compiler-includes-in-cflags.patch \
              "
 
-
-EXTRA_OECONF += "--disable-tests --without-jffs --without-ubifs"
+# ubihealthd fails to build since 2.3.0
+EXTRA_OECONF += "--without-tests --without-jffs --without-ubifs --disable-ubihealthd"
 
 PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'xattr', d)}"
 PACKAGECONFIG[xattr] = ",,acl,"
@@ -36,7 +34,7 @@ PACKAGES = "ubi-utils-klibc-dbg ubi-utils-klibc-doc"
 
 PACKAGES =+ "mtdinfo-klibc ubiattach-klibc ubiblock-klibc ubicrc32-klibc ubidetach-klibc \
              ubiformat-klibc ubimkvol-klibc ubinfo-klibc ubinize-klibc ubirename-klibc \
-             ubirmvol-klibc ubirsvol-klibc ubiupdatevol-klibc"
+             ubirmvol-klibc ubirsvol-klibc ubiscan-klibc ubiupdatevol-klibc"
 
 FILES:mtdinfo-klibc = "${sbindir}/mtdinfo"
 FILES:ubiattach-klibc = "${sbindir}/ubiattach"
@@ -50,4 +48,5 @@ FILES:ubinize-klibc = "${sbindir}/ubinize"
 FILES:ubirename-klibc = "${sbindir}/ubirename"
 FILES:ubirmvol-klibc = "${sbindir}/ubirmvol"
 FILES:ubirsvol-klibc = "${sbindir}/ubirsvol"
+FILES:ubiscan-klibc = "${sbindir}/ubiscan"
 FILES:ubiupdatevol-klibc = "${sbindir}/ubiupdatevol"
diff --git a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.4.bb b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
index 07ac602d12..e6dfe43092 100644
--- a/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.4.bb
+++ b/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.5.bb
@@ -26,7 +26,7 @@ SRC_URI = "gitsm://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls
            file://run-ptest \
            "
 
-SRCREV = "c765c831e5c2a0971410692f92f7a81d6ec65ec2"
+SRCREV = "e185d7fd85499c8ce5ca2a54f5cf8fe7dbe3f8df"
 
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
 
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch
index 0ddcb642bc..9595241c41 100644
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Fix-pkgconfig-dir-for-multilib.patch
@@ -1,4 +1,4 @@
-From 2f931baf290477b586309189445bf87e3bc5d5ba Mon Sep 17 00:00:00 2001
+From 73773d45230a3c9d73ed3c1aa26f0d5c87d29037 Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Wed, 2 Mar 2022 14:51:13 +0800
 Subject: [PATCH] Fix pkgconfig dir for multilib
@@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ab399a69..beae6eaf 100644
+index 899f54f0..7f38ecd0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -637,7 +637,7 @@ endif()
+@@ -661,7 +661,7 @@ endif()
  # create pkg-config file
  if(NOT WIN32)
          configure_file(${VSOMEIP_NAME}.pc.in ${PROJECT_BINARY_DIR}/${VSOMEIP_NAME}.pc @ONLY)
@@ -24,5 +24,5 @@ index ab399a69..beae6eaf 100644
  
  ##############################################################################
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch
index bdaf343606..b1146783d9 100644
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-Install-example-configuration-files-to-etc-vsomeip.patch
@@ -1,4 +1,4 @@
-From ebaa3206ee125741314272cddafa04fa71bd2d1e Mon Sep 17 00:00:00 2001
+From b79c6368d29746fd8c1917ea9c9a36aaf58bb352 Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Wed, 9 Mar 2022 11:48:44 +0800
 Subject: [PATCH] Install example configuration files to /etc/vsomeip
@@ -11,10 +11,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index beae6eaf..d791c12e 100644
+index 7f38ecd0..28919e09 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -536,7 +536,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION lib/pkgconfig)
+@@ -578,7 +578,7 @@ install(FILES ${PROJECT_BINARY_DIR}/vsomeip.pc DESTINATION lib/pkgconfig)
  endif ()
  
  install (
@@ -24,5 +24,5 @@ index beae6eaf..d791c12e 100644
  
  # Add all targets to the build-tree export set
 -- 
-2.25.1
+2.34.1
 
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-specify-PIE-flag-explicitly.patch
index 2d789627a3..824ac99b24 100644
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Do-not-specify-PIE-flag-explicitly.patch
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0003-Do-not-specify-PIE-flag-explicitly.patch
@@ -1,4 +1,4 @@
-From ec2d36466c9050ee282ea1c3bb1b5f1f61c96ecb Mon Sep 17 00:00:00 2001
+From 1b6f73f7b36e38dd29d867ef6601df54b64ca85d Mon Sep 17 00:00:00 2001
 From: Yi Zhao <yi.zhao@windriver.com>
 Date: Mon, 17 Jul 2023 14:33:32 +0800
 Subject: [PATCH] Do not specify PIE flag explicitly
@@ -23,9 +23,11 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  CMakeLists.txt | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 28919e09..1c192fc5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -70,7 +70,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux"
+@@ -73,7 +73,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
      # This is only relevant for GCC and causes warnings on Clang
      set(EXPORTSYMBOLS "-Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc")
@@ -34,12 +36,15 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
  endif()
  
      set(NO_DEPRECATED "")
-@@ -78,7 +78,7 @@ endif()
-   if(NOT DEFINED _FORTIFY_SOURCE)
-       set(_FORTIFY_SOURCE 2)
-   endif()
--    set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -fPIE")
-+    set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic")
+@@ -82,7 +82,7 @@ endif()
+     if(NOT DEFINED _FORTIFY_SOURCE)
+         set(_FORTIFY_SOURCE 2)
+     endif()
+-    set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -fPIE -Wno-inconsistent-missing-override")
++    set(OS_CXX_FLAGS "${OS_CXX_FLAGS} -D_GLIBCXX_USE_NANOSLEEP -pthread -O -Wall -Wextra -Wformat -Wformat-security -Wconversion -fexceptions -fstrict-aliasing -fstack-protector-strong -fasynchronous-unwind-tables -fno-omit-frame-pointer -D_FORTIFY_SOURCE=${_FORTIFY_SOURCE} -Wformat -Wformat-security -Wpedantic -Werror -Wno-inconsistent-missing-override")
  
      # force all use of std::mutex and std::recursive_mutex to use runtime init
      # instead of static initialization so mutexes can be hooked to enable PI as needed
+-- 
+2.34.1
+
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-build-with-boost-1.89.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-build-with-boost-1.89.patch
new file mode 100644
index 0000000000..b3caded33c
--- /dev/null
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0004-Fix-build-with-boost-1.89.patch
@@ -0,0 +1,42 @@
+From 22af350ba78b5d2f8c6537ff867c3dd5eba05850 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Mon, 3 Nov 2025 23:06:35 +0800
+Subject: [PATCH] Fix build with boost 1.89
+
+The Boost.System stub library has been removed in Boost 1.89.0[1], which
+causes a CMake error:
+
+CMake Error at Boost-1.89.0/BoostConfig.cmake:141 (find_package):
+  Could not find a package configuration file provided by "boost_system"
+  (requested version 1.89.0) with any of the following names:
+    boost_systemConfig.cmake
+    boost_system-config.cmake
+
+Drop 'system' from the COMPONENTS in find_package to fix this issue[2].
+
+[1] https://github.com/boostorg/system/commit/7a495bb46d7ccd808e4be2a6589260839b0fd3a3
+[2] https://github.com/boostorg/system/issues/132
+
+Upstream-Status: Pending
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1c192fc5..e6b54bc5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -189,7 +189,7 @@ add_definitions(-DVSOMEIP_INTERNAL_SUPPRESS_DEPRECATED)
+ find_package(Threads REQUIRED)
+ 
+ # Boost
+-find_package( Boost 1.66 COMPONENTS system thread filesystem REQUIRED )
++find_package( Boost 1.66 COMPONENTS thread filesystem REQUIRED )
+ if(${CMAKE_SYSTEM_NAME} MATCHES "QNX")
+     include_directories(${Boost_INCLUDE_DIR} )
+ else()
+-- 
+2.34.1
+
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch
new file mode 100644
index 0000000000..0e8ff6e2ca
--- /dev/null
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-Replace-address-from_string-with-make_address.patch
@@ -0,0 +1,47 @@
+From 83fdae064c4bd5d38f23679fc8793e44e563c046 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Tue, 4 Nov 2025 22:10:33 +0800
+Subject: [PATCH] Replace address::from_string with make_address
+
+boost::asio::ip::address::from_string is deprecated since boost 1.87[1].
+Replace it with make_address.
+
+Fix:
+implementation/routing/src/routing_manager_impl.cpp:1406:98: error: 'from_string' is not a member of 'boost::asio::ip::address_v4'
+ 1406 |  _remote_address.is_v4() ?  _remote_address.to_v4() : boost::asio::ip::address_v4::from_string("6.6.6.6");
+      |                                                                                    ^~~~~~~~~~~
+
+[1] https://github.com/boostorg/asio/commit/c0d1cfce7767599c4cf00df36f8017a1073339ae
+
+Upstream-Status: Pending
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ implementation/routing/src/routing_manager_impl.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp
+index ad587c5e..73aeb334 100644
+--- a/implementation/routing/src/routing_manager_impl.cpp
++++ b/implementation/routing/src/routing_manager_impl.cpp
+@@ -1403,7 +1403,7 @@ void routing_manager_impl::on_message(const byte_t* _data, length_t _size, endpo
+     if (is_forwarded) {
+         trace::header its_header;
+         const boost::asio::ip::address_v4 its_remote_address =
+-                _remote_address.is_v4() ? _remote_address.to_v4() : boost::asio::ip::address_v4::from_string("6.6.6.6");
++                _remote_address.is_v4() ? _remote_address.to_v4() : boost::asio::ip::make_address_v4("6.6.6.6");
+         trace::protocol_e its_protocol = _receiver->is_local() ? trace::protocol_e::local
+                 : _receiver->is_reliable()                     ? trace::protocol_e::tcp
+                                                                : trace::protocol_e::udp;
+@@ -1441,7 +1441,7 @@ bool routing_manager_impl::on_message(service_t _service, instance_t _instance,
+         std::shared_ptr<endpoint> _receiver = its_info->get_endpoint(_reliable);
+         if (_receiver && _receiver.get()) {
+             if(!is_acl_message_allowed(_receiver.get(), _service, _instance,
+-                    boost::asio::ip::address_v4::from_string("127.0.0.1"))) {
++                    boost::asio::ip::make_address_v4("127.0.0.1"))) {
+                 return false;
+             }
+         }
+-- 
+2.34.1
+
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch
deleted file mode 100644
index 25d66514f8..0000000000
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip/0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8676ef287bb25b49668be4336387bdf83a0cae5c Mon Sep 17 00:00:00 2001
-From: Yi Zhao <yi.zhao@windriver.com>
-Date: Mon, 1 Jan 2024 17:02:41 +0800
-Subject: [PATCH] test/common/CMakeLists.txt: add missing link with dlt
-
-The libvsomeip_utilities library uses functions e.g.
-dlt_check_library_version/dlt_register_app/dlt_unregister_app which are
-provided by dlt therefore add it to linker flags.
-
-Fixes:
-x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_check_library_version
->>> referenced by test/common/libvsomeip_utilities.so
-
-x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_register_app
->>> referenced by test/common/libvsomeip_utilities.so
-
-x86_64-poky-linux-ld.lld: error: undefined reference due to --no-allow-shlib-undefined: dlt_unregister_app
->>> referenced by test/common/libvsomeip_utilities.so
-
-Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/602]
-
-Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
----
- test/common/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt
-index d4d14534..afc8c2d6 100644
---- a/test/common/CMakeLists.txt
-+++ b/test/common/CMakeLists.txt
-@@ -27,6 +27,7 @@ TARGET_LINK_LIBRARIES (
-         ${Boost_LIBRARIES}
-         ${DL_LIBRARY}
-         ${TEST_LINK_LIBRARIES}
-+        ${DLT_LIBRARIES}
- )
- 
- # ----------------------------------------------------------------------------
--- 
-2.25.1
-
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip/0006-Fix-scanning-64-bit-integer-types.patch b/meta-networking/recipes-protocols/vsomeip/vsomeip/0006-Fix-scanning-64-bit-integer-types.patch
new file mode 100644
index 0000000000..f7aca8333d
--- /dev/null
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip/0006-Fix-scanning-64-bit-integer-types.patch
@@ -0,0 +1,128 @@
+From 2cdb9e4d2fc7ac11a886b7b524b6b9b5173b5667 Mon Sep 17 00:00:00 2001
+From: Yi Zhao <yi.zhao@windriver.com>
+Date: Tue, 4 Nov 2025 12:50:51 +0800
+Subject: [PATCH] Fix scanning 64-bit integer types
+
+Fix build error on 32-bit host:
+test/network_tests/cpu_load_tests/cpu_load_measurer.cpp:89:24: error: format '%lu' expects argument of type 'long unsigned int*',
+but argument 3 has type 'uint64_t*' {aka 'long long unsigned int*'} [-Werror=format=]
+   89 |   "%lu %lu %ld %ld", // utime, stime, cutime, cstime
+      |    ~~^
+      |      |
+      |      long unsigned int*
+      |    %llu
+   90 |   &utime, &stime, &cutime, &cstime)
+      |   ~~~~~~
+      |   |
+      |   uint64_t* {aka long long unsigned int*}
+
+Upstream-Status: Pending
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ implementation/routing/src/routing_manager_impl.cpp     | 4 +++-
+ test/network_tests/cpu_load_tests/cpu_load_measurer.cpp | 6 ++++--
+ test/network_tests/memory_tests/memory_test_client.cpp  | 4 +++-
+ test/network_tests/memory_tests/memory_test_service.cpp | 4 +++-
+ 4 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp
+index 73aeb334..0d729714 100644
+--- a/implementation/routing/src/routing_manager_impl.cpp
++++ b/implementation/routing/src/routing_manager_impl.cpp
+@@ -9,6 +9,7 @@
+ #include <sstream>
+ #include <forward_list>
+ #include <thread>
++#include <cinttypes>
+ 
+ #if defined(__linux__) || defined(__QNX__)
+ #include <unistd.h>
+@@ -3828,7 +3829,8 @@ void routing_manager_impl::memory_log_timer_cbk(boost::system::error_code const&
+     std::uint64_t its_dirtypages(0);
+ 
+     if (EOF
+-        == std::fscanf(its_file, "%lu %lu %lu %lu %lu %lu %lu", &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, &its_data,
++        == std::fscanf(its_file, "%" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64,
++                    &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib, &its_data,
+                     &its_dirtypages)) {
+         VSOMEIP_ERROR << "memory_log_timer_cbk: error reading: errno " << errno;
+     }
+diff --git a/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp b/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp
+index aaf91174..dfe27e8c 100644
+--- a/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp
++++ b/test/network_tests/cpu_load_tests/cpu_load_measurer.cpp
+@@ -12,6 +12,7 @@
+ #include <vector>
+ #include <stdexcept>
+ #include <cstdio>
++#include <cinttypes>
+ 
+ #include <sys/types.h>
+ #include <unistd.h>
+@@ -86,7 +87,7 @@ std::uint64_t cpu_load_measurer::read_proc_pid_stat() {
+     std::int64_t cstime(0);
+     if (std::fscanf(f,
+                     "%*d %*s %*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u "
+-                    "%lu %lu %ld %ld", // utime, stime, cutime, cstime
++                    "%" SCNu64 " %" SCNu64 " %" SCNi64 " %" SCNi64, // utime, stime, cutime, cstime
+                     &utime, &stime, &cutime, &cstime)
+         == EOF) {
+         std::cerr << "Failed to read " + path << std::endl;
+@@ -116,7 +117,8 @@ std::uint64_t cpu_load_measurer::read_proc_stat(std::uint64_t* _idle) {
+     std::uint64_t steal(0);
+     std::uint64_t guest(0);
+     std::uint64_t guest_nice(0);
+-    if (std::fscanf(f, "%*s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu", &user, &nice, &system, &idle, &iowait, &irq, &softirq, &steal, &guest,
++    if (std::fscanf(f, "%*s %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64,
++                    &user, &nice, &system, &idle, &iowait, &irq, &softirq, &steal, &guest,
+                     &guest_nice)
+         == EOF) {
+         std::cerr << "Failed to read /proc/stat" << std::endl;
+diff --git a/test/network_tests/memory_tests/memory_test_client.cpp b/test/network_tests/memory_tests/memory_test_client.cpp
+index 102c8218..d922ad81 100644
+--- a/test/network_tests/memory_tests/memory_test_client.cpp
++++ b/test/network_tests/memory_tests/memory_test_client.cpp
+@@ -6,6 +6,7 @@
+ #include <chrono>
+ #include <iomanip>
+ #include <cstring>
++#include <cinttypes>
+ 
+ #include <vsomeip/internal/logger.hpp>
+ #include "memory_test_client.hpp"
+@@ -30,7 +31,8 @@ void check_memory(std::vector<std::uint64_t>& test_memory_, std::atomic<bool>& s
+         std::uint64_t its_dirtypages(0);
+ 
+         if (EOF
+-            == std::fscanf(its_file, "%lu %lu %lu %lu %lu %lu %lu", &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib,
++            == std::fscanf(its_file, "%" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64,
++                           &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib,
+                            &its_data, &its_dirtypages)) {
+             VSOMEIP_ERROR << "check_memory: error reading: errno " << errno;
+         }
+diff --git a/test/network_tests/memory_tests/memory_test_service.cpp b/test/network_tests/memory_tests/memory_test_service.cpp
+index a8547395..751c6f9e 100644
+--- a/test/network_tests/memory_tests/memory_test_service.cpp
++++ b/test/network_tests/memory_tests/memory_test_service.cpp
+@@ -5,6 +5,7 @@
+ 
+ #include <vsomeip/internal/logger.hpp>
+ #include <cstring>
++#include <cinttypes>
+ 
+ #include "memory_test_service.hpp"
+ 
+@@ -28,7 +29,8 @@ void check_memory(std::vector<std::uint64_t>& test_memory_, std::atomic<bool>& s
+         std::uint64_t its_dirtypages(0);
+ 
+         if (EOF
+-            == std::fscanf(its_file, "%lu %lu %lu %lu %lu %lu %lu", &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib,
++            == std::fscanf(its_file, "%" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64,
++                           &its_size, &its_rsssize, &its_sharedpages, &its_text, &its_lib,
+                            &its_data, &its_dirtypages)) {
+             VSOMEIP_ERROR << "check_memory: error reading: errno " << errno;
+         }
+-- 
+2.34.1
+
diff --git a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.3.bb b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.9.bb
index f854078004..2ef1682daa 100644
--- a/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.3.bb
+++ b/meta-networking/recipes-protocols/vsomeip/vsomeip_3.5.9.bb
@@ -7,25 +7,26 @@ SECTION = "net"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
-GTEST_VER = "1.15.2"
+GTEST_VER = "1.17.0"
 SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name=vsomeip \
            https://github.com/google/googletest/releases/download/v${GTEST_VER}/googletest-${GTEST_VER}.tar.gz;name=gtest;subdir=${BB_GIT_DEFAULT_DESTSUFFIX}/ \
            file://0001-Fix-pkgconfig-dir-for-multilib.patch \
            file://0002-Install-example-configuration-files-to-etc-vsomeip.patch \
-           file://0004-Do-not-specify-PIE-flag-explicitly.patch \
-           file://0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch \
+           file://0003-Do-not-specify-PIE-flag-explicitly.patch \
+           file://0004-Fix-build-with-boost-1.89.patch \
+           file://0005-Replace-address-from_string-with-make_address.patch \
+           file://0006-Fix-scanning-64-bit-integer-types.patch \
           "
 
-SRCREV = "6461369b3874c844642c9adaac9d1b7406794ab8"
-SRC_URI[gtest.sha256sum] = "7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926"
+SRCREV = "bb35c97194d6a5f228d68d2b7dabbce67b28af1e"
+SRC_URI[gtest.sha256sum] = "65fab701d9829d38cb77c14acdc431d2108bfdbf8979e40eb8ae567edf10b27c"
 
 COMPATIBLE_HOST:mips = "null"
 COMPATIBLE_HOST:mips64 = "null"
 COMPATIBLE_HOST:powerpc = "null"
 COMPATIBLE_HOST:libc-musl = 'null'
 
-DEPENDS = "boost dlt-daemon googletest"
-
+DEPENDS = "boost dlt-daemon"
 
 inherit cmake pkgconfig
 
@@ -43,9 +44,10 @@ EXTRA_OECMAKE += "-DTEST_IP_MASTER=10.0.3.1 \
 
 RDEPENDS:${PN}-test = "bash lsof"
 
-do_compile:append() {
-    cmake_runcmake_build --target examples
-    cmake_runcmake_build --target build_tests
+OECMAKE_TARGET_COMPILE += "vsomeip_ctrl examples build_tests"
+
+do_compile:prepend() {
+    sed -i -e 's#${S}/build#/opt/${PN}-test#g' ${S}/test/unit_tests/security_policy_manager_impl_tests/policy_manager_impl_unit_test_macro.hpp
 }
 
 do_install:append() {
@@ -58,13 +60,17 @@ do_install:append() {
     install -d ${D}/opt/${PN}-test/test/test/common
     cp -rf ${S}/test/common/examples_policies \
         ${D}/opt/${PN}-test/test/test/common/
+
+    install -d ${D}/opt/${PN}-test/test/common
     install -m 0755 ${B}/test/common/libvsomeip_utilities.so \
-        ${D}/opt/${PN}-test/test/test/common/
+        ${D}/opt/${PN}-test/test/common/
 
     for d in unit_tests network_tests; do
         install -d ${D}/opt/${PN}-test/test/$d
         cp -rf ${B}/test/$d/*_tests ${D}/opt/${PN}-test/test/$d
+        find ${D}/opt/${PN}-test/test/$d -maxdepth 2 \( -name "*.cmake" -o -name "CMakeFiles" \) -exec rm -rf {} \;
     done
+    sed -i -e 's#../..${B}#/opt/${PN}-test#g' ${D}/opt/${PN}-test/test/network_tests/lazy_load_tests/vsomeip/vsomeip_policy_extensions.json
 }
 
 PACKAGES += "${PN}-test"
@@ -75,4 +81,5 @@ FILES:${PN}-dbg += " \
 FILES:${PN}-test = " \
    /opt/${PN}-test \
    "
-SKIP_RECIPE[vsomeip] ?= "Does not work with boost >= 1.87"
+
+INSANE_SKIP += "32bit-time"
diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
index 78ba1e228c..a54e37562e 100644
--- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
+++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc
@@ -33,6 +33,7 @@ PTESTS_FAST_META_OE = "\
     libxml++-5.0 \
     libyang \
     lmdb \
+    mbedtls \
     microsoft-gsl \
     minicoredumper \
     minizip-ng \
diff --git a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
index d3a01e444c..439ab800f8 100644
--- a/meta-oe/recipes-gnome/gtk+/gtkmm4_4.14.0.bb
+++ b/meta-oe/recipes-gnome/gtk+/gtkmm4_4.20.0.bb
@@ -3,8 +3,10 @@ HOMEPAGE = "http://www.gtkmm.org/"
 SECTION = "libs"
 
 LICENSE = "LGPL-2.1-only & GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
-                    file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe"
+LIC_FILES_CHKSUM = " \
+        file://COPYING;md5=4bf661c1e3793e55c8d1051bc5e0ae21 \
+        file://COPYING.tools;md5=570a9b3749dd0463a1778803b12a6dce \
+"
 
 DEPENDS = "glib-2.0-native atkmm pangomm-2.48 glibmm gtk4 cairomm-1.16 gdk-pixbuf-native"
 
@@ -14,7 +16,7 @@ inherit gnomebase features_check
 
 REQUIRED_DISTRO_FEATURES = "opengl x11"
 
-SRC_URI[archive.sha256sum] = "9350a0444b744ca3dc69586ebd1b6707520922b6d9f4f232103ce603a271ecda"
+SRC_URI[archive.sha256sum] = "daad9bf9b70f90975f91781fc7a656c923a91374261f576c883cd3aebd59c833"
 
 EXTRA_OEMESON = "-Dbuild-demos=false"
 
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-5.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-8.bb
index 8ba14261ae..f83adb15f2 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-5.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.2-8.bb
@@ -13,7 +13,7 @@ BASE_PV = "${@d.getVar('PV').split('-')[0]}"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>([0-9][\.|_|-]?)+)"
 
 SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https;tag=${PV}"
-SRCREV = "4a620c2a89a7481e83cb4a0ff32db0ccbb3afcd2"
+SRCREV = "a3b13d143fd7dea44cd71d31aa02f411b597688f"
 
 
 inherit autotools pkgconfig update-alternatives
diff --git a/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch b/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch
deleted file mode 100644
index 814912650b..0000000000
--- a/meta-oe/recipes-test/googletest/googletest/gtest-ciso646.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/google/googletest/issues/4701
-
-taken from fedora:
-https://src.fedoraproject.org/rpms/gtest/c/b3fe6f803a1e554971f70e1c3f55aa5fcb377b1b?branch=rawhide
-
-Upstream-Status: Pending
-Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
-
---- ./googletest/include/gtest/internal/gtest-port.h.orig       2025-01-27 03:39:18.963893931 +0000
-+++ ./googletest/include/gtest/internal/gtest-port.h    2025-01-28 13:57:51.381081952 +0000
-@@ -288,11 +288,11 @@
- 
- // Detect C++ feature test macros as gracefully as possible.
- // MSVC >= 19.15, Clang >= 3.4.1, and GCC >= 4.1.2 support feature test macros.
--#if GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && \
--    (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<version>))
-+#if GTEST_INTERNAL_HAS_INCLUDE(<version>) || \
-+    (GTEST_INTERNAL_CPLUSPLUS_LANG >= 202002L && !defined(__has_include))
- #include <version>  // C++20 and later
--#elif (!defined(__has_include) || GTEST_INTERNAL_HAS_INCLUDE(<ciso646>))
--#include <ciso646>  // Pre-C++20
-+#else
-+#include <cerrno>  // Pre-C++20
- #endif
- 
- #include <ctype.h>   // for isspace, etc
diff --git a/meta-oe/recipes-test/googletest/googletest_1.16.0.bb b/meta-oe/recipes-test/googletest/googletest_1.17.0.bb
index 55d670a428..c8ed80053d 100644
--- a/meta-oe/recipes-test/googletest/googletest_1.16.0.bb
+++ b/meta-oe/recipes-test/googletest/googletest_1.17.0.bb
@@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a"
 
 PROVIDES += "gmock gtest"
 
-SRCREV = "6910c9d9165801d8827d628cb72eb7ea9dd538c5"
-SRC_URI = "git://github.com/google/googletest.git;branch=v1.16.x;protocol=https \
-    file://gtest-ciso646.patch \
-"
+SRC_URI = "git://github.com/google/googletest.git;branch=v1.17.x;protocol=https \
+          "
+SRCREV = "52eb8108c5bdec04579160ae17225d66034bd723"
 
 inherit cmake pkgconfig