[oe][meta-oe][scarthgap][PATCH 01/38] evtest: upgrade 1.35 -> 1.36

[oe][meta-oe][scarthgap][PATCH 01/38] evtest: upgrade 1.35 -> 1.36

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
refreshed for 1.36

Changelog:
===============
- Add KEY_ROTATE_LOCK_TOGGLE, KEY_REFRESH_RATE_TOGGLE
- Add performance key
- Add ifdef
- Use bytes instead of bits for size of ioctl input
- CI: add workflow rules
- evtest 1.36
- Add SW_MACHINE_COVER
- add KEY_MACRO 1-30 and other keys

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 3682b77d4d7430e3542b57b3d0fb0a6318afe8bf)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch | 7 +++----
 .../recipes-test/evtest/{evtest_1.35.bb => evtest_1.36.bb} | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-test/evtest/{evtest_1.35.bb => evtest_1.36.bb} (90%)

diff --git a/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch b/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
index 595b0296ea..55162207f8 100644
--- a/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
+++ b/meta-oe/recipes-test/evtest/evtest/0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch
@@ -1,4 +1,4 @@
-From 490f5b6cd788692d989f07180a5714c76872911e Mon Sep 17 00:00:00 2001
+From 55c872430c9444d7edaf50db0faa9bbc31dd085f Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 30 Nov 2019 11:58:58 -0800
 Subject: [PATCH] Fix build on 32bit arches with 64bit time_t
@@ -10,13 +10,12 @@ input.h [1]
 
 Upstream-Status: Submitted [https://gitlab.freedesktop.org/libevdev/evtest/merge_requests/6]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
 ---
  evtest.c | 5 +++++
  1 file changed, 5 insertions(+)
 
 diff --git a/evtest.c b/evtest.c
-index ba7a161..8fc2e5a 100644
+index d3d3d8f..3045cce 100644
 --- a/evtest.c
 +++ b/evtest.c
 @@ -63,6 +63,11 @@
@@ -30,4 +29,4 @@ index ba7a161..8fc2e5a 100644
 +
  #define BITS_PER_LONG (sizeof(long) * 8)
  #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
- #define OFF(x)  ((x)%BITS_PER_LONG)
+ #define NBYTES(x) (NBITS(x) * sizeof(long))
diff --git a/meta-oe/recipes-test/evtest/evtest_1.35.bb b/meta-oe/recipes-test/evtest/evtest_1.36.bb
similarity index 90%
rename from meta-oe/recipes-test/evtest/evtest_1.35.bb
rename to meta-oe/recipes-test/evtest/evtest_1.36.bb
index 52f684ce5f..56f50f74ca 100644
--- a/meta-oe/recipes-test/evtest/evtest_1.35.bb
+++ b/meta-oe/recipes-test/evtest/evtest_1.36.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
 DEPENDS = "libxml2"
 
-SRCREV = "da347a8f88d2e5729dd12d61ee9743f902065b55"
+SRCREV = "96e6cb5ae90726883be095a3e467e847c06225f7"
 SRC_URI = "git://gitlab.freedesktop.org/libevdev/evtest.git;protocol=https;branch=master \
            file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \
            "

[oe][meta-oe][scarthgap][PATCH 02/38] xrdp: upgrade 0.9.19 -> 0.9.20

[ankur.tyagi85]

From: Jason Schonberg <schonm@gmail.com>

Patches updated with devtool

Changelog: https://github.com/neutrinolabs/xrdp/releases/tag/v0.9.20

Signed-off-by: Jason Schonberg <schonm@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 63e4df52f2187caa85a7e6b827f700ad9fa514a9)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ..._distinguished_name-in-etc-xrdp-openssl.con.patch |  7 ++-----
 .../xrdp/xrdp/0001-Fix-the-compile-error.patch       | 12 ++++++------
 .../0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch    |  9 +++------
 .../xrdp/0001-mark-count-with-unused-attribute.patch |  9 +++------
 .../xrdp/{xrdp_0.9.19.bb => xrdp_0.9.20.bb}          |  2 +-
 5 files changed, 15 insertions(+), 24 deletions(-)
 rename meta-oe/recipes-support/xrdp/{xrdp_0.9.19.bb => xrdp_0.9.20.bb} (97%)

diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
index 05803266cb..926ad93bbe 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
@@ -1,7 +1,7 @@
-From d705b1d666cb8713d86ea6fb2fc45c424128285a Mon Sep 17 00:00:00 2001
+From abdfa0fddeceab843ab6eabe31c7763c8719642b Mon Sep 17 00:00:00 2001
 From: Lei Maohui <leimaohui@cn.fujitsu.com>
 Date: Fri, 1 Dec 2017 10:24:50 +0900
-Subject: [PATCH] Added  req_distinguished_name in /etc/xrdp/openssl.conf,
+Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf,
  otherwise, cert.pem can't be created.
 
 Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
@@ -30,6 +30,3 @@ index 09db6c2..f077d72 100644
  
  [v3_ca]
  # Extensions for a typical CA - PKIX recommendation.
--- 
-1.8.4.2
-
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
index e8b4ffa6bf..1bb84001f3 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
@@ -1,3 +1,6 @@
+From 2fa575c3171688ceb0dc867a52628046b3f60d91 Mon Sep 17 00:00:00 2001
+From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
+Date: Tue, 12 Dec 2017 22:36:50 +0800
 Subject: [PATCH] Fix the make error
 
 Fix the compile error:
@@ -11,10 +14,10 @@ Upstream-Status: Pending
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
-index a259ef3..d5505b2 100644
+index 71d0f76..f41751b 100644
 --- a/xrdp/Makefile.am
 +++ b/xrdp/Makefile.am
-@@ -23,7 +23,7 @@ endif
+@@ -21,7 +21,7 @@ XRDP_EXTRA_LIBS =
  if XRDP_RFXCODEC
  AM_CPPFLAGS += -DXRDP_RFXCODEC
  AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include
@@ -23,7 +26,7 @@ index a259ef3..d5505b2 100644
  endif
  
  if XRDP_PIXMAN
-@@ -35,7 +35,7 @@ endif
+@@ -33,7 +33,7 @@ endif
  if XRDP_PAINTER
  AM_CPPFLAGS += -DXRDP_PAINTER
  AM_CPPFLAGS += -I$(top_srcdir)/libpainter/include
@@ -32,6 +35,3 @@ index a259ef3..d5505b2 100644
  endif
  
  sbin_PROGRAMS = \
--- 
-2.7.4
-
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch
index ea3eb11f0a..01449e2a5f 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch
@@ -1,4 +1,4 @@
-From 5958db649855bfb2ada7c0ed22a00f839b9a1161 Mon Sep 17 00:00:00 2001
+From 71e8fd272a4609cf3b6a0802cee82e2861a1fa0c Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 12 Mar 2021 21:40:35 -0800
 Subject: [PATCH] arch: Define NO_NEED_ALIGN on ppc64
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/common/arch.h b/common/arch.h
-index 617feb5e..6edb39db 100644
+index ec0aa05..f574656 100644
 --- a/common/arch.h
 +++ b/common/arch.h
-@@ -85,7 +85,7 @@ typedef int bool_t;
+@@ -86,7 +86,7 @@ typedef int bool_t;
  #define NEED_ALIGN
  #elif defined(__x86__) || defined(__x86_64__) || \
        defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
@@ -22,6 +22,3 @@ index 617feb5e..6edb39db 100644
        defined(__PPC__) || defined(__LITTLE_ENDIAN__) || \
        defined(__s390__) || defined (__s390x__) || \
        defined(__riscv)
--- 
-2.31.1
-
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch
index 77a394d556..2559ab7b31 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch
@@ -1,4 +1,4 @@
-From 492f74dbea1d9a15fbc3e870e78ab52e7fc5583b Mon Sep 17 00:00:00 2001
+From 23638d0ec23c2658a4e98321c20a4a2ac9294fb2 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Wed, 31 Aug 2022 20:19:32 -0700
 Subject: [PATCH] mark count with unused attribute
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c
-index 4452d998..b818bff3 100644
+index d66310b..eeb5921 100644
 --- a/sesman/chansrv/chansrv.c
 +++ b/sesman/chansrv/chansrv.c
 @@ -195,7 +195,7 @@ check_timeout(void)
@@ -24,8 +24,5 @@ index 4452d998..b818bff3 100644
 -    int count;
 +    int count __attribute__((unused));
      tui32 now;
- 
+     UNUSED_VAR(count);
      LOG_DEVEL(LOG_LEVEL_DEBUG, "check_timeout:");
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb
similarity index 97%
rename from meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb
rename to meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb
index b839a68294..363ab3ff8b 100644
--- a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb
+++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb
@@ -18,7 +18,7 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN
            file://0001-mark-count-with-unused-attribute.patch \
            "
 
-SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0"
+SRC_URI[sha256sum] = "db693401da95b71b4d4e4c99aeb569a546dbdbde343f6d3302b0c47653277abb"
 
 CFLAGS += " -Wno-deprecated-declarations"
 

[oe][meta-oe][scarthgap][PATCH 03/38] xmlsec1: upgrade 1.3.4 -> 1.3.5

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit baa80b33057efd5077dd438132837b65de1ba40b)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch   | 7 +++----
 .../xmlsec1/xmlsec1/change-finding-path-of-nss.patch       | 7 +++----
 .../xmlsec1/{xmlsec1_1.3.4.bb => xmlsec1_1.3.5.bb}         | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)
 rename meta-oe/recipes-support/xmlsec1/{xmlsec1_1.3.4.bb => xmlsec1_1.3.5.bb} (96%)

diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
index f107f42dab..697a8ee355 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
@@ -1,4 +1,4 @@
-From 4d73b85fb1b794c649359bc8a774b0111d36994a Mon Sep 17 00:00:00 2001
+From 1d7c01467e6f510b5636c73757f302a4bd277a3c Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Tue, 4 Feb 2020 23:39:49 -0800
 Subject: [PATCH] nss/nspr: fix for multilib
@@ -6,16 +6,15 @@ Subject: [PATCH] nss/nspr: fix for multilib
 Upstream-Status: Pending
 
 Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-
 ---
  configure.ac | 16 ++++++++--------
  1 file changed, 8 insertions(+), 8 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 51621d6..3d23683 100644
+index 7f137c0..e15f5bc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -960,24 +960,24 @@ fi
+@@ -958,24 +958,24 @@ fi
  dnl Priority 1: User specifies the path to installation
  if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then
      AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder)
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
index 3a1531deb1..61c56ffc8b 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
@@ -1,4 +1,4 @@
-From 9c861646e034b1c80fafd389279b0a7da90a8ba7 Mon Sep 17 00:00:00 2001
+From b43fa6bf612ee59db57573b39e357b6ca96d48b6 Mon Sep 17 00:00:00 2001
 From: Yulong Pei <Yulong.pei@windriver.com>
 Date: Wed, 21 Jul 2010 22:33:43 +0800
 Subject: [PATCH] change finding path of nss and nspr
@@ -8,16 +8,15 @@ Upstream-Status: Pending
 Signed-off-by: Yulong Pei <Yulong.pei@windriver.com>
 Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
 Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
-
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index ce8a278..51621d6 100644
+index 8add879..7f137c0 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -935,7 +935,7 @@ NSS_PACKAGE=mozilla-nss
+@@ -933,7 +933,7 @@ NSS_PACKAGE=mozilla-nss
  NSPR_INCLUDE_MARKER="nspr/nspr.h"
  NSPR_LIB_MARKER="libnspr4$shrext"
  NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb
similarity index 96%
rename from meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb
rename to meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb
index 64912c3b03..50c387d250 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb
@@ -22,7 +22,7 @@ SRC_URI = "https://github.com/lsh123/xmlsec/releases/download/${PR}/${BP}.tar.gz
            file://ensure-search-path-non-host.patch \
            "
 
-SRC_URI[sha256sum] = "45ad9078d41ae76844ad2f8651600ffeec0fdd128ead988a8d69e907c57aee75"
+SRC_URI[sha256sum] = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917"
 
 inherit autotools-brokensep ptest pkgconfig
 

[oe][meta-oe][scarthgap][PATCH 04/38] xdg-desktop-portal: update 1.18.1 -> 1.18.4

[ankur.tyagi85]

From: Markus Volk <f_l_k@t-online.de>

Changes in 1.18.4
=================
Released: 2024-04-18

- Don't allow commandline arrays when the first commandline item starts with
  whitespace or hyphen. (CVE-2024-32462)
- Do not store device access permission if it returned an error.
- Fix crash with config files without a default backend set.

Changes in 1.18.3
=================
Released: 2024-04-04

- Don't try to read D-Bus object properties of Request objects on construction.
- Fix various memory and file descriptor leaks.
- Minuscule optimization to the ScreenCast portal so that it stores restoration
  data with a single D-Bus call, instead of two.
- Fix a crash in the OpenURI file when trying to open a non-existing file.
- Various smaller bug fixes.

Changes in 1.18.2
=================
Released: 2023-11-22

- Pass the token to the OpenURI portal and, when missing, an empty string.
- Fix various memory and file descriptor leaks in the Document portal.
- Make files and folders openend with the Document portal close properly. This
  should fix cases where the Document portal prevented external devices from
  unmounting, due to files inside them not getting closed after applications
  stop using them.
- Implement FUSE getlk and setlk callbacks.This should enable using sqlite3
  through the Document portal.
- Properly resolve fd symlinks before opening them with O_NOFOLLOW.
- Fix cases where the portal id is assumed to match the .desktop file name.
- Allow sending directories in the file transfer portal. This should make it
  possible to, among other things, drag and drop folders and files simultaneously
  from and to sandboxed applications.
- Fallback to a hardcoded check to xdg-desktop-portal-gtk in the absence of any
  other portal or configuration file, as a last resort mechanism.
- Various smaller fixes to the build system.

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 9e57692e9f9f98e1a4938f277237307763d04705)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...-desktop-portal_1.18.1.bb => xdg-desktop-portal_1.18.4.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/xdg-desktop-portal/{xdg-desktop-portal_1.18.1.bb => xdg-desktop-portal_1.18.4.bb} (93%)

diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb
similarity index 93%
rename from meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb
rename to meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb
index 0aa8724281..8161ed160d 100644
--- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.1.bb
+++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb
@@ -27,12 +27,12 @@ RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS}"
 inherit meson pkgconfig python3native features_check
 
 SRC_URI = " \
-	git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=main \
+	git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=xdg-desktop-portal-1.18 \
 	file://0001-meson.build-add-a-hack-for-crosscompile.patch \
 "
 
 S = "${WORKDIR}/git"
-SRCREV = "37a6f7c8b8e08b9861f05e172cd4e0d07a832c4d"
+SRCREV = "11c8a96b147aeae70e3f770313f93b367d53fedd"
 
 FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1"
 

[oe][meta-oe][scarthgap][PATCH 05/38] flatpak;xdg-desktop-portal: add missing runtime dependency on fuse3-utils

[ankur.tyagi85]

From: Markus Volk <f_l_k@t-online.de>

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit bf80941c3f12a94205f1ee5b7e9366e6e7e7b70c)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb              | 1 +
 .../xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb             | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb b/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb
index 8719d3ef03..fba7bc49a4 100644
--- a/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb
+++ b/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb
@@ -38,6 +38,7 @@ RDEPENDS:${PN} = " \
     ca-certificates \
     dconf \
     flatpak-xdg-utils \
+    fuse3-utils \
 "
 
 GIR_MESON_OPTION = "gir"
diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb
index 8161ed160d..87e8f1f5e9 100644
--- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb
+++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb
@@ -22,7 +22,7 @@ PORTAL_BACKENDS ?= " \
 	${@bb.utils.contains('DISTRO_FEATURES', 'gtk4', 'xdg-desktop-portal-gtk', '', d)} \
 "
 
-RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS}"
+RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS} fuse3-utils"
 
 inherit meson pkgconfig python3native features_check
 

[oe][meta-oe][scarthgap][PATCH 06/38] usbids: upgrade 2023.01.16 -> 2025.04.01

[ankur.tyagi85]

From: Jason Schonberg <schonm@gmail.com>

Signed-off-by: Jason Schonberg <schonm@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit a7bc0ed175a1c2661599dad14ee66b8b7d0a99e7)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../usbids/{usbids_2023.01.16.bb => usbids_2025.04.01.bb}      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta-oe/recipes-support/usbids/{usbids_2023.01.16.bb => usbids_2025.04.01.bb} (85%)

diff --git a/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb b/meta-oe/recipes-support/usbids/usbids_2025.04.01.bb
similarity index 85%
rename from meta-oe/recipes-support/usbids/usbids_2023.01.16.bb
rename to meta-oe/recipes-support/usbids/usbids_2025.04.01.bb
index b0dd72fb25..bdb5807aa6 100644
--- a/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb
+++ b/meta-oe/recipes-support/usbids/usbids_2025.04.01.bb
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
 SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https"
 
-SRCREV = "7963233faf69eb9c80ffca8dfc1f31940f75999f"
+# April 1, 2025
+SRCREV = "635738b64eb52d376c5d1756c265de67236c8934"
 
 S = "${WORKDIR}/git"
 

[oe][meta-oe][scarthgap][PATCH 07/38] usbids: upgrade 2025.04.01 -> 2025.09.15

[ankur.tyagi85]

From: Jason Schonberg <schonm@gmail.com>

Signed-off-by: Jason Schonberg <schonm@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 9f4bd029e1c19dceff762ac423aeca9f10ee990c)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../usbids/{usbids_2025.04.01.bb => usbids_2025.09.15.bb}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/usbids/{usbids_2025.04.01.bb => usbids_2025.09.15.bb} (84%)

diff --git a/meta-oe/recipes-support/usbids/usbids_2025.04.01.bb b/meta-oe/recipes-support/usbids/usbids_2025.09.15.bb
similarity index 84%
rename from meta-oe/recipes-support/usbids/usbids_2025.04.01.bb
rename to meta-oe/recipes-support/usbids/usbids_2025.09.15.bb
index bdb5807aa6..d9c6a82e65 100644
--- a/meta-oe/recipes-support/usbids/usbids_2025.04.01.bb
+++ b/meta-oe/recipes-support/usbids/usbids_2025.09.15.bb
@@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
 
 SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https"
 
-# April 1, 2025
-SRCREV = "635738b64eb52d376c5d1756c265de67236c8934"
+# September 15, 2025
+SRCREV = "18b3055a9819a341ac2ff957f0b92f564d0d5d6e"
 
 S = "${WORKDIR}/git"
 

[oe][meta-oe][scarthgap][PATCH 08/38] tbb: upgrade 2021.11.0 -> 2021.12.0

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

- Drop patches that are now merged in the upstream
- Upstream defaults to disabling searching for hwloc when cross-compiling.

Release Notes:
https://github.com/uxlfoundation/oneTBB/releases/tag/v2021.12.0

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...suppress-new-GCC-12-13-warnings-1192.patch | 57 -------------------
 ....cmake-remove-cross-compiation-check.patch | 33 -----------
 .../{tbb_2021.11.0.bb => tbb_2021.12.0.bb}    |  8 +--
 3 files changed, 3 insertions(+), 95 deletions(-)
 delete mode 100644 meta-oe/recipes-support/tbb/tbb/0001-Fix-suppress-new-GCC-12-13-warnings-1192.patch
 delete mode 100644 meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch
 rename meta-oe/recipes-support/tbb/{tbb_2021.11.0.bb => tbb_2021.12.0.bb} (92%)

diff --git a/meta-oe/recipes-support/tbb/tbb/0001-Fix-suppress-new-GCC-12-13-warnings-1192.patch b/meta-oe/recipes-support/tbb/tbb/0001-Fix-suppress-new-GCC-12-13-warnings-1192.patch
deleted file mode 100644
index 489f011b84..0000000000
--- a/meta-oe/recipes-support/tbb/tbb/0001-Fix-suppress-new-GCC-12-13-warnings-1192.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From e131071769ee3df51b56b053ba6bfa06ae9eff25 Mon Sep 17 00:00:00 2001
-From: Dmitri Mokhov <dmitri.n.mokhov@intel.com>
-Date: Mon, 11 Sep 2023 10:35:07 -0500
-Subject: [PATCH] Fix/suppress new GCC 12/13 warnings (#1192)
-
-Upstream-Status: Backport [https://github.com/oneapi-src/oneTBB/commit/e131071769ee3df51b56b053ba6bfa06ae9eff25]
-Signed-off-by: Dmitri Mokhov <dmitri.n.mokhov@intel.com>
----
- .../oneapi/tbb/detail/_concurrent_unordered_base.h   |  2 +-
- src/tbb/concurrent_monitor.h                         | 12 +++++++++++-
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/include/oneapi/tbb/detail/_concurrent_unordered_base.h b/include/oneapi/tbb/detail/_concurrent_unordered_base.h
-index ade91c33..40829208 100644
---- a/include/oneapi/tbb/detail/_concurrent_unordered_base.h
-+++ b/include/oneapi/tbb/detail/_concurrent_unordered_base.h
-@@ -921,7 +921,7 @@ private:
-             node_allocator_traits::deallocate(dummy_node_allocator, node, 1);
-         } else {
-             // GCC 11.1 issues a warning here that incorrect destructor might be called for dummy_nodes
--            #if (__TBB_GCC_VERSION >= 110100 && __TBB_GCC_VERSION < 130000 ) && !__clang__ && !__INTEL_COMPILER
-+            #if (__TBB_GCC_VERSION >= 110100 && __TBB_GCC_VERSION < 140000 ) && !__clang__ && !__INTEL_COMPILER
-             volatile
-             #endif
-             value_node_ptr val_node = static_cast<value_node_ptr>(node);
-diff --git a/src/tbb/concurrent_monitor.h b/src/tbb/concurrent_monitor.h
-index 3d20ef5b..3e5c4beb 100644
---- a/src/tbb/concurrent_monitor.h
-+++ b/src/tbb/concurrent_monitor.h
-@@ -1,5 +1,5 @@
- /*
--    Copyright (c) 2005-2021 Intel Corporation
-+    Copyright (c) 2005-2023 Intel Corporation
- 
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-@@ -290,7 +290,17 @@ public:
-             n = my_waitset.front();
-             if (n != end) {
-                 my_waitset.remove(*n);
-+
-+// GCC 12.x-13.x issues a warning here that to_wait_node(n)->my_is_in_list might have size 0, since n is
-+// a base_node pointer. (This cannot happen, because only wait_node pointers are added to my_waitset.)
-+#if (__TBB_GCC_VERSION >= 120100 && __TBB_GCC_VERSION < 140000 ) && !__clang__ && !__INTEL_COMPILER
-+#pragma GCC diagnostic push
-+#pragma GCC diagnostic ignored "-Wstringop-overflow"
-+#endif
-                 to_wait_node(n)->my_is_in_list.store(false, std::memory_order_relaxed);
-+#if (__TBB_GCC_VERSION >= 120100 && __TBB_GCC_VERSION < 140000 ) && !__clang__ && !__INTEL_COMPILER
-+#pragma GCC diagnostic pop
-+#endif
-             }
-         }
- 
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch b/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch
deleted file mode 100644
index 640b131703..0000000000
--- a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 7ffc1eba8596544d6e3af0fd5f4004fff6d56f84 Mon Sep 17 00:00:00 2001
-From: Naveen Saini <naveen.kumar.saini@intel.com>
-Date: Wed, 29 Nov 2023 15:48:57 +0800
-Subject: [PATCH] hwloc_detection.cmake: remove cross-compiation check
-
-This check is preventing pkgconfig to
-search for hwloc under cross-compilation.
-
-pkgconfig able to find hwloc pkg from sysroot.
-
-Upstream-Status: Inappropriate
-
-Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
----
- cmake/hwloc_detection.cmake | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/cmake/hwloc_detection.cmake b/cmake/hwloc_detection.cmake
-index 47233b17..5a7e84c3 100644
---- a/cmake/hwloc_detection.cmake
-+++ b/cmake/hwloc_detection.cmake
-@@ -46,8 +46,6 @@ endforeach()
- unset(HWLOC_TARGET_NAME)
- 
- if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED AND
--    # No hwloc auto detection for cross compilation
--    NOT CMAKE_CROSSCOMPILING AND
-     NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH
- )
-     find_package(PkgConfig QUIET)
--- 
-2.37.3
-
diff --git a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb b/meta-oe/recipes-support/tbb/tbb_2021.12.0.bb
similarity index 92%
rename from meta-oe/recipes-support/tbb/tbb_2021.11.0.bb
rename to meta-oe/recipes-support/tbb/tbb_2021.12.0.bb
index 318cd87643..ed5dc04866 100644
--- a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb
+++ b/meta-oe/recipes-support/tbb/tbb_2021.12.0.bb
@@ -13,11 +13,8 @@ DEPENDS:append:class-target = " hwloc"
 PE = "1"
 
 BRANCH = "onetbb_2021"
-SRCREV = "8b829acc65569019edb896c5150d427f288e8aba"
-SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \
-            file://0001-hwloc_detection.cmake-remove-cross-compiation-check.patch \
-            file://0001-Fix-suppress-new-GCC-12-13-warnings-1192.patch \
-"
+SRCREV = "9afd759b72c0c233cd5ea3c3c06b0894c9da9c54"
+SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH}"
 S = "${WORKDIR}/git"
 
 inherit cmake pkgconfig
@@ -26,6 +23,7 @@ inherit cmake pkgconfig
 EXTRA_OECMAKE += " \
                     -DTBB_TEST=OFF \
                     -DCMAKE_BUILD_TYPE=Release \
+                    -DTBB_DISABLE_HWLOC_AUTOMATIC_SEARCH=OFF \
                 "
 
 # Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi)

[oe][meta-oe][scarthgap][PATCH 09/38] openldap: upgrade 2.6.7 -> 2.6.8

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
===========
- Fixed libldap exit handling with OpenSSL3 again (ITS#9952)
- Fixed libldap OpenSSL channel binding digest (ITS#10216)
- Fixed slapd handling of large uid/gids peercred auth (ITS#10211)
- Fixed slapd-asyncmeta/meta target structure allocations (ITS#10197)
- Fixed slapd-meta with dynlist (ITS#10164)
- Fixed slapd-meta binds when proxying internal op (ITS#10165)
- Added slapo-nestgroup overlay (ITS#10161)
- Added slapo-memberof 'addcheck' option (ITS#10167)
- Fixed slapo-accesslog startup initialization (ITS#10170)
- Fixed slapo-constraint double free on invalid attr (ITS#10204)
- Fixed slapo-dynlist with abandoned operations (ITS#10044)
- Fixed build with gcc14.x (ITS#10166)
- Fixed back-perl with clang15 (ITS#10177)
- Fixed to reduce systemd dependencies (ITS#10214)
- Added slapo-alias contrib module (ITS#10104, ITS#10182)
- Fixed slapo-autogroup to work with slapo-dynlist (ITS#10185)
- Fixed smbk5pwd implicit function declaration (ITS#10206)
- Fixed slapo-memberof exattr requirements (ITS#7400)
- Fixed slapo-memberof is no longer deprecated (ITS#7400)

License-Update: Copyright year updated to 2024.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit f4954ecd873fd542e5ff1e942b6d8b1b6345580e)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../openldap/{openldap_2.6.7.bb => openldap_2.6.8.bb}         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/openldap/{openldap_2.6.7.bb => openldap_2.6.8.bb} (98%)

diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb b/meta-oe/recipes-support/openldap/openldap_2.6.8.bb
similarity index 98%
rename from meta-oe/recipes-support/openldap/openldap_2.6.7.bb
rename to meta-oe/recipes-support/openldap/openldap_2.6.8.bb
index e807fdef16..8550c10b21 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.6.8.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
 # basically BSD.  opensource.org does not record this license
 # at present (so it is apparently not OSI certified).
 LICENSE = "OpenLDAP"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a41b4ed95ab4a20f366a8d82536afe4 \
                     file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
                     "
 SECTION = "libs"
@@ -21,7 +21,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
     file://0001-build-top.mk-unset-STRIP_OPTS.patch \
 "
 
-SRC_URI[sha256sum] = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930"
+SRC_URI[sha256sum] = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e"
 
 DEPENDS = "util-linux groff-native"
 

[oe][meta-oe][scarthgap][PATCH 10/38] openldap: upgrade 2.6.8 -> 2.6.9

[ankur.tyagi85]

From: Yi Zhao <yi.zhao@windriver.com>

ChangeLog:
https://www.openldap.org/software/release/changes.html

Drop 0001-fix-incompatible-pointer-type-error.patch as the issue has
been fixed upstream.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 1768156191e425c3c95b0307a329674e9d79a9fc)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../openldap/{openldap_2.6.8.bb => openldap_2.6.9.bb}           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/openldap/{openldap_2.6.8.bb => openldap_2.6.9.bb} (99%)

diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.8.bb b/meta-oe/recipes-support/openldap/openldap_2.6.9.bb
similarity index 99%
rename from meta-oe/recipes-support/openldap/openldap_2.6.8.bb
rename to meta-oe/recipes-support/openldap/openldap_2.6.9.bb
index 8550c10b21..02f292a7de 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.6.8.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.6.9.bb
@@ -21,7 +21,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
     file://0001-build-top.mk-unset-STRIP_OPTS.patch \
 "
 
-SRC_URI[sha256sum] = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e"
+SRC_URI[sha256sum] = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff"
 
 DEPENDS = "util-linux groff-native"
 

[oe][meta-oe][scarthgap][PATCH 11/38] openldap: make license match spdx identifier

[ankur.tyagi85]

From: Ethan Roderick <Ethan.Roderick@digi.com>

The OpenLDAP license is versioned. As such, listing the license as
simply "OpenLDAP" does not convey a complete picture of what license the
component is actually using.

Update the LICENSE variable to use the SPDX identifier for OpenLDAP
licenses, with the appropriate version number, "OLDAP-2.8".

Rename the license file for the OpenLDAP license to "OLDAP-2.8" from
"OpenLDAP".

Signed-off-by: Ethan Roderick <Ethan.Roderick@digi.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 0bd728bfd9f86d136a22edd34b2274336084430a)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 meta-oe/licenses/{OpenLDAP => OLDAP-2.8}           | 0
 meta-oe/recipes-support/openldap/openldap_2.6.9.bb | 6 +++---
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-oe/licenses/{OpenLDAP => OLDAP-2.8} (100%)

diff --git a/meta-oe/licenses/OpenLDAP b/meta-oe/licenses/OLDAP-2.8
similarity index 100%
rename from meta-oe/licenses/OpenLDAP
rename to meta-oe/licenses/OLDAP-2.8
diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.9.bb b/meta-oe/recipes-support/openldap/openldap_2.6.9.bb
index 02f292a7de..595f87050c 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.6.9.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.6.9.bb
@@ -4,9 +4,9 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
 # The OpenLDAP Public License - see the HOMEPAGE - defines
 # the license.  www.openldap.org claims this is Open Source
 # (see http://www.openldap.org), the license appears to be
-# basically BSD.  opensource.org does not record this license
-# at present (so it is apparently not OSI certified).
-LICENSE = "OpenLDAP"
+# basically BSD.  opensource.org has listed this license
+# since August 2019.
+LICENSE = "OLDAP-2.8"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a41b4ed95ab4a20f366a8d82536afe4 \
                     file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
                     "

[oe][meta-oe][scarthgap][PATCH 12/38] openldap: upgrade 2.6.9 -> 2.6.10

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
=============
- Added slapd microsecond timestamp format for local logging
- Fixed libldap ldap_result behavior with LDAP_MSG_RECEIVED
- Fixed lloadd handling of starttls critical
- Fixed slapd syncrepl when used with slapo-rwm
- Fixed slapd regression with certain searches
- Fixed slapo-autoca olcAutoCAserverClass object
- Fixed slapo-pcache caching behaviors

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 43b891e96b8581507decf024c27063d415adb9f3)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../openldap/{openldap_2.6.9.bb => openldap_2.6.10.bb}          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/openldap/{openldap_2.6.9.bb => openldap_2.6.10.bb} (99%)

diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.9.bb b/meta-oe/recipes-support/openldap/openldap_2.6.10.bb
similarity index 99%
rename from meta-oe/recipes-support/openldap/openldap_2.6.9.bb
rename to meta-oe/recipes-support/openldap/openldap_2.6.10.bb
index 595f87050c..be0c6bbe5a 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.6.9.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.6.10.bb
@@ -21,7 +21,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
     file://0001-build-top.mk-unset-STRIP_OPTS.patch \
 "
 
-SRC_URI[sha256sum] = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff"
+SRC_URI[sha256sum] = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516"
 
 DEPENDS = "util-linux groff-native"
 

[oe][meta-oe][scarthgap][PATCH 13/38] mcelog: upgrade 198 -> 199

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

0001-server-Correct-prameter-type-for-connect-API.patch
removed since it's included in 199

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 7596d6a497e3ab4ac88fbb0c64526d3a1b5aac61)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../mcelog/{mcelog_198.bb => mcelog_199.bb}           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
 rename meta-oe/recipes-support/mcelog/{mcelog_198.bb => mcelog_199.bb} (79%)

diff --git a/meta-oe/recipes-support/mcelog/mcelog_198.bb b/meta-oe/recipes-support/mcelog/mcelog_199.bb
similarity index 79%
rename from meta-oe/recipes-support/mcelog/mcelog_198.bb
rename to meta-oe/recipes-support/mcelog/mcelog_199.bb
index e302f4175d..0a48fc48ce 100644
--- a/meta-oe/recipes-support/mcelog/mcelog_198.bb
+++ b/meta-oe/recipes-support/mcelog/mcelog_199.bb
@@ -5,13 +5,12 @@ and should run on all Linux systems that need error handling."
 HOMEPAGE = "https://mcelog.org/"
 SECTION = "System Environment/Base"
 
-SRC_URI = "\
-    git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \
-    file://0001-client-Include-string.h-form-mem-function-prototypes.patch \
-    file://run-ptest \
-"
+SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;branch=master \
+           file://0001-client-Include-string.h-form-mem-function-prototypes.patch \
+           file://run-ptest \
+           "
 
-SRCREV = "ab58f07b9b1a4456fca0f5f41639d5cbecc80e36"
+SRCREV = "c17897deb52daab300c585a6a6c2456d062d80cf"
 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"

[oe][meta-oe][scarthgap][PATCH 14/38] mcelog: upgrade 199 -> 200

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit d5e0be9ea92bf82ada525dd8b244428b5c9c13b2)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 meta-oe/recipes-support/mcelog/{mcelog_199.bb => mcelog_200.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/mcelog/{mcelog_199.bb => mcelog_200.bb} (96%)

diff --git a/meta-oe/recipes-support/mcelog/mcelog_199.bb b/meta-oe/recipes-support/mcelog/mcelog_200.bb
similarity index 96%
rename from meta-oe/recipes-support/mcelog/mcelog_199.bb
rename to meta-oe/recipes-support/mcelog/mcelog_200.bb
index 0a48fc48ce..9d72e78599 100644
--- a/meta-oe/recipes-support/mcelog/mcelog_199.bb
+++ b/meta-oe/recipes-support/mcelog/mcelog_200.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;
            file://run-ptest \
            "
 
-SRCREV = "c17897deb52daab300c585a6a6c2456d062d80cf"
+SRCREV = "955fd0917ab1b9f159443e5cbba1d0fa73486fac"
 
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"

[oe][meta-oe][scarthgap][PATCH 15/38] libiodbc: upgrade 3.52.15 -> 3.52.16

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

License-Update: Copyright updated to 2023.

Changelog:
https://github.com/openlink/iODBC/blob/v3.52.16/NEWS

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit ffe09ae8e01a26a9d2b51dbedd19d0eb2c2f3c5b)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../libiodbc/{libiodbc_3.52.15.bb => libiodbc_3.52.16.bb}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-support/libiodbc/{libiodbc_3.52.15.bb => libiodbc_3.52.16.bb} (82%)

diff --git a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb
similarity index 82%
rename from meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb
rename to meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb
index ff976ed975..95c3ec49e2 100644
--- a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb
+++ b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb
@@ -9,11 +9,11 @@ HOMEPAGE = "http://www.iodbc.org/"
 
 LICENSE = "LGPL-2.0-only | BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \
-                    file://LICENSE.BSD;md5=ff3a66a194e500df485da930da7f2c62 \
+                    file://LICENSE.BSD;md5=5b36348a404e1d65b57df8d33fd6e414 \
                     "
 
 SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "c74541e3327fc9a1c7ccf103645471c67bc014542d70f572476eb07c0b2dd43c"
+SRC_URI[sha256sum] = "3898b32d07961360f6f2cf36db36036b719a230e476469258a80f32243e845fa"
 
 inherit autotools
 

[oe][meta-oe][scarthgap][PATCH 16/38] libgpiod: update to v1.6.5

[ankur.tyagi85]

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

This release contains a build fix for environments that require libgen.h
to be included for basename() and don't pull it implicitly with any
other header.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4b4086edef22b7aec9559af931db47d6107971d9)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../libgpiod/{libgpiod_1.6.4.bb => libgpiod_1.6.5.bb}           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/libgpiod/{libgpiod_1.6.4.bb => libgpiod_1.6.5.bb} (94%)

diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
similarity index 94%
rename from meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb
rename to meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
index 111a5727ba..74b49a57bc 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.4.bb
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
@@ -3,7 +3,7 @@ require libgpiod.inc
 LICENSE = "LGPL-2.1-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de"
 
-SRC_URI[sha256sum] = "7b146e12f28fbca3df7557f176eb778c5ccf952ca464698dba8a61b2e1e3f9b5"
+SRC_URI[sha256sum] = "ae280f697bf035a1fb780c9972e5c81d0d2712b7ab6124fb3fba24619daa72bc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:"
 

[oe][meta-oe][scarthgap][PATCH 17/38] libgpiod: update v2.1.2 -> v2.1.3

[ankur.tyagi85]

From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>

Bug fixes:
- fix C++ tests with recent kernels which introduced stricter reconfigure
  behavior
- fix a use-after-free bug in python bindings
- fix passing the event clock property to line requests in python bindings
- fix a memory leak in tools
- make sure the string buffers in line-info and chip-info are big enough to not
  truncate the strings they hold below the size accepted by the kernel

Dropped patch which is merged in the upstream

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 9958590b703a79b735874ea59b54aa4bb7233811)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...ts-set-direction-when-reconfiguring-.patch | 38 -------------------
 .../{libgpiod_2.1.2.bb => libgpiod_2.1.3.bb}  |  4 +-
 2 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-tests-set-direction-when-reconfiguring-.patch
 rename meta-oe/recipes-support/libgpiod/{libgpiod_2.1.2.bb => libgpiod_2.1.3.bb} (87%)

diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-tests-set-direction-when-reconfiguring-.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-tests-set-direction-when-reconfiguring-.patch
deleted file mode 100644
index f8b94f0b99..0000000000
--- a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-tests-set-direction-when-reconfiguring-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8c7126b7b5dee0ed5433cf9265ccc79095d53939 Mon Sep 17 00:00:00 2001
-From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-Date: Mon, 8 Jul 2024 11:48:27 +0200
-Subject: [PATCH] bindings: cxx: tests: set direction when reconfiguring lines
-
-Linux kernel commit b44039638741 ("gpiolib: cdev: Ignore reconfiguration
-without direction") made the direction setting mandatory for line config
-passed to the kernel when reconfiguring requested lines. Fix the C++ test
-case which doesn't do it and now fails due to the rest of the settings
-being ignored.
-
-Reviewed-by: Kent Gibson <warthog618@gmail.com>
-Link: https://lore.kernel.org/r/20240708094827.84986-1-brgl@bgdev.pl
-Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-
-Upstream-Status: Backport
-[https://web.git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/commit/?id=3e224d885b1de54fe5510b9c5e7296260a1a4507]
-
-Signed-off-by: Libo Chen <libo.chen.cn@windriver.com>
----
- bindings/cxx/tests/tests-line-request.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/bindings/cxx/tests/tests-line-request.cpp b/bindings/cxx/tests/tests-line-request.cpp
-index 9632ae0..6e29532 100644
---- a/bindings/cxx/tests/tests-line-request.cpp
-+++ b/bindings/cxx/tests/tests-line-request.cpp
-@@ -208,6 +208,7 @@ TEST_CASE("values can be read", "[line-request]")
- 				.add_line_settings(
- 					offs,
- 					::gpiod::line_settings()
-+						.set_direction(direction::INPUT)
- 						.set_active_low(true))
- 		);
- 
--- 
-2.44.1
-
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb
similarity index 87%
rename from meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb
rename to meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb
index edbde0f7a7..4463f7d4df 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb
@@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = " \
     file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \
 "
 
-SRC_URI += "file://0001-bindings-cxx-tests-set-direction-when-reconfiguring-.patch"
-
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:"
 
-SRC_URI[sha256sum] = "7a148a5a7d1c97a1abb40474b9a392b6edd7a42fe077dfd7ff42cfba24308548"
+SRC_URI[sha256sum] = "2be4c0b03e995d236c0e476e14aeb475d7b431dd1439609b6d65c540f91eaf58"
 
 # Enable all project features for ptest
 PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit"

[oe][meta-oe][scarthgap][PATCH 18/38] libbytesize: upgrade 2.10 -> 2.11

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
============
- remove dependency on python3-six and python2 crumbs
- dist: Fix release number in spec
- Squashed 'translation-canary/' changes from 4d4e65b..5bb8125
- ci: Bump actions/checkout from v3 to v4
- Rename 'master' branch to 'main'
- ci: Set custom release number for Packit
- ci: Update CentOS Stream repositories for Packit
- ci: Add dependabot to automatically update GH actions
- Update translation files
- Translated using Weblate
- infra: bump actions/upload-artifact from 3 to 4
- tests: remove unnecessary bash dependency

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 634411e51bb8e325c92e9cf50b17ecd003bb3ebd)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../libbytesize/{libbytesize_2.10.bb => libbytesize_2.11.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-support/libbytesize/{libbytesize_2.10.bb => libbytesize_2.11.bb} (93%)

diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb
similarity index 93%
rename from meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb
rename to meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb
index daa01bfc3d..214c2b2844 100644
--- a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb
+++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
 
 S = "${WORKDIR}/git"
 
-SRCREV = "6e83cc6f6dff4f126fc79284e0c3c1c50123380d"
+SRCREV = "9da72b2732508b0ba0ceed27f5e50bc276ef31f2"
 SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https"
 
 inherit gettext autotools pkgconfig python3native

[oe][meta-oe][scarthgap][PATCH 19/38] audit: upgrade 4.0.1 -> 4.0.2

[ankur.tyagi85]

From: Yi Zhao <yi.zhao@windriver.com>

ChangeLog:
 - Fix musl C builds
 - Many code cleanups
 - Use atomic variables if available for signal related flags
 - Dont rotate audit logs when auditd is in debug mode
 - Fix a couple memory leaks on error paths
 - Correct output when displaying rules with exe/path/dir
 - Fix auparse lookup test to not use the system libaupaurse
 - Improve auparse metrics
 - Update auparse normalizer for recent syscalls
 - Make status report uniform

Drop 0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch as
the issue has been fixed upstream.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit f7e691ff430f05ee958f6d50b5a23e0f74b8588b)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 ...ute_malloc__-with-__attribute__-__ma.patch | 49 -------------------
 .../audit/{audit_4.0.1.bb => audit_4.0.2.bb}  |  4 +-
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch
 rename meta-oe/recipes-security/audit/{audit_4.0.1.bb => audit_4.0.2.bb} (96%)

diff --git a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch
deleted file mode 100644
index b1f324f22d..0000000000
--- a/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 88c9b2c5cebebf13f90890baebbadc60d9fe8d16 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 9 Aug 2022 23:57:03 -0700
-Subject: [PATCH] Replace __attribute_malloc__ with __attribute__((__malloc__))
-
-__attribute_malloc__ is not available on musl
-
-Fixes
-| ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator
-|         __attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
-|         ^
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- audisp/plugins/remote/queue.h | 2 +-
- auparse/auparse.h             | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/audisp/plugins/remote/queue.h b/audisp/plugins/remote/queue.h
-index 36b70d04..031507dc 100644
---- a/audisp/plugins/remote/queue.h
-+++ b/audisp/plugins/remote/queue.h
-@@ -53,7 +53,7 @@ void q_close(struct queue *q);
-  * On error, return NULL and set errno. */
- struct queue *q_open(int q_flags, const char *path, size_t num_entries,
- 		     size_t entry_size)
--	__attribute_malloc__ __attr_dealloc (q_close, 1) __wur;
-+	__attribute__((__malloc__)) __attr_dealloc (q_close, 1) __wur;
- 
- /* Add DATA to tail of Q. Return 0 on success, -1 on error and set errno. */
- int q_append(struct queue *q, const char *data);
-diff --git a/auparse/auparse.h b/auparse/auparse.h
-index c27f1ff9..87c52965 100644
---- a/auparse/auparse.h
-+++ b/auparse/auparse.h
-@@ -55,7 +55,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au,
- void auparse_destroy(auparse_state_t *au);
- void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what);
- auparse_state_t *auparse_init(ausource_t source, const void *b)
--	__attribute_malloc__ __attr_dealloc (auparse_destroy, 1);
-+	__attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1);
- int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len)
- 	__attr_access ((__read_only__, 2, 3));
- int auparse_feed(auparse_state_t *au, const char *data, size_t data_len)
--- 
-2.25.1
-
diff --git a/meta-oe/recipes-security/audit/audit_4.0.1.bb b/meta-oe/recipes-security/audit/audit_4.0.2.bb
similarity index 96%
rename from meta-oe/recipes-security/audit/audit_4.0.1.bb
rename to meta-oe/recipes-security/audit/audit_4.0.2.bb
index a37ae3bb84..0086f8db69 100644
--- a/meta-oe/recipes-security/audit/audit_4.0.1.bb
+++ b/meta-oe/recipes-security/audit/audit_4.0.2.bb
@@ -13,10 +13,8 @@ SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;proto
            file://audit-volatile.conf \
           "
 
-SRC_URI:append:libc-musl = " file://0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch"
-
 S = "${WORKDIR}/git"
-SRCREV = "22ccbd984e493524050ac445f796e9a7e90e1149"
+SRCREV = "4e6deae41d4646d28bb3ba9524a8a227a38ccd0b"
 
 inherit autotools python3targetconfig update-rc.d systemd
 

[oe][meta-oe][scarthgap][PATCH 20/38] audit: Fix CVE_PRODUCT

[ankur.tyagi85]

From: Shinji Matsunaga <shin.matsunaga@fujitsu.com>

Fix "audit" set in CVE_PRODUCT to "linux:audit" to detect only vulnerabilities where the vendor is "linux".

Currently, CVE_PRODUCT also detects vulnerabilities where the vendor is "visionsoft",
which are unrelated to the "audit" in this recipe.
https://www.opencve.io/cve?vendor=visionsoft&product=audit

In addition, all the vulnerabilities currently detected in "audit" have the vendor of "visionsoft" or "linux".
Therefore, fix "audit" set in CVE_PRODUCT to "linux:audit".

Signed-off-by: Shinji Matsunaga <shin.matsunaga@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit e87e51da49fe121be8f6dd4cec3263a345f2f876)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 meta-oe/recipes-security/audit/audit_4.0.2.bb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta-oe/recipes-security/audit/audit_4.0.2.bb b/meta-oe/recipes-security/audit/audit_4.0.2.bb
index 0086f8db69..8a080eb709 100644
--- a/meta-oe/recipes-security/audit/audit_4.0.2.bb
+++ b/meta-oe/recipes-security/audit/audit_4.0.2.bb
@@ -99,3 +99,5 @@ do_install:append() {
     # Create /var/spool/audit directory for audisp-remote
     install -d -m 0700 ${D}${localstatedir}/spool/audit
 }
+
+CVE_PRODUCT = "linux:audit"

[oe][meta-oe][scarthgap][PATCH 21/38] audit: fix build when systemd is enabled.

[ankur.tyagi85]

From: Armin Kuster <akuster808@gmail.com>

Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit e68145b00260fc380242cd67579068427e501c10)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 meta-oe/recipes-security/audit/audit_4.0.2.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-oe/recipes-security/audit/audit_4.0.2.bb b/meta-oe/recipes-security/audit/audit_4.0.2.bb
index 8a080eb709..93195c0eae 100644
--- a/meta-oe/recipes-security/audit/audit_4.0.2.bb
+++ b/meta-oe/recipes-security/audit/audit_4.0.2.bb
@@ -93,7 +93,13 @@ do_install:append() {
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
         install -D -m 0755 ${WORKDIR}/auditd ${D}/etc/init.d/auditd
+    fi
+
+    if ! ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
         rm -rf ${D}${libdir}/systemd
+        install -d ${D}${systemd_unitdir}/system
+        install -m 0644 ${B}/init.d/auditd.service      ${D}${systemd_unitdir}/system/
+        install -m 0644 ${B}/init.d/audit-rules.service ${D}${systemd_unitdir}/system/
     fi
 
     # Create /var/spool/audit directory for audisp-remote

[oe][meta-oe][scarthgap][PATCH 22/38] libbpf: upgrade 1.4.0 -> 1.4.2

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
===========
- remove unnecessary struct_ops prog validity check
- handle yet another corner case of nulling out struct_ops program
- fix libbpf_strerror_r() handling unknown errors
- libbpf: improve early detection of doomed-to-fail BPF program loading

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 368ed98e7e4004963de7b7ad3d9c1b0e71f192eb)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../libbpf/{libbpf_1.4.0.bb => libbpf_1.4.2.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-kernel/libbpf/{libbpf_1.4.0.bb => libbpf_1.4.2.bb} (92%)

diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.0.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb
similarity index 92%
rename from meta-oe/recipes-kernel/libbpf/libbpf_1.4.0.bb
rename to meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb
index f2ec48f390..928482ba36 100644
--- a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.0.bb
+++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238
 
 DEPENDS = "zlib elfutils"
 
-SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=master"
-SRCREV = "20ea95b4505c477af3b6ff6ce9d19cee868ddc5d"
+SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.2"
+SRCREV = "1b357586a7a62db7fe27af4ebe4bdefe6986cfd6"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"

[oe][meta-oe][scarthgap][PATCH 23/38] libbpf: upgrade 1.4.2 -> 1.4.3

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
 Fix libbpf unintentionally dropping FD_CLOEXEC flag when (internally) duping FDs.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 8fc8a8ee0ecd33bfaec8b907c0b2d391c98149f0)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../libbpf/{libbpf_1.4.2.bb => libbpf_1.4.3.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-kernel/libbpf/{libbpf_1.4.2.bb => libbpf_1.4.3.bb} (92%)

diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.3.bb
similarity index 92%
rename from meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb
rename to meta-oe/recipes-kernel/libbpf/libbpf_1.4.3.bb
index 928482ba36..665585d0cb 100644
--- a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb
+++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.3.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238
 
 DEPENDS = "zlib elfutils"
 
-SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.2"
-SRCREV = "1b357586a7a62db7fe27af4ebe4bdefe6986cfd6"
+SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.3"
+SRCREV = "f8c6e0393d4be665fc0b584266b2a1354a71835e"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"

[oe][meta-oe][scarthgap][PATCH 24/38] libbpf: upgrade 1.4.3 -> 1.4.5

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
============
- fix BPF skeleton forward/backward compat handling
- detect broken PID filtering logic for multi-uprobe

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 9773b1358eb300d083ebe6200a048bd10c5b6626)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../libbpf/{libbpf_1.4.3.bb => libbpf_1.4.5.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-kernel/libbpf/{libbpf_1.4.3.bb => libbpf_1.4.5.bb} (92%)

diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.3.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.5.bb
similarity index 92%
rename from meta-oe/recipes-kernel/libbpf/libbpf_1.4.3.bb
rename to meta-oe/recipes-kernel/libbpf/libbpf_1.4.5.bb
index 665585d0cb..5ee7701484 100644
--- a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.3.bb
+++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.5.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238
 
 DEPENDS = "zlib elfutils"
 
-SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.3"
-SRCREV = "f8c6e0393d4be665fc0b584266b2a1354a71835e"
+SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.5"
+SRCREV = "a5086158dc90593b4e4b3ddbafab9bdaf9ec97ef"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"

[oe][meta-oe][scarthgap][PATCH 25/38] libbpf: upgrade 1.4.5 -> 1.4.6

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
===========
- BPF skeleton forward compatibility fix
- BTF endianness inheritance bug fix

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 5bb9ed684b8d9f17b22b26a94a926b96d666465e)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../libbpf/{libbpf_1.4.5.bb => libbpf_1.4.6.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-kernel/libbpf/{libbpf_1.4.5.bb => libbpf_1.4.6.bb} (92%)

diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.5.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.6.bb
similarity index 92%
rename from meta-oe/recipes-kernel/libbpf/libbpf_1.4.5.bb
rename to meta-oe/recipes-kernel/libbpf/libbpf_1.4.6.bb
index 5ee7701484..914ac9f087 100644
--- a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.5.bb
+++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.6.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238
 
 DEPENDS = "zlib elfutils"
 
-SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.5"
-SRCREV = "a5086158dc90593b4e4b3ddbafab9bdaf9ec97ef"
+SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.6"
+SRCREV = "fdf402b384cc42ce29bb9e27011633be3cbafe1e"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"

[oe][meta-oe][scarthgap][PATCH 26/38] libbpf: upgrade 1.4.6 -> 1.4.7

[ankur.tyagi85]

From: Yi Zhao <yi.zhao@windriver.com>

ChangLog:
https://github.com/libbpf/libbpf/releases/tag/v1.4.7

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 07cdb574a5a4931ba0629604f5ea90591b31b1b4)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../libbpf/{libbpf_1.4.6.bb => libbpf_1.4.7.bb}               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-kernel/libbpf/{libbpf_1.4.6.bb => libbpf_1.4.7.bb} (92%)

diff --git a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.6.bb b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.7.bb
similarity index 92%
rename from meta-oe/recipes-kernel/libbpf/libbpf_1.4.6.bb
rename to meta-oe/recipes-kernel/libbpf/libbpf_1.4.7.bb
index 914ac9f087..8df1c639ed 100644
--- a/meta-oe/recipes-kernel/libbpf/libbpf_1.4.6.bb
+++ b/meta-oe/recipes-kernel/libbpf/libbpf_1.4.7.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238
 
 DEPENDS = "zlib elfutils"
 
-SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.6"
-SRCREV = "fdf402b384cc42ce29bb9e27011633be3cbafe1e"
+SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.7"
+SRCREV = "ca72d0731f8c693bd98caba70d951fc0bfe20788"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux"

[oe][meta-oe][scarthgap][PATCH 27/38] openjpeg: upgrade 2.5.3 -> 2.5.4

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

CVE-2025-54874.patch
removed since it's included in 2.5.4

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 2cc81690424b6134a05bd6f6fb612501bd3534ca)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../openjpeg/openjpeg/CVE-2025-54874.patch    | 44 -------------------
 .../{openjpeg_2.5.3.bb => openjpeg_2.5.4.bb}  |  3 +-
 2 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2025-54874.patch
 rename meta-oe/recipes-graphics/openjpeg/{openjpeg_2.5.3.bb => openjpeg_2.5.4.bb} (86%)

diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2025-54874.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2025-54874.patch
deleted file mode 100644
index 187557a35c..0000000000
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg/CVE-2025-54874.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f809b80c67717c152a5ad30bf06774f00da4fd2d Mon Sep 17 00:00:00 2001
-From: Sebastian Rasmussen <sebras@gmail.com>
-Date: Thu, 16 Jan 2025 02:13:43 +0100
-Subject: [PATCH] opj_jp2_read_header: Check for error after parsing header.
-
-Consider the case where the caller has not set the p_image
-pointer to NULL before calling opj_read_header().
-
-If opj_j2k_read_header_procedure() fails while obtaining the rest
-of the marker segment when calling opj_stream_read_data() because
-the data stream is too short, then opj_j2k_read_header() will
-never have the chance to initialize p_image, leaving it
-uninitialized.
-
-opj_jp2_read_header() will check the p_image value whether
-opj_j2k_read_header() suceeded or failed. This may be detected as
-an error in valgrind or ASAN.
-
-The fix is to check whether opj_j2k_read_header() suceeded before
-using the output argument p_image.
-
-CVE: CVE-2025-54874
-Upstream-Status: Backport [https://github.com/uclouvain/openjpeg/commit/f809b80c67717c152a5ad30bf06774f00da4fd2d]
-Signed-off-by: Hitendra Prajapati <hprajapati@mvista.com>
----
- src/lib/openjp2/jp2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/openjp2/jp2.c b/src/lib/openjp2/jp2.c
-index 4df055a5..da506318 100644
---- a/src/lib/openjp2/jp2.c
-+++ b/src/lib/openjp2/jp2.c
-@@ -2873,7 +2873,7 @@ OPJ_BOOL opj_jp2_read_header(opj_stream_private_t *p_stream,
-                               p_image,
-                               p_manager);
- 
--    if (p_image && *p_image) {
-+    if (ret && p_image && *p_image) {
-         /* Set Image Color Space */
-         if (jp2->enumcs == 16) {
-             (*p_image)->color_space = OPJ_CLRSPC_SRGB;
--- 
-2.50.1
-
diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb
similarity index 86%
rename from meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb
rename to meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb
index 586bfeaf1f..945abbcc35 100644
--- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.3.bb
+++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.4.bb
@@ -7,9 +7,8 @@ DEPENDS = "libpng tiff lcms zlib"
 
 SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \
            file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \
-           file://CVE-2025-54874.patch \
            "
-SRCREV = "210a8a5690d0da66f02d49420d7176a21ef409dc"
+SRCREV = "6c4a29b00211eb0430fa0e5e890f1ce5c80f409f"
 S = "${WORKDIR}/git"
 
 inherit cmake

[oe][meta-oe][scarthgap][PATCH 28/38] neatvnc: upgrade 0.8.0 -> 0.8.1

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 4485e2ec712731df3869f9e96c2f04e1352fbae3)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../neatvnc/{neatvnc_0.8.0.bb => neatvnc_0.8.1.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-graphics/neatvnc/{neatvnc_0.8.0.bb => neatvnc_0.8.1.bb} (89%)

diff --git a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.0.bb b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb
similarity index 89%
rename from meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.0.bb
rename to meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb
index c9c4a6c27a..9065050c62 100644
--- a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.0.bb
+++ b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb
@@ -4,9 +4,9 @@ HOMEPAGE = "https://github.com/any1/neatvnc"
 LICENSE = "ISC"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94fc374e7174f41e3afe0f027ee59ff7"
 
-SRC_URI = "git://github.com/any1/neatvnc;branch=master;protocol=https"
+SRC_URI = "git://github.com/any1/neatvnc;branch=v0.8;protocol=https"
 
-SRCREV = "46432ce8cade0b54a38d4bb42eb07f96c8ff49fd"
+SRCREV = "07081567ab21a2b099ceb41ae8cab872a31cbb9a"
 
 S = "${WORKDIR}/git"
 

[oe][meta-oe][scarthgap][PATCH 29/38] jasper: upgrade 4.1.1 -> 4.1.2

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Changelog:
https://github.com/jasper-software/jasper/releases/tag/version-4.1.2

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../jasper/{jasper_4.1.1.bb => jasper_4.1.2.bb}                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-graphics/jasper/{jasper_4.1.1.bb => jasper_4.1.2.bb} (95%)

diff --git a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb b/meta-oe/recipes-graphics/jasper/jasper_4.1.2.bb
similarity index 95%
rename from meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb
rename to meta-oe/recipes-graphics/jasper/jasper_4.1.2.bb
index 393539e227..5f6ad067e0 100644
--- a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb
+++ b/meta-oe/recipes-graphics/jasper/jasper_4.1.2.bb
@@ -8,7 +8,7 @@ SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https;branch=mas
            file://0001-Fixes-401.patch \
            file://0001-Fixes-402-403.patch \
            "
-SRCREV = "917f7708b755d8434f70618108c1a76f1b6a0a82"
+SRCREV = "ff633699cb785967a2cb0084d89d56e53c46e416"
 
 CVE_STATUS[CVE-2015-8751] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
 

[oe][meta-oe][scarthgap][PATCH 30/38] libspiro: upgrade 20221101 -> 20230902

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Changelog:
https://github.com/fontforge/libspiro/releases/tag/20240902

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../fontforge/{libspiro_20221101.bb => libspiro_20240902.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-graphics/fontforge/{libspiro_20221101.bb => libspiro_20240902.bb} (85%)

diff --git a/meta-oe/recipes-graphics/fontforge/libspiro_20221101.bb b/meta-oe/recipes-graphics/fontforge/libspiro_20240902.bb
similarity index 85%
rename from meta-oe/recipes-graphics/fontforge/libspiro_20221101.bb
rename to meta-oe/recipes-graphics/fontforge/libspiro_20240902.bb
index 0adac8464e..e4e3500693 100644
--- a/meta-oe/recipes-graphics/fontforge/libspiro_20221101.bb
+++ b/meta-oe/recipes-graphics/fontforge/libspiro_20240902.bb
@@ -7,7 +7,7 @@ LICENSE = "GPL-3.0-or-later"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = "https://github.com/fontforge/libspiro/releases/download/${PV}/libspiro-dist-${PV}.tar.gz"
-SRC_URI[sha256sum] = "5984fb5af3e4e1f927f3a74850b705a711fb86284802a5e6170b09786440e8be"
+SRC_URI[sha256sum] = "c573228542b3bf78a51c5ce7b0a609e8a2763938a088376230c452c4f9714848"
 
 inherit autotools
 

[oe][meta-oe][scarthgap][PATCH 31/38] feh: upgrade 3.10.2 -> 3.10.3

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
==========
* Fix feh not respecting aspect ratio of thumbnails that are smaller than
  --thumb-width and --thumb-height
* Fix --no-recursive behaving like --recursive
* Fix rotation by 180° corrupting images
* Speed up --sort=size and --sort=mtime by caching stat(2) calls

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 2775cdb58ce2e779e7b72e1b917769abb580dbbe)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 meta-oe/recipes-graphics/feh/{feh_3.10.2.bb => feh_3.10.3.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-graphics/feh/{feh_3.10.2.bb => feh_3.10.3.bb} (88%)

diff --git a/meta-oe/recipes-graphics/feh/feh_3.10.2.bb b/meta-oe/recipes-graphics/feh/feh_3.10.3.bb
similarity index 88%
rename from meta-oe/recipes-graphics/feh/feh_3.10.2.bb
rename to meta-oe/recipes-graphics/feh/feh_3.10.3.bb
index 2c38ce614b..5ab333c60d 100644
--- a/meta-oe/recipes-graphics/feh/feh_3.10.2.bb
+++ b/meta-oe/recipes-graphics/feh/feh_3.10.3.bb
@@ -9,7 +9,7 @@ DEPENDS = "\
 "
 
 SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "5f94a77de25c5398876f0cf431612d782b842f4db154d2139b778c8f196e8969"
+SRC_URI[sha256sum] = "5426e2799770217af1e01c2e8c182d9ca8687d84613321d8ab4a66fe4041e9c8"
 
 inherit mime-xdg features_check
 # depends on virtual/libx11

[oe][meta-oe][scarthgap][PATCH 32/38] redis-plus-plus: upgrade 1.3.11 -> 1.3.12

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Changelog:
https://github.com/sewenew/redis-plus-plus/releases/tag/1.3.12

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../{redis-plus-plus_1.3.11.bb => redis-plus-plus_1.3.12.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-extended/redis-plus-plus/{redis-plus-plus_1.3.11.bb => redis-plus-plus_1.3.12.bb} (95%)

diff --git a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.12.bb
similarity index 95%
rename from meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb
rename to meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.12.bb
index 3e757e6037..714b991ebd 100644
--- a/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.11.bb
+++ b/meta-oe/recipes-extended/redis-plus-plus/redis-plus-plus_1.3.12.bb
@@ -8,7 +8,7 @@ DEPENDS += "hiredis"
 
 SRC_URI = "git://github.com/sewenew/redis-plus-plus;branch=master;protocol=https \
            file://0001-CMakeLists.txt-fix-substitution-for-static-libs.patch"
-SRCREV = "ad6baa121f4c6fbc7622d83d606210ac22549c78"
+SRCREV = "92c2ab31197eb5ec0a41499fd135352b5c4156b0"
 
 S = "${WORKDIR}/git"
 

[oe][meta-oe][scarthgap][PATCH 33/38] redis: upgrade 7.2.11 -> 7.2.12

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

and refresh patches

Changelog:
https://github.com/redis/redis/releases/tag/7.2.12

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 73978fa1ff58a30061f62fada3d0b1e6c32f4cc0)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../0001-hiredis-use-default-CC-if-it-is-set.patch     |  6 +++++-
 ...ate-Makefile-to-use-environment-build-setting.patch |  2 +-
 .../0003-hack-to-force-use-of-libc-malloc.patch        | 10 +++++-----
 .../0004-src-Do-not-reset-FINAL_LIBS.patch             | 10 +++++-----
 ...-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch |  2 +-
 .../0006-Define-correct-gregs-for-RISCV32.patch        |  2 +-
 .../{redis-7.2.11 => redis-7.2.12}/init-redis-server   |  0
 .../redis/{redis-7.2.11 => redis-7.2.12}/redis.conf    |  0
 .../redis/{redis-7.2.11 => redis-7.2.12}/redis.service |  0
 .../redis/{redis_7.2.11.bb => redis_7.2.12.bb}         |  3 +--
 10 files changed, 19 insertions(+), 16 deletions(-)
 rename meta-oe/recipes-extended/redis/{redis-7.2.11 => redis-7.2.12}/0001-hiredis-use-default-CC-if-it-is-set.patch (89%)
 rename meta-oe/recipes-extended/redis/{redis-7.2.11 => redis-7.2.12}/0002-lua-update-Makefile-to-use-environment-build-setting.patch (97%)
 rename meta-oe/recipes-extended/redis/{redis-7.2.11 => redis-7.2.12}/0003-hack-to-force-use-of-libc-malloc.patch (81%)
 rename meta-oe/recipes-extended/redis/{redis-7.2.11 => redis-7.2.12}/0004-src-Do-not-reset-FINAL_LIBS.patch (74%)
 rename meta-oe/recipes-extended/redis/{redis-7.2.11 => redis-7.2.12}/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch (92%)
 rename meta-oe/recipes-extended/redis/{redis-7.2.11 => redis-7.2.12}/0006-Define-correct-gregs-for-RISCV32.patch (97%)
 rename meta-oe/recipes-extended/redis/{redis-7.2.11 => redis-7.2.12}/init-redis-server (100%)
 rename meta-oe/recipes-extended/redis/{redis-7.2.11 => redis-7.2.12}/redis.conf (100%)
 rename meta-oe/recipes-extended/redis/{redis-7.2.11 => redis-7.2.12}/redis.service (100%)
 rename meta-oe/recipes-extended/redis/{redis_7.2.11.bb => redis_7.2.12.bb} (96%)

diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0001-hiredis-use-default-CC-if-it-is-set.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0001-hiredis-use-default-CC-if-it-is-set.patch
similarity index 89%
rename from meta-oe/recipes-extended/redis/redis-7.2.11/0001-hiredis-use-default-CC-if-it-is-set.patch
rename to meta-oe/recipes-extended/redis/redis-7.2.12/0001-hiredis-use-default-CC-if-it-is-set.patch
index 63bf403412..99783ce237 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.11/0001-hiredis-use-default-CC-if-it-is-set.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0001-hiredis-use-default-CC-if-it-is-set.patch
@@ -1,4 +1,4 @@
-From af4fc632c03b2a68be4206b4896f27fc4bb865ae Mon Sep 17 00:00:00 2001
+From 2fec7733df9a6224875f3ecd3aaafc2857a546c0 Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 17:39:52 -0600
 Subject: [PATCH] hiredis: use default CC if it is set
@@ -6,6 +6,10 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
 
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
 Instead of trying to automagically figure out CC, which breaks with OE
 as CC has spaces in it, just skip it if one was already passed in.
 
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0002-lua-update-Makefile-to-use-environment-build-setting.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0002-lua-update-Makefile-to-use-environment-build-setting.patch
similarity index 97%
rename from meta-oe/recipes-extended/redis/redis-7.2.11/0002-lua-update-Makefile-to-use-environment-build-setting.patch
rename to meta-oe/recipes-extended/redis/redis-7.2.12/0002-lua-update-Makefile-to-use-environment-build-setting.patch
index 46330f5064..a3365043b5 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.11/0002-lua-update-Makefile-to-use-environment-build-setting.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0002-lua-update-Makefile-to-use-environment-build-setting.patch
@@ -1,4 +1,4 @@
-From 45ae5eb5c3482054073e06ab1a78e0aa9b96447f Mon Sep 17 00:00:00 2001
+From 71d92a24da61eab1e3697cc83ebc387b57bb6c3b Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Fri, 8 Feb 2013 20:22:19 -0600
 Subject: [PATCH] lua: update Makefile to use environment build settings
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0003-hack-to-force-use-of-libc-malloc.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0003-hack-to-force-use-of-libc-malloc.patch
similarity index 81%
rename from meta-oe/recipes-extended/redis/redis-7.2.11/0003-hack-to-force-use-of-libc-malloc.patch
rename to meta-oe/recipes-extended/redis/redis-7.2.12/0003-hack-to-force-use-of-libc-malloc.patch
index 8991d2d9bc..4ab1ca0ca8 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.11/0003-hack-to-force-use-of-libc-malloc.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0003-hack-to-force-use-of-libc-malloc.patch
@@ -1,4 +1,4 @@
-From 7a98e3ac480413ce7db3a5edd5dc70458b921b29 Mon Sep 17 00:00:00 2001
+From 577335d0309c852d9f6099c255d5a80603fcbdb9 Mon Sep 17 00:00:00 2001
 From: Venture Research <tech@ventureresearch.com>
 Date: Wed, 6 Feb 2013 20:51:02 -0600
 Subject: [PATCH] hack to force use of libc malloc
@@ -19,10 +19,10 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
  src/Makefile | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-Index: redis-7.2.10/src/Makefile
-===================================================================
---- redis-7.2.10.orig/src/Makefile
-+++ redis-7.2.10/src/Makefile
+diff --git a/src/Makefile b/src/Makefile
+index 6a87909..b8e0d44 100644
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -13,7 +13,8 @@
  # Just use 'make dep', but this is only needed by developers.
  
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0004-src-Do-not-reset-FINAL_LIBS.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0004-src-Do-not-reset-FINAL_LIBS.patch
similarity index 74%
rename from meta-oe/recipes-extended/redis/redis-7.2.11/0004-src-Do-not-reset-FINAL_LIBS.patch
rename to meta-oe/recipes-extended/redis/redis-7.2.12/0004-src-Do-not-reset-FINAL_LIBS.patch
index 0513138b4e..71044365af 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.11/0004-src-Do-not-reset-FINAL_LIBS.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0004-src-Do-not-reset-FINAL_LIBS.patch
@@ -1,4 +1,4 @@
-From 50fc46a12f6cf97e7b927d3ea29eecc9ebdea34d Mon Sep 17 00:00:00 2001
+From 225f45d5fbeaa8998fac983fcb78d7912d6d6dd3 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 10 Sep 2019 20:04:26 -0700
 Subject: [PATCH] src: Do not reset FINAL_LIBS
@@ -15,10 +15,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  src/Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: redis-7.2.10/src/Makefile
-===================================================================
---- redis-7.2.10.orig/src/Makefile
-+++ redis-7.2.10/src/Makefile
+diff --git a/src/Makefile b/src/Makefile
+index b8e0d44..3a68fa6 100644
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -122,7 +122,7 @@ endif
  
  FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS)
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
similarity index 92%
rename from meta-oe/recipes-extended/redis/redis-7.2.11/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
rename to meta-oe/recipes-extended/redis/redis-7.2.12/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
index 8e5f30993b..a45de28e0e 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.11/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch
@@ -1,4 +1,4 @@
-From acd832d76002a1916b3128ac05bc0296425aea6d Mon Sep 17 00:00:00 2001
+From b636c748fb4047b1ef3a4062c675e1ee4584230b Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 21 Dec 2019 12:09:51 -0800
 Subject: [PATCH] Define _GNU_SOURCE to get PTHREAD_MUTEX_INITIALIZER
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/0006-Define-correct-gregs-for-RISCV32.patch b/meta-oe/recipes-extended/redis/redis-7.2.12/0006-Define-correct-gregs-for-RISCV32.patch
similarity index 97%
rename from meta-oe/recipes-extended/redis/redis-7.2.11/0006-Define-correct-gregs-for-RISCV32.patch
rename to meta-oe/recipes-extended/redis/redis-7.2.12/0006-Define-correct-gregs-for-RISCV32.patch
index 7009048171..bf44858d16 100644
--- a/meta-oe/recipes-extended/redis/redis-7.2.11/0006-Define-correct-gregs-for-RISCV32.patch
+++ b/meta-oe/recipes-extended/redis/redis-7.2.12/0006-Define-correct-gregs-for-RISCV32.patch
@@ -1,4 +1,4 @@
-From dd3ecb07bbf80b986b8f2c656ea11d1346e212f6 Mon Sep 17 00:00:00 2001
+From 8984a5df54fc80de1c99b311f117d28c2a42d959 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Mon, 26 Oct 2020 21:32:22 -0700
 Subject: [PATCH] Define correct gregs for RISCV32
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/init-redis-server b/meta-oe/recipes-extended/redis/redis-7.2.12/init-redis-server
similarity index 100%
rename from meta-oe/recipes-extended/redis/redis-7.2.11/init-redis-server
rename to meta-oe/recipes-extended/redis/redis-7.2.12/init-redis-server
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/redis.conf b/meta-oe/recipes-extended/redis/redis-7.2.12/redis.conf
similarity index 100%
rename from meta-oe/recipes-extended/redis/redis-7.2.11/redis.conf
rename to meta-oe/recipes-extended/redis/redis-7.2.12/redis.conf
diff --git a/meta-oe/recipes-extended/redis/redis-7.2.11/redis.service b/meta-oe/recipes-extended/redis/redis-7.2.12/redis.service
similarity index 100%
rename from meta-oe/recipes-extended/redis/redis-7.2.11/redis.service
rename to meta-oe/recipes-extended/redis/redis-7.2.12/redis.service
diff --git a/meta-oe/recipes-extended/redis/redis_7.2.11.bb b/meta-oe/recipes-extended/redis/redis_7.2.12.bb
similarity index 96%
rename from meta-oe/recipes-extended/redis/redis_7.2.11.bb
rename to meta-oe/recipes-extended/redis/redis_7.2.12.bb
index 5ccb1ac935..742a5f1cf2 100644
--- a/meta-oe/recipes-extended/redis/redis_7.2.11.bb
+++ b/meta-oe/recipes-extended/redis/redis_7.2.12.bb
@@ -17,8 +17,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://0005-Define-_GNU_SOURCE-to-get-PTHREAD_MUTEX_INITIALIZER.patch \
            file://0006-Define-correct-gregs-for-RISCV32.patch \
           "
-
-SRC_URI[sha256sum] = "2f9886eca68d30114ad6a01da65631f8007d802fd3e6c9fac711251e6390323d"
+SRC_URI[sha256sum] = "97c60478a7c777ac914ca9d87a7e88ba265926456107e758c62d8f971d0196bc"
 
 inherit autotools-brokensep pkgconfig update-rc.d systemd useradd
 

[oe][meta-oe][scarthgap][PATCH 34/38] redis: upgrade 6.2.20 -> 6.2.21

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Changelog:
https://github.com/redis/redis/releases/tag/6.2.21

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../recipes-extended/redis/{redis_6.2.20.bb => redis_6.2.21.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-extended/redis/{redis_6.2.20.bb => redis_6.2.21.bb} (96%)

diff --git a/meta-oe/recipes-extended/redis/redis_6.2.20.bb b/meta-oe/recipes-extended/redis/redis_6.2.21.bb
similarity index 96%
rename from meta-oe/recipes-extended/redis/redis_6.2.20.bb
rename to meta-oe/recipes-extended/redis/redis_6.2.21.bb
index 6eaf885f2f..e0bf92b210 100644
--- a/meta-oe/recipes-extended/redis/redis_6.2.20.bb
+++ b/meta-oe/recipes-extended/redis/redis_6.2.21.bb
@@ -18,7 +18,7 @@ SRC_URI = "http://download.redis.io/releases/${BP}.tar.gz \
            file://0006-Define-correct-gregs-for-RISCV32.patch \
           "
 
-SRC_URI[sha256sum] = "7f8b8a7aed53c445a877adf9e3743cdd323518524170135a58c0702f2dba6ef4"
+SRC_URI[sha256sum] = "6383b32ba8d246f41bbbb83663381f5a5f4c4713235433cec22fc4a47e9b6d5f"
 
 inherit autotools-brokensep update-rc.d systemd useradd
 

[oe][meta-oe][scarthgap][PATCH 35/38] cryptsetup: upgrade 2.7.2 -> 2.7.3

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Changelog:
============
* Do not allow formatting LUKS2 with Opal SED (hardware encryption)
* Fixes to wiping LUKS2 headers after Opal locking area erase.
* Mention the need for possible PSID revert before Opal format for some
  drives (man page).
* Fix Bitlocker-compatible code to ignore newly seen metadata entries.
* Fix interactive query retry if LUKS2 unbound keyslot is present.
* Detect unsupported zoned devices for LUKS header devices.
* Allow "capi" cipher format for benchmark command and fix parsing
  of plain IV in "capi" format.
* Add support for HCTR2 encryption mode.
* Source code now uses SPDX license identifiers instead of full
  license preambles.
* Fix missing includes for cryptographic backend that could cause
  compilation errors for some systems.
* Fix tests to work correctly in FIPS mode with recent OpenSSL 3.2.
* Fix various (mostly false positive) issues detected by Coverity.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 7916a5c55a2dee58f062197c45d7e50a8960e471)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../cryptsetup/{cryptsetup_2.7.2.bb => cryptsetup_2.7.3.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_2.7.2.bb => cryptsetup_2.7.3.bb} (98%)

diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.2.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.3.bb
similarity index 98%
rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.2.bb
rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.3.bb
index 504c718b96..7c83fec439 100644
--- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.2.bb
+++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.3.bb
@@ -20,7 +20,7 @@ DEPENDS:append:libc-musl = " argp-standalone"
 LDFLAGS:append:libc-musl = " -largp"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "219ebf74e8eddf96624a0376477e5a6f8f350a67aaf36e7dadb114d94b3afef4"
+SRC_URI[sha256sum] = "b772ae4f6df0cee7200b28cea960e4daaff2a203d2fd502beab3c1317b07a456"
 
 inherit autotools gettext pkgconfig
 

[oe][meta-oe][scarthgap][PATCH 36/38] cryptsetup: upgrade 2.7.3 -> 2.7.4

[ankur.tyagi85]

From: Wang Mingyu <wangmy@fujitsu.com>

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit a403ed1c3e852fddc29bf102e92f934677420648)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../cryptsetup/{cryptsetup_2.7.3.bb => cryptsetup_2.7.4.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_2.7.3.bb => cryptsetup_2.7.4.bb} (98%)

diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.3.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.4.bb
similarity index 98%
rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.3.bb
rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.4.bb
index 7c83fec439..a57d79d6f7 100644
--- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.3.bb
+++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.4.bb
@@ -20,7 +20,7 @@ DEPENDS:append:libc-musl = " argp-standalone"
 LDFLAGS:append:libc-musl = " -largp"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "b772ae4f6df0cee7200b28cea960e4daaff2a203d2fd502beab3c1317b07a456"
+SRC_URI[sha256sum] = "dce29903a58f7b774fe61191e7e6de955de0f40d9e27b0028ffcf3438c0e9480"
 
 inherit autotools gettext pkgconfig
 

[oe][meta-oe][scarthgap][PATCH 37/38] cryptsetup: upgrade 2.7.4 -> 2.7.5

[ankur.tyagi85]

From: Yi Zhao <yi.zhao@windriver.com>

Release Notes:
https://www.kernel.org/pub/linux/utils/cryptsetup/v2.7/v2.7.5-ReleaseNotes

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit cf174f190d75736aaa6c3ffe7e82d86d19930420)
Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../cryptsetup/{cryptsetup_2.7.4.bb => cryptsetup_2.7.5.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta-oe/recipes-crypto/cryptsetup/{cryptsetup_2.7.4.bb => cryptsetup_2.7.5.bb} (98%)

diff --git a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.4.bb b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb
similarity index 98%
rename from meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.4.bb
rename to meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb
index a57d79d6f7..54b47ea3fd 100644
--- a/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.4.bb
+++ b/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb
@@ -20,7 +20,7 @@ DEPENDS:append:libc-musl = " argp-standalone"
 LDFLAGS:append:libc-musl = " -largp"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "dce29903a58f7b774fe61191e7e6de955de0f40d9e27b0028ffcf3438c0e9480"
+SRC_URI[sha256sum] = "d2be4395b8f503b0ebf4b2d81db90c35a97050a358ee21fe62a0dfb66e5d5522"
 
 inherit autotools gettext pkgconfig
 

[oe][meta-oe][scarthgap][PATCH 38/38] botan: patch CVE-2024-34703

[ankur.tyagi85]

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Details https://nvd.nist.gov/vuln/detail/CVE-2024-34703

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
---
 .../botan/botan/CVE-2024-34703.patch          | 38 +++++++++++++++++++
 meta-oe/recipes-crypto/botan/botan_3.2.0.bb   |  4 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-crypto/botan/botan/CVE-2024-34703.patch

diff --git a/meta-oe/recipes-crypto/botan/botan/CVE-2024-34703.patch b/meta-oe/recipes-crypto/botan/botan/CVE-2024-34703.patch
new file mode 100644
index 0000000000..e3fadc4818
--- /dev/null
+++ b/meta-oe/recipes-crypto/botan/botan/CVE-2024-34703.patch
@@ -0,0 +1,38 @@
+From 59d92780f79c73d735c71620adef40bb13a87ce2 Mon Sep 17 00:00:00 2001
+From: Jack Lloyd <jack@randombit.net>
+Date: Tue, 20 Feb 2024 06:30:10 -0500
+Subject: [PATCH] When decoding an arbitrary elliptic curve, set an upper bound
+ on length
+
+Otherwise it's trivial to send a very large prime, which can take a
+significant amount of computation to check.
+
+Reported by Bing Shi
+
+CVE: CVE-2024-34703
+Upstream-Status: Backport [https://github.com/randombit/botan/pull/3913/commits/fbe9ec578a8548958677224d2e60d2c2c838bc9a]
+(cherry picked from commit fbe9ec578a8548958677224d2e60d2c2c838bc9a)
+Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
+---
+ src/lib/pubkey/ec_group/ec_group.cpp | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/lib/pubkey/ec_group/ec_group.cpp b/src/lib/pubkey/ec_group/ec_group.cpp
+index eb4ed90e2..beaeedd51 100644
+--- a/src/lib/pubkey/ec_group/ec_group.cpp
++++ b/src/lib/pubkey/ec_group/ec_group.cpp
+@@ -357,8 +357,12 @@ std::pair<std::shared_ptr<EC_Group_Data>, bool> EC_Group::BER_decode_EC_group(co
+          .end_cons()
+          .verify_end();
+ 
+-      if(p.bits() < 64 || p.is_negative() || !is_bailie_psw_probable_prime(p)) {
+-         throw Decoding_Error("Invalid ECC p parameter");
++      if(p.bits() < 112 || p.bits() > 1024) {
++         throw Decoding_Error("ECC p parameter is invalid size");
++      }
++
++      if(p.is_negative() || !is_bailie_psw_probable_prime(p)) {
++         throw Decoding_Error("ECC p parameter is not a prime");
+       }
+ 
+       if(a.is_negative() || a >= p) {
diff --git a/meta-oe/recipes-crypto/botan/botan_3.2.0.bb b/meta-oe/recipes-crypto/botan/botan_3.2.0.bb
index 1fdda65a05..3c603a9b26 100644
--- a/meta-oe/recipes-crypto/botan/botan_3.2.0.bb
+++ b/meta-oe/recipes-crypto/botan/botan_3.2.0.bb
@@ -4,7 +4,9 @@ LICENSE = "BSD-2-Clause"
 LIC_FILES_CHKSUM = "file://license.txt;md5=f5254d3abe90ec5bb82c5694ff751546"
 SECTION = "libs"
 
-SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz"
+SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz \
+           file://CVE-2024-34703.patch \
+"
 SRC_URI[sha256sum] = "049c847835fcf6ef3a9e206b33de05dd38999c325e247482772a5598d9e5ece3"
 
 S = "${WORKDIR}/Botan-${PV}"