[PATCH 01/52] ifupdown: update 0.8.43 -> 0.8.41

[PATCH 01/52] ifupdown: update 0.8.43 -> 0.8.41

[Alexander Kanavin]

Do not apply patch conditionally, there is no need for that,
and conditional patches are problematic with upgrades and devtool.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Define-FNM_EXTMATCH-for-musl.patch   |  8 +++-----
 ...not-use-dpkg-for-determining-OS-type.patch |  3 ++-
 .../0001-ifupdown-skip-wrong-test-case.patch  | 12 +++++-------
 ...t-rely-on-dpkg-architecture-to-set-a.patch | 10 ++++------
 .../ifupdown/files/tweak-ptest-script.patch   | 19 +++++++++++--------
 ...{ifupdown_0.8.39.bb => ifupdown_0.8.41.bb} |  8 ++++----
 6 files changed, 29 insertions(+), 31 deletions(-)
 rename meta/recipes-core/ifupdown/{ifupdown_0.8.39.bb => ifupdown_0.8.41.bb} (92%)

diff --git a/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch b/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
index 7bf02ea536..6c4ed526bf 100644
--- a/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
+++ b/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
@@ -1,4 +1,4 @@
-From ff714d6461569d69b253089110ec659e4ebec248 Mon Sep 17 00:00:00 2001
+From 8dfbcf02e424ba1fdef587d81c9e08a37ab8c1b6 Mon Sep 17 00:00:00 2001
 From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
 Date: Tue, 2 Jul 2019 20:10:42 +0200
 Subject: [PATCH] Define FNM_EXTMATCH for musl
@@ -24,12 +24,13 @@ function); did you mean 'FNM_NOMATCH'?
 Upstream-Status: Submitted [https://salsa.debian.org/debian/ifupdown/merge_requests/5]
 
 Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
+
 ---
  archcommon.h | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/archcommon.h b/archcommon.h
-index fe99950..f257f9d 100644
+index 818b0b6..ad9cd1a 100644
 --- a/archcommon.h
 +++ b/archcommon.h
 @@ -1,5 +1,9 @@
@@ -42,6 +43,3 @@ index fe99950..f257f9d 100644
  bool execable(const char *);
  
  #define iface_is_link() (!_iface_has(ifd->real_iface, ":."))
--- 
-2.17.1
-
diff --git a/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch b/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
index 57c8d04fd7..6e15a25224 100644
--- a/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
+++ b/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
@@ -1,10 +1,11 @@
-From 7ace0656bd325f9e7749f2cde641eddc057bc98a Mon Sep 17 00:00:00 2001
+From 7fe516cbaf9fda09d99dcb54d4645367cffc8a4d Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Thu, 9 Jan 2020 15:38:06 +0100
 Subject: [PATCH] Makefile: do not use dpkg for determining OS type
 
 Upstream-Status: Inappropriate [oe-core specific]
 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch b/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
index c751e4fab0..9ae24da51e 100644
--- a/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
+++ b/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
@@ -1,4 +1,4 @@
-From 98243deface88614e3f332c4a85d04a9abce55ff Mon Sep 17 00:00:00 2001
+From 782d8a869c266820d0f34974436f244f67afaea7 Mon Sep 17 00:00:00 2001
 From: Zqiang <qiang.zhang@windriver.com>
 Date: Mon, 19 Apr 2021 14:15:45 +0800
 Subject: [PATCH] ifupdown: skip wrong test case
@@ -10,23 +10,21 @@ and are skipped directly.
 Upstream-Status: Inappropriate [oe-core specific]
 
 Signed-off-by: Zqiang <qiang.zhang@windriver.com>
+
 ---
  tests/testbuild-linux | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/testbuild-linux b/tests/testbuild-linux
-index 1181ea0..5f148eb 100755
+index 2fa1b8b..2c69856 100755
 --- a/tests/testbuild-linux
 +++ b/tests/testbuild-linux
 @@ -3,7 +3,7 @@
  dir=tests/linux
  
  result=true
--for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do
-+for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
+-for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
++for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
  	if [ -e $dir/testcase.$test ]; then
  		args="$(cat $dir/testcase.$test | sed -n 's/^# RUN: //p')"
  	else
--- 
-2.17.1
-
diff --git a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch b/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
index d1c3d260ed..7b4b761e6a 100644
--- a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
+++ b/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
@@ -1,7 +1,7 @@
-From 40257d65b338b6e2ed9d89d6fa7c7b8701a4c311 Mon Sep 17 00:00:00 2001
+From fc8e8d4cb19ff30e69aa1855332544f1017f974c Mon Sep 17 00:00:00 2001
 From: Paul Gortmaker <paul.gortmaker@windriver.com>
 Date: Wed, 6 Aug 2014 14:54:12 -0400
-Subject: [PATCH 1/2] defn2[c|man]: don't rely on dpkg-architecture to set arch
+Subject: [PATCH] defn2[c|man]: don't rely on dpkg-architecture to set arch
 
 In yocto we'll always be cross compiling, and we'll always
 be building on linux for linux (vs. *BSD, hurd, etc.)
@@ -13,13 +13,14 @@ like the loopback device not being configured/enabled.
 
 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
 Upstream-Status: Pending
+
 ---
  defn2c.pl   | 6 +++---
  defn2man.pl | 6 +++---
  2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/defn2c.pl b/defn2c.pl
-index 8798dc2..f2551c7 100755
+index fa7a02e..bb4987d 100755
 --- a/defn2c.pl
 +++ b/defn2c.pl
 @@ -2,9 +2,9 @@
@@ -52,6 +53,3 @@ index 6ddcfdd..c9c4dd0 100755
  
  # declarations
  my $line;
--- 
-2.17.1
-
diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
index ea88a9086a..fa6bb84df3 100644
--- a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
+++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
@@ -1,14 +1,19 @@
-Tweak tests of ifupdown to make it work with oe-core ptest framework.
+From a6bb2ac5f521c678abbbdb1960d28f750f4357a6 Mon Sep 17 00:00:00 2001
+From: Kai Kang <kai.kang@windriver.com>
+Date: Mon, 3 Feb 2020 17:33:11 +0800
+Subject: [PATCH] Tweak tests of ifupdown to make it work with oe-core ptest
+ framework.
 
 Upstream-Status: Inappropriate [oe-core specific]
 
 Signed-off-by: Kai Kang <kai.kang@windriver.com>
+
 ---
  tests/testbuild-linux | 11 ++++++-----
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/tests/testbuild-linux b/tests/testbuild-linux
-index 5f148eb..d9b1698 100755
+index 2c69856..05f0703 100755
 --- a/tests/testbuild-linux
 +++ b/tests/testbuild-linux
 @@ -1,6 +1,7 @@
@@ -19,8 +24,8 @@ index 5f148eb..d9b1698 100755
 +dir=$curdir/linux
  
  result=true
- for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
-@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
+ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
+@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
          echo "Testcase $test: $args"
  
  	exitcode=0
@@ -29,7 +34,7 @@ index 5f148eb..d9b1698 100755
                  >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$?
  
          (echo "exit code: $exitcode";
-@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
+@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
           echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test
  
  	exitcode=0
@@ -38,7 +43,7 @@ index 5f148eb..d9b1698 100755
                 >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$?
  
          (echo "exit code: $exitcode";
-@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
+@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
           echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test
  
          if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then
@@ -50,5 +55,3 @@ index 5f148eb..d9b1698 100755
                  result=false
          fi
          echo "=========="
---
-2.17.1
diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb
similarity index 92%
rename from meta/recipes-core/ifupdown/ifupdown_0.8.39.bb
rename to meta/recipes-core/ifupdown/ifupdown_0.8.41.bb
index 7096bc94d7..5dbd6193b8 100644
--- a/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb
+++ b/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb
@@ -8,15 +8,15 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=master \
-           file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
            file://99_network \
+           file://run-ptest \
            file://0001-Define-FNM_EXTMATCH-for-musl.patch \
            file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \
-           file://run-ptest \
            file://0001-ifupdown-skip-wrong-test-case.patch \
-           ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \
+           file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
+           file://tweak-ptest-script.patch \
            "
-SRCREV = "be91dd267b4a8db502a6bbf5758563f7048b8078"
+SRCREV = "369d9d3c13a0c56ad09fd4f13b4a80eb9a94e270"
 
 S = "${WORKDIR}/git"
 
-- 
2.30.2

[PATCH 02/52] python3-pip: update 22.3.1 -> 23.0

[Alexander Kanavin]

License-Update: formatting, pep517 replaced by pyproject_hooks with same license.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../python/{python3-pip_22.3.1.bb => python3-pip_23.0.bb}   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/python/{python3-pip_22.3.1.bb => python3-pip_23.0.bb} (91%)

diff --git a/meta/recipes-devtools/python/python3-pip_22.3.1.bb b/meta/recipes-devtools/python/python3-pip_23.0.bb
similarity index 91%
rename from meta/recipes-devtools/python/python3-pip_22.3.1.bb
rename to meta/recipes-devtools/python/python3-pip_23.0.bb
index cb9f68679f..8b956932c3 100644
--- a/meta/recipes-devtools/python/python3-pip_22.3.1.bb
+++ b/meta/recipes-devtools/python/python3-pip_23.0.bb
@@ -13,11 +13,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=63ec52baf95163b597008bb46db68030 \
                     file://src/pip/_vendor/msgpack/COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751 \
                     file://src/pip/_vendor/packaging/LICENSE;md5=faadaedca9251a90b205c9167578ce91 \
                     file://src/pip/_vendor/packaging/LICENSE.APACHE;md5=2ee41112a44fe7014dce33e26468ba93 \
-                    file://src/pip/_vendor/pep517/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \
                     file://src/pip/_vendor/pkg_resources/LICENSE;md5=9a33897f1bca1160d7aad3835152e158 \
-                    file://src/pip/_vendor/platformdirs/LICENSE.txt;md5=282c970bb844954c8535dd6e9733db7f \
+                    file://src/pip/_vendor/platformdirs/LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a \
                     file://src/pip/_vendor/pygments/LICENSE;md5=36a13c90514e2899f1eba7f41c3ee592 \
                     file://src/pip/_vendor/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \
+                    file://src/pip/_vendor/pyproject_hooks/LICENSE;md5=aad69c93f605003e3342b174d9b0708c \
                     file://src/pip/_vendor/requests/LICENSE;md5=34400b68072d710fecd0a2940a0d1658 \
                     file://src/pip/_vendor/resolvelib/LICENSE;md5=78e1c0248051c32a38a7f820c30bd7a5 \
                     file://src/pip/_vendor/rich/LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303 \
@@ -33,7 +33,7 @@ inherit pypi python_setuptools_build_meta
 
 SRC_URI += "file://no_shebang_mangling.patch"
 
-SRC_URI[sha256sum] = "65fd48317359f3af8e593943e6ae1506b66325085ea64b706a998c6e83eeaf38"
+SRC_URI[sha256sum] = "aee438284e82c8def684b0bcc50b1f6ed5e941af97fa940e83e2e8ef1a59da9b"
 
 do_install:append() {
     rm -f ${D}/${bindir}/pip
-- 
2.30.2

[PATCH 03/52] diffutils: update 3.8 -> 3.9

[Alexander Kanavin]

Drop patch as issue fixed upstream.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...001-Skip-strip-trailing-cr-test-case.patch | 11 +++----
 ...a-standard-layout-so-glibc-and-musl-.patch | 33 -------------------
 .../{diffutils_3.8.bb => diffutils_3.9.bb}    |  3 +-
 3 files changed, 6 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch
 rename meta/recipes-extended/diffutils/{diffutils_3.8.bb => diffutils_3.9.bb} (88%)

diff --git a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch
index aac1c43465..8b88c308f2 100644
--- a/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch
+++ b/meta/recipes-extended/diffutils/diffutils/0001-Skip-strip-trailing-cr-test-case.patch
@@ -1,4 +1,4 @@
-From bd7fb8be2ae2d75347cf7733302d5093046ffa85 Mon Sep 17 00:00:00 2001
+From 027229d25392b22d7280c0abbc3efde4f467d167 Mon Sep 17 00:00:00 2001
 From: Peiran Hong <peiran.hong@windriver.com>
 Date: Thu, 5 Sep 2019 15:42:22 -0400
 Subject: [PATCH] Skip strip-trailing-cr test case
@@ -10,19 +10,21 @@ package.
 Upstream-Status: Inappropriate [embedded specific]
 
 Signed-off-by: Peiran Hong <peiran.hong@windriver.com>
+
 ---
  tests/Makefile.am | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 83a7c9d..04d51b5 100644
+index d98df82..757ea52 100644
 --- a/tests/Makefile.am
 +++ b/tests/Makefile.am
-@@ -21,8 +21,10 @@ TESTS = \
+@@ -21,9 +21,11 @@ TESTS = \
    stdin \
    strcoll-0-names \
    filename-quoting \
 -  strip-trailing-cr \
+   timezone \
    colors
 +# Skipping this test since it requires valgrind
 +# and thus is too heavy for diffutils package
@@ -30,6 +32,3 @@ index 83a7c9d..04d51b5 100644
  
  XFAIL_TESTS = large-subopt
  
--- 
-2.21.0
-
diff --git a/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch b/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch
deleted file mode 100644
index 4928e1eaff..0000000000
--- a/meta/recipes-extended/diffutils/diffutils/0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f385ad6639380eb6dfa8b8eb4a5ba65dd12db744 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Fri, 25 Mar 2022 13:43:19 -0700
-Subject: [PATCH] mcontext is not a standard layout so glibc and musl differ
-
-This is already applied to libsigsegv upstream, hopefully next version
-of grep will update its internal copy and we can drop this patch
-
-Upstream-Status: Backport [https://git.savannah.gnu.org/gitweb/?p=libsigsegv.git;a=commitdiff;h=a6ff69873110c0a8ba6f7fd90532dbc11224828c]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- lib/sigsegv.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/sigsegv.c b/lib/sigsegv.c
-index 998c827..b6f4841 100644
---- a/lib/sigsegv.c
-+++ b/lib/sigsegv.c
-@@ -219,8 +219,8 @@ int libsigsegv_version = LIBSIGSEGV_VERSION;
- #   define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.gp_regs[1]
- #  else /* 32-bit */
- /* both should be equivalent */
--#   if 0
--#    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.regs->gpr[1]
-+#   if ! defined __GLIBC__
-+#    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_regs->gregs[1]
- #   else
- #    define SIGSEGV_FAULT_STACKPOINTER  ((ucontext_t *) ucp)->uc_mcontext.uc_regs->gregs[1]
- #   endif
--- 
-2.35.1
-
diff --git a/meta/recipes-extended/diffutils/diffutils_3.8.bb b/meta/recipes-extended/diffutils/diffutils_3.9.bb
similarity index 88%
rename from meta/recipes-extended/diffutils/diffutils_3.8.bb
rename to meta/recipes-extended/diffutils/diffutils_3.9.bb
index 8889c83ee2..2bb9e6f32d 100644
--- a/meta/recipes-extended/diffutils/diffutils_3.8.bb
+++ b/meta/recipes-extended/diffutils/diffutils_3.9.bb
@@ -6,10 +6,9 @@ require diffutils.inc
 SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.xz \
            file://run-ptest \
            file://0001-Skip-strip-trailing-cr-test-case.patch \
-           file://0001-mcontext-is-not-a-standard-layout-so-glibc-and-musl-.patch \
            "
 
-SRC_URI[sha256sum] = "a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec"
+SRC_URI[sha256sum] = "d80d3be90a201868de83d78dad3413ad88160cc53bcc36eb9eaf7c20dbf023f1"
 
 EXTRA_OECONF += "ac_cv_path_PR_PROGRAM=${bindir}/pr --without-libsigsegv-prefix"
 
-- 
2.30.2

[PATCH 04/52] mc: update 4.8.28 -> 4.8.29

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...1-mc-replace-perl-w-with-use-warnings.patch | 18 ++++++++----------
 meta/recipes-extended/mc/files/nomandate.patch |  6 +++---
 .../mc/{mc_4.8.28.bb => mc_4.8.29.bb}          |  2 +-
 3 files changed, 12 insertions(+), 14 deletions(-)
 rename meta/recipes-extended/mc/{mc_4.8.28.bb => mc_4.8.29.bb} (97%)

diff --git a/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch
index 012a499684..5ede82d342 100644
--- a/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch
+++ b/meta/recipes-extended/mc/files/0001-mc-replace-perl-w-with-use-warnings.patch
@@ -1,4 +1,4 @@
-From cdc7c278212ae836eecb4cc9d42c29443cc128a0 Mon Sep 17 00:00:00 2001
+From 62c86b69106d0d702167ba1b963ea1c201cce5af Mon Sep 17 00:00:00 2001
 From: Robert Yang <liezhi.yang@windriver.com>
 Date: Thu, 6 Apr 2017 02:24:28 -0700
 Subject: [PATCH] mc: replace "perl -w" with "use warnings"
@@ -20,6 +20,7 @@ The man2hlp.in already has "use warnings;", so just remove '-w' is OK.
 Upstream-Status: Submitted [https://github.com/MidnightCommander/mc/pull/174]
 
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
 ---
  src/man2hlp/man2hlp.in           | 2 +-
  src/vfs/extfs/helpers/a+.in      | 4 +++-
@@ -30,12 +31,12 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
  6 files changed, 13 insertions(+), 6 deletions(-)
 
 diff --git a/src/man2hlp/man2hlp.in b/src/man2hlp/man2hlp.in
-index f095830..558a674 100644
+index 08765d8..8aa7131 100644
 --- a/src/man2hlp/man2hlp.in
 +++ b/src/man2hlp/man2hlp.in
 @@ -1,4 +1,4 @@
--#! @PERL@ -w
-+#! @PERL@
+-#! @PERL_FOR_BUILD@ -w
++#! @PERL_FOR_BUILD@
  #
  #  Man page to help file converter
  #  Copyright (C) 1994, 1995, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
@@ -59,7 +60,7 @@ index 579441c..fe446f4 100644
      $_ = shift(@_);
      s/([^\w\/.+-])/\\$1/g;
 diff --git a/src/vfs/extfs/helpers/mailfs.in b/src/vfs/extfs/helpers/mailfs.in
-index e9455be..059f41f 100644
+index 4bdd68b..5bb373b 100644
 --- a/src/vfs/extfs/helpers/mailfs.in
 +++ b/src/vfs/extfs/helpers/mailfs.in
 @@ -1,6 +1,7 @@
@@ -72,7 +73,7 @@ index e9455be..059f41f 100644
  # MC extfs for (possibly compressed) Berkeley style mailbox files
  # Peter Daum <gator@cs.tu-berlin.de> (Jan 1998, mc-4.1.24)
 diff --git a/src/vfs/extfs/helpers/patchfs.in b/src/vfs/extfs/helpers/patchfs.in
-index ef407de..3ad4b53 100644
+index c20cd54..1f1e75b 100644
 --- a/src/vfs/extfs/helpers/patchfs.in
 +++ b/src/vfs/extfs/helpers/patchfs.in
 @@ -1,4 +1,4 @@
@@ -107,7 +108,7 @@ index 418611f..82c7ccf 100644
               'apr' => '04', 'may' => '05', 'jun' => '06',
               'jul' => '07', 'aug' => '08', 'sep' => '09',
 diff --git a/src/vfs/extfs/helpers/uzip.in b/src/vfs/extfs/helpers/uzip.in
-index b1c4f90..c8eb335 100644
+index c468f3a..ceffb53 100644
 --- a/src/vfs/extfs/helpers/uzip.in
 +++ b/src/vfs/extfs/helpers/uzip.in
 @@ -1,4 +1,4 @@
@@ -124,6 +125,3 @@ index b1c4f90..c8eb335 100644
  
  #
  # Configuration options
--- 
-2.10.2
-
diff --git a/meta/recipes-extended/mc/files/nomandate.patch b/meta/recipes-extended/mc/files/nomandate.patch
index c01d065b0e..4ebaaa2fa7 100644
--- a/meta/recipes-extended/mc/files/nomandate.patch
+++ b/meta/recipes-extended/mc/files/nomandate.patch
@@ -1,4 +1,4 @@
-From f02010965af21db018c4e108b2193c872406a314 Mon Sep 17 00:00:00 2001
+From 4482ed0b8bd506cc2590ceacfdada6cc34450796 Mon Sep 17 00:00:00 2001
 From: Richard Purdie <richard.purdie@linuxfoundation.org>
 Date: Tue, 4 Feb 2020 18:12:15 +0000
 Subject: [PATCH] mc: Fix manpage date indeterminism
@@ -21,7 +21,7 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/doc/man/date-of-man-include.am b/doc/man/date-of-man-include.am
-index 3a4e599..f11e9b3 100644
+index c6b1e69..165a796 100644
 --- a/doc/man/date-of-man-include.am
 +++ b/doc/man/date-of-man-include.am
 @@ -1,5 +1,5 @@
@@ -29,5 +29,5 @@ index 3a4e599..f11e9b3 100644
 -	-e "s/%DATE_OF_MAN_PAGE%/$${MAN_DATE}/g" \
 +	-e "s/%DATE_OF_MAN_PAGE%//g" \
  	-e "s/%MAN_VERSION%/@MAN_VERSION@/g" \
- 	-e "s{%prefix%{@prefix@{g" \
  	-e "s{%sysconfdir%{@sysconfdir@{g" \
+ 	-e "s{%libexecdir%{@libexecdir@{g" \
diff --git a/meta/recipes-extended/mc/mc_4.8.28.bb b/meta/recipes-extended/mc/mc_4.8.29.bb
similarity index 97%
rename from meta/recipes-extended/mc/mc_4.8.28.bb
rename to meta/recipes-extended/mc/mc_4.8.29.bb
index 9a950a8cd0..c9db172183 100644
--- a/meta/recipes-extended/mc/mc_4.8.28.bb
+++ b/meta/recipes-extended/mc/mc_4.8.29.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2 \
            file://0001-mc-replace-perl-w-with-use-warnings.patch \
            file://nomandate.patch \
            "
-SRC_URI[sha256sum] = "6bb47533d7a55bb21e46292d2f94786c9037bd7a70bf02b6a3c48adb0c9ce20c"
+SRC_URI[sha256sum] = "ba6b2d8752806ac23fe045c1b081eb66dcefa6159205c79f86c005dcaf9941c1"
 
 # remove at next version upgrade or when output changes
 HASHEQUIV_HASH_VERSION .= ".2"
-- 
2.30.2

[PATCH 05/52] xf86-video-vmware: update 13.3.0 -> 13.4.0

[Alexander Kanavin]

Remove 0002-add-option-for-vmwgfx.patch; the original reason has been long resolved:

    Our Mesa doesn't yet ship the XA Gallium state tracker that the VMWGFX
    sub-driver needs, so just disable vmwgfx.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0002-add-option-for-vmwgfx.patch          | 103 ------------------
 ..._13.3.0.bb => xf86-video-vmware_13.4.0.bb} |   9 +-
 2 files changed, 2 insertions(+), 110 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
 rename meta/recipes-graphics/xorg-driver/{xf86-video-vmware_13.3.0.bb => xf86-video-vmware_13.4.0.bb} (53%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch b/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
deleted file mode 100644
index b37f697aa4..0000000000
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware/0002-add-option-for-vmwgfx.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From da6612659a279bcb02f70622b53a3894fbc11052 Mon Sep 17 00:00:00 2001
-From: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Date: Fri, 9 Dec 2016 14:35:45 +0200
-Subject: [PATCH] Add option for vmwgfx
-
-Upstream-Status: Submitted
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
----
- configure.ac | 51 +++++++++++++++++++++------------------------------
- 1 file changed, 21 insertions(+), 30 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 9f259ce..f3fec57 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -64,6 +64,13 @@ AC_ARG_ENABLE(vmwarectrl-client,
-                              [VMWARECTRL=$enableval], [VMWARECTRL=no])
- AM_CONDITIONAL(BUILD_VMWARECTRL, [test "x$VMWARECTRL" = xyes])
- 
-+# Define a configure option to build the vmwgfx driver
-+AC_ARG_ENABLE(vmwgfx,
-+              AS_HELP_STRING([--disable-vmwgfx],
-+                             [Disable vmwgfx driver (KMS/3D) (default: enabled)]),
-+                             [VMWGFX="$enableval"], [VMWGFX="yes"])
-+AM_CONDITIONAL(BUILD_VMWGFX, test "x$VMWGFX" = xyes)
-+
- # Store the list of server defined optional extensions in REQUIRED_MODULES
- XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
- XORG_DRIVER_CHECK_EXT(RENDER, renderproto)
-@@ -85,11 +92,6 @@ PKG_CHECK_EXISTS([xorg-server >= 1.4.99],
-                  [AC_DEFINE([HAVE_XORG_SERVER_1_5_0], 1,
-                  [Has version 1.5.0 or greater of the Xserver])])
- 
--PKG_CHECK_EXISTS([xorg-server >= 1.7.0],
--                 [AC_DEFINE([HAVE_XORG_SERVER_1_7_0], 1,
--                 [Has version 1.7.0 or greater of the Xserver])
--		 BUILD_VMWGFX=yes],[BUILD_VMWGFX=no])
--
- PKG_CHECK_EXISTS([xorg-server >= 1.12.0],
-                  [AC_DEFINE([HAVE_XORG_SERVER_1_12_0], 1,
-                  [Has version 1.12.0 or greater of the Xserver])])
-@@ -114,34 +116,22 @@ AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes)
- 
- AC_SUBST([moduledir])
- 
--if test x$BUILD_VMWGFX = xyes; then
--	PKG_CHECK_MODULES([LIBDRM], [libdrm],[],[BUILD_VMWGFX=no])
--fi
--if test x$BUILD_VMWGFX = xyes; then
--#
--# Early versions of mesa 10 forgot to bump the XA major version number in
--# the xa_tracker.h header
--#
--	PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],
--			  [PKG_CHECK_EXISTS([xatracker = 2.0.0],
--	                  [AC_DEFINE([HAVE_XA_2], 1,
--               		  [Has version 2 of XA])])],
--			  [BUILD_VMWGFX=no])
--#
--# Check for prime.
--#
-+AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
-+if test x$VMWGFX = xyes; then
-+	AC_MSG_RESULT([yes])
-+	PKG_CHECK_MODULES([LIBDRM], [libdrm])
-+	# Check for prime.
- 	PKG_CHECK_EXISTS([libdrm >= 2.4.38],
- 			 [AC_DEFINE([HAVE_LIBDRM_2_4_38], 1,
- 			 [Has version 2.4.38 or greater of libdrm])])
--fi
- 
--DRIVER_NAME=vmware
--AC_SUBST([DRIVER_NAME])
--
--AC_MSG_CHECKING([whether to build Kernel Mode Setting and 3D])
--if test x$BUILD_VMWGFX = xyes; then
--	AC_MSG_RESULT([yes])
--        AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path])
-+	# Early versions of mesa 10 forgot to bump the XA major version number
-+	# in the xa_tracker.h header
-+	PKG_CHECK_MODULES([XATRACKER], [xatracker >= 0.4.0],
-+			  [PKG_CHECK_EXISTS([xatracker = 2.0.0],
-+			  [AC_DEFINE([HAVE_XA_2], 1,
-+				     [Has version 2 of XA])])])
-+	AC_DEFINE([BUILD_VMWGFX], 1, [Building the vmwgfx driver path])
- 	libudev_check=yes
- 	AC_ARG_WITH([libudev],
- 		[AS_HELP_STRING([--without-libudev],
-@@ -158,7 +148,8 @@ else
- 	AC_MSG_RESULT([no])
- fi
- 
--AM_CONDITIONAL(BUILD_VMWGFX, test "x$BUILD_VMWGFX" = xyes)
-+DRIVER_NAME=vmware
-+AC_SUBST([DRIVER_NAME])
- 
- AC_CONFIG_FILES([
-                 Makefile
--- 
-2.1.4
-
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.3.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.4.0.bb
similarity index 53%
rename from meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.3.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.4.0.bb
index 41612b7f07..d7ba2b9e86 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.3.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.4.0.bb
@@ -7,13 +7,8 @@ DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards."
 LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
 
 DEPENDS += "virtual/libx11 xorgproto libpciaccess"
+XORG_DRIVER_COMPRESSOR = ".tar.xz"
 
-SRC_URI += "file://0002-add-option-for-vmwgfx.patch"
-
-SRC_URI[md5sum] = "08d66d062055080ff699ab4869726ea2"
-SRC_URI[sha256sum] = "47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c"
+SRC_URI[sha256sum] = "aed31ee5ed5ecc6e2226705383e7ad06f7602c1376a295305f376b17af3eb81a"
 
 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)'
-
-PACKAGECONFIG ?= ""
-PACKAGECONFIG[vmwgfx] = "--enable-vmwgfx, --disable-vmwgfx, libdrm virtual/mesa"
-- 
2.30.2

[PATCH 06/52] lttng-tools: update 2.13.8 -> 2.13.9

[Alexander Kanavin]

Drop determinism.patch as issue resolved upstream via linked ticket.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../lttng/lttng-tools/determinism.patch       | 64 -------------------
 ...-tools_2.13.8.bb => lttng-tools_2.13.9.bb} |  3 +-
 2 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 meta/recipes-kernel/lttng/lttng-tools/determinism.patch
 rename meta/recipes-kernel/lttng/{lttng-tools_2.13.8.bb => lttng-tools_2.13.9.bb} (98%)

diff --git a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch b/meta/recipes-kernel/lttng/lttng-tools/determinism.patch
deleted file mode 100644
index 0a897a8e13..0000000000
--- a/meta/recipes-kernel/lttng/lttng-tools/determinism.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-This is a bit ugly. Specifing abs_builddir as an RPATH is plain wrong when
-cross compiling. Sadly, removing the rpath makes libtool/automake do
-weird things and breaks the build as shared libs are no longer generated.
-
-We already try and delete the RPATH at do_install with chrpath however
-that does leave the path in the string table so it doesn't help us
-with reproducibility.
-
-Instead, hack in a bogus but harmless path, then delete it later in
-our do_install. Ultimately we may want to pass a specific path to use
-to configure if we really do need to set an RPATH at all. It is unclear
-to me whether the tests need that or not.
-
-Fixes reproducibility issues for lttng-tools.
-
-Upstream-Status: Submitted [https://bugs.lttng.org/issues/1361 - needs discussion with upstream about the correct solution]
-RP 2021/3/1
-
-Index: lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am
-===================================================================
---- lttng-tools-2.12.2.orig/tests/regression/ust/ust-dl/Makefile.am
-+++ lttng-tools-2.12.2/tests/regression/ust/ust-dl/Makefile.am
-@@ -27,16 +27,16 @@ noinst_LTLIBRARIES = libzzz.la libbar.la
- 
- libzzz_la_SOURCES = libzzz.c libzzz.h
- libzzz_la_LDFLAGS = -module -shared -avoid-version \
--		-rpath $(abs_builddir)
-+		-rpath /usr/lib
- 
- libbar_la_SOURCES = libbar.c libbar.h
- libbar_la_LDFLAGS = -module -shared -avoid-version \
--		-rpath $(abs_builddir)
-+		-rpath /usr/lib
- libbar_la_LIBADD = libzzz.la
- 
- libfoo_la_SOURCES = libfoo.c libfoo.h
- libfoo_la_LDFLAGS = -module -shared -avoid-version \
--		-rpath $(abs_builddir)
-+		-rpath /usr/lib
- libfoo_la_LIBADD = libbar.la
- 
- CLEANFILES = libfoo.so libfoo.so.debug libbar.so libbar.so.debug \
-@@ -44,7 +44,7 @@ CLEANFILES = libfoo.so libfoo.so.debug l
- 
- libtp_la_SOURCES = libbar-tp.h libbar-tp.c libfoo-tp.h libfoo-tp.c \
- 	libzzz-tp.h libzzz-tp.c
--libtp_la_LDFLAGS = -module -shared -rpath $(abs_builddir)
-+libtp_la_LDFLAGS = -module -shared -rpath /usr/lib
- 
- # Extract debug symbols
- libfoo.so.debug: libfoo.la
-Index: lttng-tools-2.12.2/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
-===================================================================
---- lttng-tools-2.12.2.orig/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
-+++ lttng-tools-2.12.2/tests/utils/testapp/userspace-probe-elf-binary/Makefile.am
-@@ -5,7 +5,7 @@ AM_CFLAGS += -O0
- noinst_LTLIBRARIES = libfoo.la
- 
- libfoo_la_SOURCES = foo.c foo.h
--libfoo_la_LDFLAGS = -shared -module -avoid-version -rpath $(abs_builddir)/.libs/
-+libfoo_la_LDFLAGS = -shared -module -avoid-version -rpath /usr/lib
- 
- noinst_PROGRAMS = userspace-probe-elf-binary
- userspace_probe_elf_binary_SOURCES = userspace-probe-elf-binary.c
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb b/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb
similarity index 98%
rename from meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
rename to meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb
index e64eeba635..340b254b46 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.13.8.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.13.9.bb
@@ -35,12 +35,11 @@ SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
            file://0001-tests-do-not-strip-a-helper-library.patch \
            file://run-ptest \
            file://lttng-sessiond.service \
-           file://determinism.patch \
            file://disable-tests.patch \
            file://0001-compat-Define-off64_t-as-off_t-on-linux.patch \
            "
 
-SRC_URI[sha256sum] = "b1e959579b260790930b20f3c7aa7cefb8a40e0de80d4a777c2bf78c6b353dc1"
+SRC_URI[sha256sum] = "8d94dc95b608cf70216b01203a3f8242b97a232db2e23421a2f43708da08f337"
 
 inherit autotools ptest pkgconfig useradd python3-dir manpages systemd
 
-- 
2.30.2

[PATCH 07/52] rt-tests: update 2.4 -> 2.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch | 6 +++---
 meta/recipes-rt/rt-tests/rt-tests.inc                       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
index 5410ec94e9..e9967767a0 100644
--- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
+++ b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
@@ -1,4 +1,4 @@
-From 5a7caafe04cac805b5057db2632b0defe703eacd Mon Sep 17 00:00:00 2001
+From 174fd202f2c85e43261139d71ad18908cc29b586 Mon Sep 17 00:00:00 2001
 From: Randy Witt <randy.e.witt@intel.com>
 Date: Fri, 16 Oct 2020 16:54:30 -0700
 Subject: [PATCH] Makefile: Allow for CC and AR to be overridden
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [other]
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 3fbf882..04d3c0f 100644
+index 4df61ec..a229986 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,6 +1,6 @@
- VERSION = 2.4
+ VERSION = 2.5
 -CC = $(CROSS_COMPILE)gcc
 -AR = $(CROSS_COMPILE)ar
 +CC ?= $(CROSS_COMPILE)gcc
diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc
index 93fa390bba..0481bf6028 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,5 +1,5 @@
-SRCREV = "ca4a6293da23ad0fd708ea1fecb2d465a9ea6093"
-PV = "2.4"
+SRCREV = "4579b9a6d85ae528f76e92421eb5e7b33cd26b17"
+PV = "2.5"
 PE = "1"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main"
-- 
2.30.2

[PATCH 08/52] apr: update 1.7.0 -> 1.7.2

[Alexander Kanavin]

Dropped patches have all been merged, addressed separately or are backports.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...ion-to-disable-timed-dependant-tests.patch | 20 ++---
 ...CHE_CHECK-for-strerror_r-return-type.patch | 52 -------------
 ...-runtime-test-for-mmap-that-can-map-.patch | 26 +++----
 ...ir-path-references-from-installed-ap.patch | 25 +++---
 ...configure.in-support-cross-compiling.patch | 63 ---------------
 ...ze-doesn-t-match-in-glibc-when-cross.patch | 76 -------------------
 .../apr/apr/CVE-2021-35940.patch              | 58 --------------
 .../recipes-support/apr/apr/autoconf270.patch | 22 ------
 .../apr/apr/libtoolize_check.patch            | 21 +++--
 .../apr/{apr_1.7.0.bb => apr_1.7.2.bb}        |  8 +-
 10 files changed, 51 insertions(+), 320 deletions(-)
 delete mode 100644 meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch
 delete mode 100644 meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch
 delete mode 100644 meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
 delete mode 100644 meta/recipes-support/apr/apr/CVE-2021-35940.patch
 delete mode 100644 meta/recipes-support/apr/apr/autoconf270.patch
 rename meta/recipes-support/apr/{apr_1.7.0.bb => apr_1.7.2.bb} (91%)

diff --git a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch
index abff4e9331..a274f3a16e 100644
--- a/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch
+++ b/meta/recipes-support/apr/apr/0001-Add-option-to-disable-timed-dependant-tests.patch
@@ -1,14 +1,15 @@
-From 2bbe20b4f69e84e7a18bc79d382486953f479328 Mon Sep 17 00:00:00 2001
+From 225abf37cd0b49960664b59f08e515a4c4ea5ad0 Mon Sep 17 00:00:00 2001
 From: Jeremy Puhlman <jpuhlman@mvista.com>
 Date: Thu, 26 Mar 2020 18:30:36 +0000
 Subject: [PATCH] Add option to disable timed dependant tests
 
-The disabled tests rely on timing to pass correctly. On a virtualized 
+The disabled tests rely on timing to pass correctly. On a virtualized
 system under heavy load, these tests randomly fail because they miss
 a timer or other timing related issues.
 
 Upstream-Status: Pending
 Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
+
 ---
  configure.in     | 6 ++++++
  include/apr.h.in | 1 +
@@ -16,10 +17,10 @@ Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
  3 files changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index d9f32d6..f0c5661 100644
+index bfd488b..3663220 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -2886,6 +2886,12 @@ AC_ARG_ENABLE(timedlocks,
+@@ -3023,6 +3023,12 @@ AC_ARG_ENABLE(timedlocks,
  )
  AC_SUBST(apr_has_timedlocks)
  
@@ -45,10 +46,10 @@ index ee99def..c46a5f4 100644
  #define APR_PROCATTR_USER_SET_REQUIRES_PASSWORD @apr_procattr_user_set_requires_password@
  
 diff --git a/test/testlock.c b/test/testlock.c
-index a43f477..6233d0b 100644
+index e3437c1..04e01b9 100644
 --- a/test/testlock.c
 +++ b/test/testlock.c
-@@ -396,13 +396,13 @@ abts_suite *testlock(abts_suite *suite)
+@@ -535,7 +535,7 @@ abts_suite *testlock(abts_suite *suite)
      abts_run_test(suite, threads_not_impl, NULL);
  #else
      abts_run_test(suite, test_thread_mutex, NULL);
@@ -56,6 +57,8 @@ index a43f477..6233d0b 100644
 +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS
      abts_run_test(suite, test_thread_timedmutex, NULL);
  #endif
+     abts_run_test(suite, test_thread_nestedmutex, NULL);
+@@ -543,7 +543,7 @@ abts_suite *testlock(abts_suite *suite)
      abts_run_test(suite, test_thread_rwlock, NULL);
      abts_run_test(suite, test_cond, NULL);
      abts_run_test(suite, test_timeoutcond, NULL);
@@ -63,7 +66,4 @@ index a43f477..6233d0b 100644
 +#if APR_HAS_TIMEDLOCKS && APR_HAVE_TIME_DEPENDANT_TESTS
      abts_run_test(suite, test_timeoutmutex, NULL);
  #endif
- #endif
--- 
-2.23.0
-
+ #ifdef WIN32
diff --git a/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch b/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch
deleted file mode 100644
index d0a9bd9129..0000000000
--- a/meta/recipes-support/apr/apr/0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 8ca3c3306f1a149e51a3be6a4b1e47e9aee88262 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 23 Aug 2022 22:42:03 -0700
-Subject: [PATCH] add AC_CACHE_CHECK for strerror_r return type
-
-APR's configure script uses AC_TRY_RUN to detect whether the return type
-of strerror_r is int. When cross-compiling this defaults to no.
-
-This commit adds an AC_CACHE_CHECK so users who cross-compile APR may
-influence the outcome with a configure variable.
-
-Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&revision=1875065]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- build/apr_common.m4 | 11 ++++-------
- 1 file changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/build/apr_common.m4 b/build/apr_common.m4
-index cbf2a4c..42e75cf 100644
---- a/build/apr_common.m4
-+++ b/build/apr_common.m4
-@@ -525,8 +525,9 @@ dnl  string.
- dnl
- dnl
- AC_DEFUN([APR_CHECK_STRERROR_R_RC], [
--AC_MSG_CHECKING(for type of return code from strerror_r)
--AC_TRY_RUN([
-+AC_CACHE_CHECK([whether return code from strerror_r has type int],
-+[ac_cv_strerror_r_rc_int],
-+[AC_TRY_RUN([
- #include <errno.h>
- #include <string.h>
- #include <stdio.h>
-@@ -542,14 +543,10 @@ main()
- }], [
-     ac_cv_strerror_r_rc_int=yes ], [
-     ac_cv_strerror_r_rc_int=no ], [
--    ac_cv_strerror_r_rc_int=no ] )
-+    ac_cv_strerror_r_rc_int=no ] ) ] )
- if test "x$ac_cv_strerror_r_rc_int" = xyes; then
-   AC_DEFINE(STRERROR_R_RC_INT, 1, [Define if strerror returns int])
--  msg="int"
--else
--  msg="pointer"
- fi
--AC_MSG_RESULT([$msg])
- ] )
- 
- dnl
--- 
-2.37.2
-
diff --git a/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch b/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch
index fa6202da79..a78b16284f 100644
--- a/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch
+++ b/meta/recipes-support/apr/apr/0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch
@@ -1,4 +1,4 @@
-From ee728971fd9d2da39356f1574d58d5daa3b24520 Mon Sep 17 00:00:00 2001
+From 316b81c462f065927d7fec56aadd5c8cb94d1cf0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 26 Aug 2022 00:28:08 -0700
 Subject: [PATCH] configure: Remove runtime test for mmap that can map
@@ -10,24 +10,25 @@ mutexes
 
 Upstream-Status: Inappropriate [Cross-compile specific]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
 ---
- configure.in | 32 --------------------------------
- 1 file changed, 32 deletions(-)
+ configure.in | 30 ------------------------------
+ 1 file changed, 30 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index a99049d..f1f55c7 100644
+index 3663220..dce9789 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -1182,38 +1182,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \
+@@ -1303,36 +1303,6 @@ AC_CHECK_FUNCS([mmap munmap shm_open shm_unlink shmget shmat shmdt shmctl \
  APR_CHECK_DEFINE(MAP_ANON, sys/mman.h)
  AC_CHECK_FILE(/dev/zero)
  
 -# Not all systems can mmap /dev/zero (such as HP-UX).  Check for that.
 -if test "$ac_cv_func_mmap" = "yes" &&
--   test "$ac_cv_file__dev_zero" = "yes"; then
--    AC_MSG_CHECKING(for mmap that can map /dev/zero)
--    AC_TRY_RUN([
--#include <sys/types.h>
+-  test "$ac_cv_file__dev_zero" = "yes"; then
+-    AC_CACHE_CHECK([for mmap that can map /dev/zero],
+-    [ac_cv_mmap__dev_zero],
+-    [AC_TRY_RUN([#include <sys/types.h>
 -#include <sys/stat.h>
 -#include <fcntl.h>
 -#ifdef HAVE_SYS_MMAN_H
@@ -49,14 +50,9 @@ index a99049d..f1f55c7 100644
 -            return 3;
 -        }
 -        return 0;
--    }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])
--
--    AC_MSG_RESULT($ac_cv_file__dev_zero)
+-    }], [], [ac_cv_file__dev_zero=no], [ac_cv_file__dev_zero=no])])
 -fi
 -
  # Now we determine which one is our anonymous shmem preference.
  haveshmgetanon="0"
  havemmapzero="0"
--- 
-2.37.2
-
diff --git a/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch
index 72e706f966..d63423f3a1 100644
--- a/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch
+++ b/meta/recipes-support/apr/apr/0002-apr-Remove-workdir-path-references-from-installed-ap.patch
@@ -1,8 +1,7 @@
-From 5925b20da8bbc34d9bf5a5dca123ef38864d43c6 Mon Sep 17 00:00:00 2001
+From 689a8db96a6d1e1cae9cbfb35d05ac82140a6555 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Tue, 30 Jan 2018 09:39:06 +0800
-Subject: [PATCH 2/7] apr: Remove workdir path references from installed apr
- files
+Subject: [PATCH] apr: Remove workdir path references from installed apr files
 
 Upstream-Status: Inappropriate [configuration]
 
@@ -14,20 +13,23 @@ packages at target run time, the workdir path caused confusion.
 Rebase to 1.6.3
 
 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+
 ---
- apr-config.in | 26 ++------------------------
- 1 file changed, 2 insertions(+), 24 deletions(-)
+ apr-config.in | 32 ++------------------------------
+ 1 file changed, 2 insertions(+), 30 deletions(-)
 
 diff --git a/apr-config.in b/apr-config.in
-index 84b4073..bbbf651 100644
+index bed47ca..47874e5 100644
 --- a/apr-config.in
 +++ b/apr-config.in
-@@ -152,14 +152,7 @@ while test $# -gt 0; do
+@@ -164,16 +164,7 @@ while test $# -gt 0; do
      flags="$flags $LDFLAGS"
      ;;
      --includes)
 -    if test "$location" = "installed"; then
          flags="$flags -I$includedir $EXTRA_INCLUDES"
+-    elif test "$location" = "crosscompile"; then
+-        flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES"
 -    elif test "$location" = "source"; then
 -        flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
 -    else
@@ -37,13 +39,15 @@ index 84b4073..bbbf651 100644
      ;;
      --srcdir)
      echo $APR_SOURCE_DIR
-@@ -181,29 +174,14 @@ while test $# -gt 0; do
+@@ -197,33 +188,14 @@ while test $# -gt 0; do
      exit 0
      ;;
      --link-ld)
 -    if test "$location" = "installed"; then
 -        ### avoid using -L if libdir is a "standard" location like /usr/lib
 -        flags="$flags -L$libdir -l${APR_LIBNAME}"
+-    elif test "$location" = "crosscompile"; then
+-        flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}"
 -    else
 -        ### this surely can't work since the library is in .libs?
 -        flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
@@ -62,6 +66,8 @@ index 84b4073..bbbf651 100644
 -        # Since the user is specifying they are linking with libtool, we
 -        # *know* that -R will be recognized by libtool.
 -        flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
+-    elif test "$location" = "crosscompile"; then
+-        flags="$flags  -L${APR_TARGET_DIR}/$libdir  -l${APR_LIBNAME}"
 -    else
 -        flags="$flags $LA_FILE"
 -    fi
@@ -69,6 +75,3 @@ index 84b4073..bbbf651 100644
      ;;
      --shlib-path-var)
      echo "$SHLIBPATH_VAR"
--- 
-1.8.3.1
-
diff --git a/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch b/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch
deleted file mode 100644
index 4dd53bd8eb..0000000000
--- a/meta/recipes-support/apr/apr/0003-Makefile.in-configure.in-support-cross-compiling.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From d5028c10f156c224475b340cfb1ba025d6797243 Mon Sep 17 00:00:00 2001
-From: Hongxu Jia <hongxu.jia@windriver.com>
-Date: Fri, 2 Feb 2018 15:51:42 +0800
-Subject: [PATCH 3/7] Makefile.in/configure.in: support cross compiling
-
-While cross compiling, the tools/gen_test_char could not
-be executed at build time, use AX_PROG_CC_FOR_BUILD to
-build native tools/gen_test_char
-
-Upstream-Status: Submitted [https://github.com/apache/apr/pull/8]
-
-Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
----
- Makefile.in  | 10 +++-------
- configure.in |  3 +++
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 5fb760e..8675f90 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -46,7 +46,7 @@ LT_VERSION = @LT_VERSION@
- 
- CLEAN_TARGETS = apr-config.out apr.exp exports.c export_vars.c .make.dirs \
- 	build/apr_rules.out tools/gen_test_char@EXEEXT@ \
--	tools/gen_test_char.o tools/gen_test_char.lo \
-+	tools/gen_test_char.o \
- 	include/private/apr_escape_test_char.h
- DISTCLEAN_TARGETS = config.cache config.log config.status \
- 	include/apr.h include/arch/unix/apr_private.h \
-@@ -131,13 +131,9 @@ check: $(TARGET_LIB)
- etags:
- 	etags `find . -name '*.[ch]'`
- 
--OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS)
--tools/gen_test_char.lo: tools/gen_test_char.c
-+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c
- 	$(APR_MKDIR) tools
--	$(LT_COMPILE)
--
--tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
--	$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
-+	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $< -o $@
- 
- include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
- 	$(APR_MKDIR) include/private
-diff --git a/configure.in b/configure.in
-index 719f331..361120f 100644
---- a/configure.in
-+++ b/configure.in
-@@ -183,6 +183,9 @@ dnl can only be used once within a configure script, so this prevents a
- dnl preload section from invoking the macro to get compiler info.
- AC_PROG_CC
- 
-+dnl Check build CC for gen_test_char compiling which is executed at build time.
-+AX_PROG_CC_FOR_BUILD
-+
- dnl AC_PROG_SED is only avaliable in recent autoconf versions.
- dnl Use AC_CHECK_PROG instead if AC_PROG_SED is not present.
- ifdef([AC_PROG_SED],
--- 
-1.8.3.1
-
diff --git a/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch b/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
deleted file mode 100644
index d1a2ebe881..0000000000
--- a/meta/recipes-support/apr/apr/0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 49661ea3858cf8494926cccf57d3e8c6dcb47117 Mon Sep 17 00:00:00 2001
-From: Dengke Du <dengke.du@windriver.com>
-Date: Wed, 14 Dec 2016 18:13:08 +0800
-Subject: [PATCH] apr: fix off_t size doesn't match in glibc when cross
- compiling
-
-In configure.in, it contains the following:
-
-	APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
-
-the macro "APR_CHECK_SIZEOF_EXTENDED" was defined in build/apr_common.m4,
-it use the "AC_TRY_RUN" macro, this macro let the off_t to 8, when cross
-compiling enable.
-
-So it was hardcoded for cross compiling, we should detect it dynamic based on
-the sysroot's glibc. We change it to the following:
-
-	AC_CHECK_SIZEOF(off_t)
-
-The same for the following hardcoded types for cross compiling:
-
-	pid_t	8
-	ssize_t	8
-	size_t	8
-	off_t	8
-
-Change the above correspondingly.
-
-Signed-off-by: Dengke Du <dengke.du@windriver.com>
-
-Upstream-Status: Pending
-
----
- configure.in | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 27b8539..fb408d1 100644
---- a/configure.in
-+++ b/configure.in
-@@ -1801,7 +1801,7 @@ else
-     socklen_t_value="int"
- fi
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], pid_t, 8)
-+AC_CHECK_SIZEOF(pid_t)
- 
- if test "$ac_cv_sizeof_pid_t" = "$ac_cv_sizeof_short"; then
-     pid_t_fmt='#define APR_PID_T_FMT "hd"'
-@@ -1873,7 +1873,7 @@ APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned long, lu, [size_t_fmt="lu"], [
- APR_CHECK_TYPES_FMT_COMPATIBLE(size_t, unsigned int, u, [size_t_fmt="u"])
- ])
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
-+AC_CHECK_SIZEOF(ssize_t)
- 
- dnl the else cases below should no longer occur;
- AC_MSG_CHECKING([which format to use for apr_ssize_t])
-@@ -1891,7 +1891,7 @@ fi
- 
- ssize_t_fmt="#define APR_SSIZE_T_FMT \"$ssize_t_fmt\""
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <stddef.h>], size_t, 8)
-+AC_CHECK_SIZEOF(size_t)
- 
- # else cases below should no longer occur;
- AC_MSG_CHECKING([which format to use for apr_size_t])
-@@ -1909,7 +1909,7 @@ fi
- 
- size_t_fmt="#define APR_SIZE_T_FMT \"$size_t_fmt\""
- 
--APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], off_t, 8)
-+AC_CHECK_SIZEOF(off_t)
- 
- if test "${ac_cv_sizeof_off_t}${apr_cv_use_lfs64}" = "4yes"; then
-     # Enable LFS
diff --git a/meta/recipes-support/apr/apr/CVE-2021-35940.patch b/meta/recipes-support/apr/apr/CVE-2021-35940.patch
deleted file mode 100644
index 00befdacee..0000000000
--- a/meta/recipes-support/apr/apr/CVE-2021-35940.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-
-SECURITY: CVE-2021-35940 (cve.mitre.org)
-
-Restore fix for CVE-2017-12613 which was missing in 1.7.x branch, though
-was addressed in 1.6.x in 1.6.3 and later via r1807976.
-
-The fix was merged back to 1.7.x in r1891198.
-
-Since this was a regression in 1.7.0, a new CVE name has been assigned
-to track this, CVE-2021-35940.
-
-Thanks to Iveta Cesalova <icesalov redhat.com> for reporting this issue.
-
-https://svn.apache.org/viewvc?view=revision&revision=1891198
-
-Upstream-Status: Backport
-CVE: CVE-2021-35940
-Signed-off-by: Armin Kuster <akuster@mvista.com>
-
-
-Index: time/unix/time.c
-===================================================================
---- a/time/unix/time.c	(revision 1891197)
-+++ b/time/unix/time.c	(revision 1891198)
-@@ -142,6 +142,9 @@
-     static const int dayoffset[12] =
-     {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
- 
-+    if (xt->tm_mon < 0 || xt->tm_mon >= 12)
-+        return APR_EBADDATE;
-+
-     /* shift new year to 1st March in order to make leap year calc easy */
- 
-     if (xt->tm_mon < 2)
-Index: time/win32/time.c
-===================================================================
---- a/time/win32/time.c	(revision 1891197)
-+++ b/time/win32/time.c	(revision 1891198)
-@@ -54,6 +54,9 @@
-     static const int dayoffset[12] =
-     {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
- 
-+    if (tm->wMonth < 1 || tm->wMonth > 12)
-+        return APR_EBADDATE;
-+
-     /* Note; the caller is responsible for filling in detailed tm_usec,
-      * tm_gmtoff and tm_isdst data when applicable.
-      */
-@@ -228,6 +231,9 @@
-     static const int dayoffset[12] =
-     {306, 337, 0, 31, 61, 92, 122, 153, 184, 214, 245, 275};
- 
-+    if (xt->tm_mon < 0 || xt->tm_mon >= 12)
-+        return APR_EBADDATE;
-+
-     /* shift new year to 1st March in order to make leap year calc easy */
- 
-     if (xt->tm_mon < 2)
diff --git a/meta/recipes-support/apr/apr/autoconf270.patch b/meta/recipes-support/apr/apr/autoconf270.patch
deleted file mode 100644
index 9f7b5c624c..0000000000
--- a/meta/recipes-support/apr/apr/autoconf270.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-With autoconf 2.70 confdefs.h is already included. Including it twice generates
-compiler warnings and since this macros is to error on warnings, it breaks.
-
-Fix by not including the file.
-
-Upstream-Status: Pending
-RP - 2021/1/28
-
-Index: apr-1.7.0/build/apr_common.m4
-===================================================================
---- apr-1.7.0.orig/build/apr_common.m4
-+++ apr-1.7.0/build/apr_common.m4
-@@ -505,8 +505,7 @@ AC_DEFUN([APR_TRY_COMPILE_NO_WARNING],
-  fi
-  AC_COMPILE_IFELSE(
-   [AC_LANG_SOURCE(
--   [#include "confdefs.h"
--   ]
-+   []
-    [[$1]]
-    [int main(int argc, const char *const *argv) {]
-    [[$2]]
diff --git a/meta/recipes-support/apr/apr/libtoolize_check.patch b/meta/recipes-support/apr/apr/libtoolize_check.patch
index 740792e6b0..80ce43caa4 100644
--- a/meta/recipes-support/apr/apr/libtoolize_check.patch
+++ b/meta/recipes-support/apr/apr/libtoolize_check.patch
@@ -1,6 +1,7 @@
+From 17835709bc55657b7af1f7c99b3f572b819cf97e Mon Sep 17 00:00:00 2001
 From: Helmut Grohne <helmut@subdivi.de>
-Subject: check for libtoolize rather than libtool
-Last-Update: 2014-09-19
+Date: Tue, 7 Feb 2023 07:04:00 +0000
+Subject: [PATCH] check for libtoolize rather than libtool
 
 libtool is now in package libtool-bin, but apr only needs libtoolize.
 
@@ -8,14 +9,22 @@ Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/a
 
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 
---- apr.orig/build/buildcheck.sh
-+++ apr/build/buildcheck.sh
-@@ -39,11 +39,11 @@ fi
+---
+ build/buildcheck.sh | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/build/buildcheck.sh b/build/buildcheck.sh
+index 44921b5..08bc8a8 100755
+--- a/build/buildcheck.sh
++++ b/build/buildcheck.sh
+@@ -39,13 +39,11 @@ fi
  # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
  # output is multiline from 1.5 onwards
  
 -# Require libtool 1.4 or newer
--libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
+-if test -z "$libtool"; then
+-  libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
+-fi
 -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
 +# Require libtoolize 1.4 or newer
 +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14`
diff --git a/meta/recipes-support/apr/apr_1.7.0.bb b/meta/recipes-support/apr/apr_1.7.2.bb
similarity index 91%
rename from meta/recipes-support/apr/apr_1.7.0.bb
rename to meta/recipes-support/apr/apr_1.7.2.bb
index cb4bb936d7..c9059c9921 100644
--- a/meta/recipes-support/apr/apr_1.7.0.bb
+++ b/meta/recipes-support/apr/apr_1.7.2.bb
@@ -16,21 +16,15 @@ BBCLASSEXTEND = "native nativesdk"
 SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
            file://run-ptest \
            file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \
-           file://0003-Makefile.in-configure.in-support-cross-compiling.patch \
            file://0004-Fix-packet-discards-HTTP-redirect.patch \
            file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \
-           file://0006-apr-fix-off_t-size-doesn-t-match-in-glibc-when-cross.patch \
            file://0007-explicitly-link-libapr-against-phtread-to-make-gold-.patch \
            file://libtoolize_check.patch \
            file://0001-Add-option-to-disable-timed-dependant-tests.patch \
-           file://autoconf270.patch \
-           file://0001-add-AC_CACHE_CHECK-for-strerror_r-return-type.patch \
            file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \
-           file://CVE-2021-35940.patch \
            "
 
-SRC_URI[md5sum] = "7a14a83d664e87599ea25ff4432e48a7"
-SRC_URI[sha256sum] = "e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea"
+SRC_URI[sha256sum] = "75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e"
 
 inherit autotools-brokensep lib_package binconfig multilib_header ptest multilib_script
 
-- 
2.30.2

[PATCH 09/52] apr-util: update 1.6.1 -> 1.6.3

[Alexander Kanavin]

Drop backport.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-Fix-error-handling-in-gdbm.patch     | 134 ------------------
 .../{apr-util_1.6.1.bb => apr-util_1.6.3.bb}  |   6 +-
 2 files changed, 2 insertions(+), 138 deletions(-)
 delete mode 100644 meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch
 rename meta/recipes-support/apr/{apr-util_1.6.1.bb => apr-util_1.6.3.bb} (94%)

diff --git a/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch b/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch
deleted file mode 100644
index 6f27876a7f..0000000000
--- a/meta/recipes-support/apr/apr-util/0001-Fix-error-handling-in-gdbm.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 6b638fa9afbeb54dfa19378e391465a5284ce1ad Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Wed, 12 Sep 2018 17:16:36 +0800
-Subject: [PATCH] Fix error handling in gdbm
-
-Only check for gdbm_errno if the return value of the called gdbm_*
-function says so. This fixes apr-util with gdbm 1.14, which does not
-seem to always reset gdbm_errno.
-
-Also make the gdbm driver return error codes starting with
-APR_OS_START_USEERR instead of always returning APR_EGENERAL. This is
-what the berkleydb driver already does.
-
-Also ensure that dsize is 0 if dptr == NULL.
-
-Upstream-Status: Backport [https://svn.apache.org/viewvc?view=revision&amp;revision=1825311]
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- dbm/apr_dbm_gdbm.c | 47 +++++++++++++++++++++++++++++------------------
- 1 file changed, 29 insertions(+), 18 deletions(-)
-
-diff --git a/dbm/apr_dbm_gdbm.c b/dbm/apr_dbm_gdbm.c
-index 749447a..1c86327 100644
---- a/dbm/apr_dbm_gdbm.c
-+++ b/dbm/apr_dbm_gdbm.c
-@@ -36,13 +36,25 @@
- static apr_status_t g2s(int gerr)
- {
-     if (gerr == -1) {
--        /* ### need to fix this */
--        return APR_EGENERAL;
-+        if (gdbm_errno == GDBM_NO_ERROR)
-+           return APR_SUCCESS;
-+        return APR_OS_START_USEERR + gdbm_errno;
-     }
- 
-     return APR_SUCCESS;
- }
- 
-+static apr_status_t gdat2s(datum d)
-+{
-+    if (d.dptr == NULL) {
-+        if (gdbm_errno == GDBM_NO_ERROR || gdbm_errno == GDBM_ITEM_NOT_FOUND)
-+           return APR_SUCCESS;
-+        return APR_OS_START_USEERR + gdbm_errno;
-+   }
-+
-+    return APR_SUCCESS;
-+}
-+
- static apr_status_t datum_cleanup(void *dptr)
- {
-     if (dptr)
-@@ -53,22 +65,15 @@ static apr_status_t datum_cleanup(void *dptr)
- 
- static apr_status_t set_error(apr_dbm_t *dbm, apr_status_t dbm_said)
- {
--    apr_status_t rv = APR_SUCCESS;
- 
--    /* ### ignore whatever the DBM said (dbm_said); ask it explicitly */
-+    dbm->errcode = dbm_said;  
- 
--    if ((dbm->errcode = gdbm_errno) == GDBM_NO_ERROR) {
-+    if (dbm_said == APR_SUCCESS)
-         dbm->errmsg = NULL;
--    }
--    else {
--        dbm->errmsg = gdbm_strerror(gdbm_errno);
--        rv = APR_EGENERAL;        /* ### need something better */
--    }
--
--    /* captured it. clear it now. */
--    gdbm_errno = GDBM_NO_ERROR;
-+    else
-+        dbm->errmsg = gdbm_strerror(dbm_said - APR_OS_START_USEERR);
- 
--    return rv;
-+    return dbm_said;
- }
- 
- /* --------------------------------------------------------------------------
-@@ -107,7 +112,7 @@ static apr_status_t vt_gdbm_open(apr_dbm_t **pdb, const char *pathname,
-                      NULL);
- 
-     if (file == NULL)
--        return APR_EGENERAL;      /* ### need a better error */
-+        return APR_OS_START_USEERR + gdbm_errno;   /* ### need a better error */
- 
-     /* we have an open database... return it */
-     *pdb = apr_pcalloc(pool, sizeof(**pdb));
-@@ -141,10 +146,12 @@ static apr_status_t vt_gdbm_fetch(apr_dbm_t *dbm, apr_datum_t key,
-     if (pvalue->dptr)
-         apr_pool_cleanup_register(dbm->pool, pvalue->dptr, datum_cleanup,
-                                   apr_pool_cleanup_null);
-+    else
-+       pvalue->dsize = 0;
- 
-     /* store the error info into DBM, and return a status code. Also, note
-        that *pvalue should have been cleared on error. */
--    return set_error(dbm, APR_SUCCESS);
-+    return set_error(dbm, gdat2s(rd));
- }
- 
- static apr_status_t vt_gdbm_store(apr_dbm_t *dbm, apr_datum_t key,
-@@ -201,9 +208,11 @@ static apr_status_t vt_gdbm_firstkey(apr_dbm_t *dbm, apr_datum_t *pkey)
-     if (pkey->dptr)
-         apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup,
-                                   apr_pool_cleanup_null);
-+    else
-+        pkey->dsize = 0;
- 
-     /* store any error info into DBM, and return a status code. */
--    return set_error(dbm, APR_SUCCESS);
-+    return set_error(dbm, gdat2s(rd));
- }
- 
- static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
-@@ -221,9 +230,11 @@ static apr_status_t vt_gdbm_nextkey(apr_dbm_t *dbm, apr_datum_t *pkey)
-     if (pkey->dptr)
-         apr_pool_cleanup_register(dbm->pool, pkey->dptr, datum_cleanup,
-                                   apr_pool_cleanup_null);
-+    else
-+       pkey->dsize = 0;
- 
-     /* store any error info into DBM, and return a status code. */
--    return set_error(dbm, APR_SUCCESS);
-+    return set_error(dbm, gdat2s(rd));
- }
- 
- static void vt_gdbm_freedatum(apr_dbm_t *dbm, apr_datum_t data)
--- 
-2.7.4
-
diff --git a/meta/recipes-support/apr/apr-util_1.6.1.bb b/meta/recipes-support/apr/apr-util_1.6.3.bb
similarity index 94%
rename from meta/recipes-support/apr/apr-util_1.6.1.bb
rename to meta/recipes-support/apr/apr-util_1.6.3.bb
index b851d46351..7c6fcc699b 100644
--- a/meta/recipes-support/apr/apr-util_1.6.1.bb
+++ b/meta/recipes-support/apr/apr-util_1.6.3.bb
@@ -13,11 +13,9 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.gz \
            file://configfix.patch \
            file://configure_fixes.patch \
            file://run-ptest \
-           file://0001-Fix-error-handling-in-gdbm.patch \
-"
+           "
 
-SRC_URI[md5sum] = "bd502b9a8670a8012c4d90c31a84955f"
-SRC_URI[sha256sum] = "b65e40713da57d004123b6319828be7f1273fbc6490e145874ee1177e112c459"
+SRC_URI[sha256sum] = "2b74d8932703826862ca305b094eef2983c27b39d5c9414442e9976a9acf1983"
 
 EXTRA_OECONF = "--with-apr=${STAGING_BINDIR_CROSS}/apr-1-config \
 		--without-odbc \
-- 
2.30.2

[PATCH 10/52] glib-2.0: upgrade 2.74.4 -> 2.74.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../glib-2.0/glib-2.0/fix-errno.patch         | 31 -------------------
 .../glib-2.0/glib-2.0/relocate-modules.patch  |  2 +-
 ...{glib-2.0_2.74.4.bb => glib-2.0_2.74.5.bb} |  3 +-
 3 files changed, 2 insertions(+), 34 deletions(-)
 delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch
 rename meta/recipes-core/glib-2.0/{glib-2.0_2.74.4.bb => glib-2.0_2.74.5.bb} (95%)

diff --git a/meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch b/meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch
deleted file mode 100644
index 144fe8bbd8..0000000000
--- a/meta/recipes-core/glib-2.0/glib-2.0/fix-errno.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6626765a79f125cf0ec9cdaefa51ceef718d41e7 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro@redhat.com>
-Date: Tue, 20 Dec 2022 17:10:41 -0600
-Subject: [PATCH] gthread-posix: need to #include <errno.h>
-
-a79c6af23eff5ee978db62e048828c9a992a1261 uses errno without the required
-header.
-
-
-(cherry picked from commit 03cb4261e00cf505790f4fd4e69f97b2ef4fcccd)
-
-Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/glib/-/commit/6626765a79f125cf0ec9cdaefa51ceef718d41e7]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- glib/gthreadprivate.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h
-index 6eaf422753..f34368a7c2 100644
---- a/glib/gthreadprivate.h
-+++ b/glib/gthreadprivate.h
-@@ -41,6 +41,7 @@ struct  _GRealThread
- /* system thread implementation (gthread-posix.c, gthread-win32.c) */
- 
- #if defined(HAVE_FUTEX) || defined(HAVE_FUTEX_TIME64)
-+#include <errno.h>
- #include <linux/futex.h>
- #include <sys/syscall.h>
- #include <unistd.h>
--- 
-GitLab
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
index 168dc73290..ae6881b61e 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
+++ b/meta/recipes-core/glib-2.0/glib-2.0/relocate-modules.patch
@@ -1,4 +1,4 @@
-From 2adfd458507c8c832955d6ffb9408d6c574b94f6 Mon Sep 17 00:00:00 2001
+From a3cdf17643bf33d532ec269913974195e136b7fc Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Fri, 11 Mar 2016 15:35:55 +0000
 Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.74.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.74.5.bb
similarity index 95%
rename from meta/recipes-core/glib-2.0/glib-2.0_2.74.4.bb
rename to meta/recipes-core/glib-2.0/glib-2.0_2.74.5.bb
index e5279e946c..d54f077cb0 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.74.4.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.74.5.bb
@@ -18,11 +18,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
            file://0001-gio-tests-meson.build-do-not-use-can_run_host_binari.patch \
            file://cpp-null.patch \
            file://cpp-null2.patch \
-           file://fix-errno.patch \
            "
 SRC_URI:append:class-native = " file://relocate-modules.patch"
 
-SRC_URI[sha256sum] = "0e82da5ea129b4444227c7e4a9e598f7288d1994bf63f129c44b90cfd2432172"
+SRC_URI[sha256sum] = "ceba83a5999ceb31a4c4fc9921207cb9ffffd2ab1d6ec03c162d3f608a5c14c8"
 
 # Find any meson cross files in FILESPATH that are relevant for the current
 # build (using siteinfo) and add them to EXTRA_OEMESON.
-- 
2.30.2

[PATCH 11/52] systemd: update 252.4 -> 252.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../systemd/{systemd-boot_252.4.bb => systemd-boot_252.5.bb}    | 0
 meta/recipes-core/systemd/systemd.inc                           | 2 +-
 .../recipes-core/systemd/{systemd_252.4.bb => systemd_252.5.bb} | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/systemd/{systemd-boot_252.4.bb => systemd-boot_252.5.bb} (100%)
 rename meta/recipes-core/systemd/{systemd_252.4.bb => systemd_252.5.bb} (100%)

diff --git a/meta/recipes-core/systemd/systemd-boot_252.4.bb b/meta/recipes-core/systemd/systemd-boot_252.5.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot_252.4.bb
rename to meta/recipes-core/systemd/systemd-boot_252.5.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 9d747ef64d..df27e01b1c 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,7 +14,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "4b48117716f84751dc6c8ee16c94de9858eaef4f"
+SRCREV = "61f5710d0bfd8f522af6f8eef399a851509946e2"
 SRCBRANCH = "v252-stable"
 SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
 "
diff --git a/meta/recipes-core/systemd/systemd_252.4.bb b/meta/recipes-core/systemd/systemd_252.5.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd_252.4.bb
rename to meta/recipes-core/systemd/systemd_252.5.bb
-- 
2.30.2

[PATCH 12/52] cmake: upgrade 3.25.1 -> 3.25.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../cmake/{cmake-native_3.25.1.bb => cmake-native_3.25.2.bb}    | 0
 meta/recipes-devtools/cmake/cmake.inc                           | 2 +-
 ...1-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch | 2 +-
 .../recipes-devtools/cmake/{cmake_3.25.1.bb => cmake_3.25.2.bb} | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/cmake/{cmake-native_3.25.1.bb => cmake-native_3.25.2.bb} (100%)
 rename meta/recipes-devtools/cmake/{cmake_3.25.1.bb => cmake_3.25.2.bb} (100%)

diff --git a/meta/recipes-devtools/cmake/cmake-native_3.25.1.bb b/meta/recipes-devtools/cmake/cmake-native_3.25.2.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake-native_3.25.1.bb
rename to meta/recipes-devtools/cmake/cmake-native_3.25.2.bb
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index 7da9a2fb55..b7e674c4c4 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -19,7 +19,7 @@ CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
 SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
 "
 
-SRC_URI[sha256sum] = "1c511d09516af493694ed9baf13c55947a36389674d657a2d5e0ccedc6b291d8"
+SRC_URI[sha256sum] = "c026f22cb931dd532f648f087d587f07a1843c6e66a3dfca4fb0ea21944ed33c"
 
 UPSTREAM_CHECK_REGEX = "cmake-(?P<pver>\d+(\.\d+)+)\.tar"
 
diff --git a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
index 451b6ebfad..d13c367e78 100644
--- a/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
+++ b/meta/recipes-devtools/cmake/cmake/0001-CMakeDetermineSystem-use-oe-environment-vars-to-load.patch
@@ -1,4 +1,4 @@
-From 8e53dd7f6f534ad933e7e9c7fc20cc1a6cded3f4 Mon Sep 17 00:00:00 2001
+From 5acfcb2aba1a5641d390558fdf288373f5e39cb5 Mon Sep 17 00:00:00 2001
 From: Cody P Schafer <dev@codyps.com>
 Date: Thu, 27 Apr 2017 11:35:05 -0400
 Subject: [PATCH] CMakeDetermineSystem: use oe environment vars to load default
diff --git a/meta/recipes-devtools/cmake/cmake_3.25.1.bb b/meta/recipes-devtools/cmake/cmake_3.25.2.bb
similarity index 100%
rename from meta/recipes-devtools/cmake/cmake_3.25.1.bb
rename to meta/recipes-devtools/cmake/cmake_3.25.2.bb
-- 
2.30.2

[PATCH 13/52] python3-setuptools: update 65.7.0 -> 67.2.0

[Alexander Kanavin]

Remove patch as file deleted upstream.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-change-shebang-to-python3.patch      | 25 -------------------
 ...ly-do-not-fetch-code-by-easy_install.patch |  2 +-
 ...65.7.0.bb => python3-setuptools_67.2.0.bb} |  4 +--
 3 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch
 rename meta/recipes-devtools/python/{python3-setuptools_65.7.0.bb => python3-setuptools_67.2.0.bb} (92%)

diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch b/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch
deleted file mode 100644
index 6dcf52771b..0000000000
--- a/meta/recipes-devtools/python/python3-setuptools/0001-change-shebang-to-python3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c39d0896930e25c224cc897660fc8511ccae30c8 Mon Sep 17 00:00:00 2001
-From: Changqing Li <changqing.li@windriver.com>
-Date: Thu, 23 Apr 2020 10:01:12 +0000
-Subject: [PATCH] change shebang to python3
-
-Upstream-Status: Pending
-
-Signed-off-by: Changqing Li <changqing.li@windriver.com>
----
- pkg_resources/_vendor/appdirs.py   | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/pkg_resources/_vendor/appdirs.py b/pkg_resources/_vendor/appdirs.py
-index ae67001..933e398 100644
---- a/pkg_resources/_vendor/appdirs.py
-+++ b/pkg_resources/_vendor/appdirs.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- # -*- coding: utf-8 -*-
- # Copyright (c) 2005-2010 ActiveState Software Inc.
- # Copyright (c) 2013 Eddy Petrișor
--- 
-2.24.1
-
diff --git a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch
index 2110c4a877..e22e757fcd 100644
--- a/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch
+++ b/meta/recipes-devtools/python/python3-setuptools/0001-conditionally-do-not-fetch-code-by-easy_install.patch
@@ -1,4 +1,4 @@
-From 2e57369593ede5336f947e7b9903ebc673f98fef Mon Sep 17 00:00:00 2001
+From 1a7fbd6b7ccf9d3f69bd591fa35fa48c0b8916ba Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <hongxu.jia@windriver.com>
 Date: Tue, 17 Jul 2018 10:13:38 +0800
 Subject: [PATCH] conditionally do not fetch code by easy_install
diff --git a/meta/recipes-devtools/python/python3-setuptools_65.7.0.bb b/meta/recipes-devtools/python/python3-setuptools_67.2.0.bb
similarity index 92%
rename from meta/recipes-devtools/python/python3-setuptools_65.7.0.bb
rename to meta/recipes-devtools/python/python3-setuptools_67.2.0.bb
index 789d212281..a412043a8b 100644
--- a/meta/recipes-devtools/python/python3-setuptools_65.7.0.bb
+++ b/meta/recipes-devtools/python/python3-setuptools_67.2.0.bb
@@ -8,10 +8,10 @@ inherit pypi python_setuptools_build_meta
 
 SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch"
 
-SRC_URI += "file://0001-change-shebang-to-python3.patch \
+SRC_URI += " \
             file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch"
 
-SRC_URI[sha256sum] = "4d3c92fac8f1118bb77a22181355e29c239cabfe2b9effdaa665c66b711136d7"
+SRC_URI[sha256sum] = "b440ee5f7e607bb8c9de15259dba2583dd41a38879a7abc1d43a71c59524da48"
 
 DEPENDS += "${PYTHON_PN}"
 
-- 
2.30.2

[PATCH 14/52] lighttpd: upgrade 1.4.67 -> 1.4.68

[Alexander Kanavin]

Rename options where appropriate. pcre option supports pcre2 now, so convert to that.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../lighttpd/lighttpd/fix-missing-test.patch  | 23 +++++++++++++++++++
 ...{lighttpd_1.4.67.bb => lighttpd_1.4.68.bb} | 23 ++++++++++---------
 2 files changed, 35 insertions(+), 11 deletions(-)
 create mode 100644 meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch
 rename meta/recipes-extended/lighttpd/{lighttpd_1.4.67.bb => lighttpd_1.4.68.bb} (75%)

diff --git a/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch b/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch
new file mode 100644
index 0000000000..6aa843b75d
--- /dev/null
+++ b/meta/recipes-extended/lighttpd/lighttpd/fix-missing-test.patch
@@ -0,0 +1,23 @@
+From d809433d6d900e899f796606b11bdc6a73413ac5 Mon Sep 17 00:00:00 2001
+From: Glenn Strauss <gstrauss@gluelogic.com>
+Date: Tue, 3 Jan 2023 17:50:16 -0500
+Subject: [PATCH] [meson] remove t/test_mod_evasive.c
+
+Upstream-Status: Backport [https://github.com/lighttpd/lighttpd1.4/commit/d809433d6d900e899f796606b11bdc6a73413ac5]
+Signed-off-by: Alexander Kanavin <alex@linutronix.de>
+---
+ src/meson.build | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index ff472c320..77089fc3c 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -721,7 +721,6 @@ test('test_mod', executable('test_mod',
+ 		't/test_mod.c',
+ 		't/test_mod_access.c',
+ 		't/test_mod_alias.c',
+-		't/test_mod_evasive.c',
+ 		't/test_mod_evhost.c',
+ 		't/test_mod_indexfile.c',
+ 		't/test_mod_simple_vhost.c',
diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.67.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.68.bb
similarity index 75%
rename from meta/recipes-extended/lighttpd/lighttpd_1.4.67.bb
rename to meta/recipes-extended/lighttpd/lighttpd_1.4.68.bb
index 838881f238..a9163f8492 100644
--- a/meta/recipes-extended/lighttpd/lighttpd_1.4.67.bb
+++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.68.bb
@@ -17,9 +17,10 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t
            file://index.html.lighttpd \
            file://lighttpd.conf \
            file://lighttpd \
+           file://fix-missing-test.patch \
            "
 
-SRC_URI[sha256sum] = "7e04d767f51a8d824b32e2483ef2950982920d427d1272ef4667f49d6f89f358"
+SRC_URI[sha256sum] = "e56f37ae52b63e1ada4d76ce78005affb6e56eea2f6bdb0ce17d6d36e9583384"
 
 DEPENDS = "virtual/crypt"
 
@@ -27,19 +28,19 @@ PACKAGECONFIG ??= "openssl pcre zlib \
     ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)} \
 "
 
-PACKAGECONFIG[libev] = "-Dwith_libev=true,-Dwith_libev=false,libev"
-PACKAGECONFIG[mysql] = "-Dwith_mysql=true,-Dwith_mysql=false,mariadb"
-PACKAGECONFIG[ldap] = "-Dwith_ldap=true,-Dwith_ldap=false,openldap"
+PACKAGECONFIG[libev] = "-Dwith_libev=enabled,-Dwith_libev=disabled,libev"
+PACKAGECONFIG[mysql] = "-Dwith_mysql=enabled,-Dwith_mysql=disabled,mariadb"
+PACKAGECONFIG[ldap] = "-Dwith_ldap=enabled,-Dwith_ldap=disabled,openldap"
 PACKAGECONFIG[attr] = "-Dwith_xattr=true,-Dwith_xattr=false,attr"
 PACKAGECONFIG[openssl] = "-Dwith_openssl=true,-Dwith_openssl=false,openssl"
-PACKAGECONFIG[krb5] = "-Dwith_krb5=true,-Dwith_krb5=false,krb5"
-PACKAGECONFIG[pcre] = "-Dwith_pcre=true,-Dwith_pcre=false,libpcre"
-PACKAGECONFIG[zlib] = "-Dwith_zlib=true,-Dwith_zlib=false,zlib"
-PACKAGECONFIG[bzip2] = "-Dwith_bzip=true,-Dwith_bzip=false,bzip2"
-PACKAGECONFIG[webdav-props] = "-Dwith_webdav_props=true,-Dwith_webdav_props=false,libxml2 sqlite3"
-PACKAGECONFIG[webdav-locks] = "-Dwith_webdav_locks=true,-Dwith_webdav_locks=false,util-linux"
+PACKAGECONFIG[krb5] = "-Dwith_krb5=enabled,-Dwith_krb5=disabled,krb5"
+PACKAGECONFIG[pcre] = "-Dwith_pcre=pcre2,-Dwith_pcre=disabled,libpcre2"
+PACKAGECONFIG[zlib] = "-Dwith_zlib=enabled,-Dwith_zlib=disabled,zlib"
+PACKAGECONFIG[bzip2] = "-Dwith_bzip=enabled,-Dwith_bzip=disabled,bzip2"
+PACKAGECONFIG[webdav-props] = "-Dwith_webdav_props=enabled,-Dwith_webdav_props=disabled,libxml2 sqlite3"
+PACKAGECONFIG[webdav-locks] = "-Dwith_webdav_locks=enabled,-Dwith_webdav_locks=disabled,util-linux"
 PACKAGECONFIG[lua] = "-Dwith_lua=true,-Dwith_lua=false,lua"
-PACKAGECONFIG[zstd] = "-Dwith_zstd=true,-Dwith_zstd=false,zstd"
+PACKAGECONFIG[zstd] = "-Dwith_zstd=enabled,-Dwith_zstd=disabled,zstd"
 
 inherit meson pkgconfig update-rc.d gettext systemd
 
-- 
2.30.2

[PATCH 15/52] lsof: upgrade 4.96.5 -> 4.98.0

[Alexander Kanavin]

License-update: switch to a dedicated license file; the license terms are the same.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../lsof/{lsof_4.96.5.bb => lsof_4.98.0.bb}                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-extended/lsof/{lsof_4.96.5.bb => lsof_4.98.0.bb} (87%)

diff --git a/meta/recipes-extended/lsof/lsof_4.96.5.bb b/meta/recipes-extended/lsof/lsof_4.98.0.bb
similarity index 87%
rename from meta/recipes-extended/lsof/lsof_4.96.5.bb
rename to meta/recipes-extended/lsof/lsof_4.98.0.bb
index 9f80176ee1..2f234cc5b4 100644
--- a/meta/recipes-extended/lsof/lsof_4.96.5.bb
+++ b/meta/recipes-extended/lsof/lsof_4.98.0.bb
@@ -4,11 +4,11 @@ Its name stands for LiSt Open Files, and it does just that."
 HOMEPAGE = "http://people.freebsd.org/~abe/"
 SECTION = "devel"
 LICENSE = "Spencer-94"
-LIC_FILES_CHKSUM = "file://00README;beginline=645;endline=679;md5=964df275d26429ba3b39dbb9f205172a"
+LIC_FILES_CHKSUM = "file://COPYING;md5=a48ac97a8550eff12395a2c0d6151510"
 
 SRC_URI = "git://github.com/lsof-org/lsof;branch=master;protocol=https \
            file://remove-host-information.patch"
-SRCREV = "898916d4c7c390ea4610aebaf1d32b8a3c49f26b"
+SRCREV = "546eb1c9910e7c137fdff551683c35a736021e05"
 
 S = "${WORKDIR}/git"
 
@@ -38,7 +38,7 @@ export I = "${STAGING_INCDIR}"
 export L = "${STAGING_INCDIR}"
 
 do_compile () {
-	oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS}'
+	oe_runmake 'CC=${CC}' 'CFGL=${LDFLAGS} -L./lib -llsof' 'DEBUG=' 'INCL=${CFLAGS} -I..'
 }
 
 do_install () {
-- 
2.30.2

[PATCH 16/52] igt-gpu-tools: upgrade 1.26 -> 1.27.1

[Alexander Kanavin]

/usr/bin/code_cov_parse_info is written in perl, so that's a new RDEPENDS.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...n.build-fix-meson-0.60-compatibility.patch | 24 -------------------
 .../igt-gpu-tools/igt-gpu-tools_git.bb        | 10 ++++----
 2 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch

diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch
deleted file mode 100644
index e7c782055b..0000000000
--- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b9a19aa4bdb21751c04c0e3ba8a9e2e35a10c953 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Mon, 25 Oct 2021 18:18:15 +0200
-Subject: [PATCH] lib/meson.build: fix meson 0.60 compatibility
-
-Upstream-Status: Backport [https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/963917a3565466832a3b2fc22e9285d34a0bf944]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- lib/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/meson.build b/lib/meson.build
-index 9929520e..1a525587 100644
---- a/lib/meson.build
-+++ b/lib/meson.build
-@@ -152,7 +152,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
- 
- lib_intermediates = []
- foreach f: lib_sources
--    name = f.underscorify(f)
-+    name = f.underscorify()
-     lib = static_library('igt-' + name,
- 	[ f, lib_version ],
- 	include_directories: inc,
diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb
index bb2f9564d2..fbe5e1a4e7 100644
--- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb
+++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb
@@ -9,17 +9,15 @@ LICENSE = "MIT"
 
 inherit meson pkgconfig
 
-SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2"
-PV = "1.26"
+SRCREV = "2b29e8ac07fbcfadc48b9d60e4d736a6e3b289ab"
+PV = "1.27.1"
 
-SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master \
-           file://0001-lib-meson.build-fix-meson-0.60-compatibility.patch \
-           "
+SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master"
 
 S = "${WORKDIR}/git"
 
 DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 procps libunwind kmod openssl elfutils alsa-lib json-c bison-native"
-RDEPENDS:${PN} += "bash"
+RDEPENDS:${PN} += "bash perl"
 RDEPENDS:${PN}-tests += "bash"
 
 PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests"
-- 
2.30.2

[PATCH 17/52] vulkan-headers: upgrade 1.3.236.0 -> 1.3.239.0

[Alexander Kanavin]

/usr/share/vulkan/registry/stripAPI.py is a python script,
so add that to RDEPENDS.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...vulkan-headers_1.3.236.0.bb => vulkan-headers_1.3.239.0.bb} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta/recipes-graphics/vulkan/{vulkan-headers_1.3.236.0.bb => vulkan-headers_1.3.239.0.bb} (90%)

diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.236.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.239.0.bb
similarity index 90%
rename from meta/recipes-graphics/vulkan/vulkan-headers_1.3.236.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-headers_1.3.239.0.bb
index 8716376fc0..a6b30fa831 100644
--- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.236.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.239.0.bb
@@ -11,12 +11,13 @@ LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
 SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https"
 
-SRCREV = "b75e5a02b6933caf86c5822d019067b335492c85"
+SRCREV = "2bb0a23104ceffd9a28d5b7401f2cee7dae35bb8"
 
 S = "${WORKDIR}/git"
 
 inherit cmake
 
 FILES:${PN} += "${datadir}/vulkan"
+RDEPENDS:${PN} += "python3-core"
 
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
-- 
2.30.2

[PATCH 18/52] vulkan-loader: upgrade 1.3.236.0 -> 1.3.239.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...{vulkan-loader_1.3.236.0.bb => vulkan-loader_1.3.239.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/vulkan/{vulkan-loader_1.3.236.0.bb => vulkan-loader_1.3.239.0.bb} (94%)

diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.236.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.bb
similarity index 94%
rename from meta/recipes-graphics/vulkan/vulkan-loader_1.3.236.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.bb
index 56f9d765f8..e11f936a0a 100644
--- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.236.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.239.0.bb
@@ -9,8 +9,8 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.236;protocol=https"
-SRCREV = "1ee83a25c2c20e2efbfc0ac976c7a3ddb5fc291c"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.239;protocol=https"
+SRCREV = "fa421a02686e7f01c8e4af24650fa04374df8338"
 
 S = "${WORKDIR}/git"
 
-- 
2.30.2

[PATCH 19/52] vulkan-tools: upgrade 1.3.236.0 -> 1.3.239.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...{vulkan-tools_1.3.236.0.bb => vulkan-tools_1.3.239.0.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-graphics/vulkan/{vulkan-tools_1.3.236.0.bb => vulkan-tools_1.3.239.0.bb} (90%)

diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.236.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.239.0.bb
similarity index 90%
rename from meta/recipes-graphics/vulkan/vulkan-tools_1.3.236.0.bb
rename to meta/recipes-graphics/vulkan/vulkan-tools_1.3.239.0.bb
index a3561bbb5c..934bd53ee1 100644
--- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.236.0.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.239.0.bb
@@ -6,12 +6,12 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=master;protocol=https"
-SRCREV = "ce45337c51ed53e6f1b337aa746a5a96c5018f86"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.239;protocol=https"
+SRCREV = "84c61c463aecdda385de33b0149c7368119c23f6"
 
 S = "${WORKDIR}/git"
 
-inherit cmake features_check
+inherit cmake features_check pkgconfig
 ANY_OF_DISTRO_FEATURES = "x11 wayland"
 REQUIRED_DISTRO_FEATURES = "vulkan"
 
-- 
2.30.2

[PATCH 20/52] spirv-tools: upgrade 1.3.236.0 -> 1.3.239.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{spirv-tools_1.3.236.0.bb => spirv-tools_1.3.239.0.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/spir/{spirv-tools_1.3.236.0.bb => spirv-tools_1.3.239.0.bb} (94%)

diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.239.0.bb
similarity index 94%
rename from meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.3.239.0.bb
index 1099925cf0..5109bb5333 100644
--- a/meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_1.3.239.0.bb
@@ -7,8 +7,8 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "40f5bf59c6acb4754a0bffd3c53a715732883a12"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=sdk-1.3.236;protocol=https"
+SRCREV = "63de608daeb7e91fbea6d7477a50debe7cac57ce"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https"
 PE = "1"
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
 S = "${WORKDIR}/git"
-- 
2.30.2

[PATCH 21/52] glslang: upgrade 1.3.236.0 -> 1.3.239.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../glslang/{glslang_1.3.236.0.bb => glslang_1.3.239.0.bb}   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/glslang/{glslang_1.3.236.0.bb => glslang_1.3.239.0.bb} (89%)

diff --git a/meta/recipes-graphics/glslang/glslang_1.3.236.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.239.0.bb
similarity index 89%
rename from meta/recipes-graphics/glslang/glslang_1.3.236.0.bb
rename to meta/recipes-graphics/glslang/glslang_1.3.239.0.bb
index 22838dfc8c..6bcde521e2 100644
--- a/meta/recipes-graphics/glslang/glslang_1.3.236.0.bb
+++ b/meta/recipes-graphics/glslang/glslang_1.3.239.0.bb
@@ -8,9 +8,10 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler"
 LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3"
 
-SRCREV = "77551c429f86c0e077f26552b7c1c0f12a9f235e"
+SRCREV = "ca8d07d0bc1c6390b83915700439fa7719de6a2a"
 SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \
-           file://0001-generate-glslang-pkg-config.patch"
+           file://0001-generate-glslang-pkg-config.patch \
+           "
 PE = "1"
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
 S = "${WORKDIR}/git"
-- 
2.30.2

[PATCH 22/52] spirv-headers: upgrade 1.3.236.0 -> 1.3.239.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...{spirv-headers_1.3.236.0.bb => spirv-headers_1.3.239.0.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/spir/{spirv-headers_1.3.236.0.bb => spirv-headers_1.3.239.0.bb} (88%)

diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.236.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.239.0.bb
similarity index 88%
rename from meta/recipes-graphics/spir/spirv-headers_1.3.236.0.bb
rename to meta/recipes-graphics/spir/spirv-headers_1.3.239.0.bb
index 5b4e15756e..afd59cbcb1 100644
--- a/meta/recipes-graphics/spir/spirv-headers_1.3.236.0.bb
+++ b/meta/recipes-graphics/spir/spirv-headers_1.3.239.0.bb
@@ -7,8 +7,8 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
 
-SRCREV = "1d31a100405cf8783ca7a31e31cdd727c9fc54c3"
-SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=sdk-1.3.236"
+SRCREV = "d13b52222c39a7e9a401b44646f0ca3a640fbd47"
+SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main"
 PE = "1"
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
 S = "${WORKDIR}/git"
-- 
2.30.2

[PATCH 23/52] libxpm: upgrade 3.5.14 -> 3.5.15

[Alexander Kanavin]

License-update: additional copyright holders

Disable reading compressed files as that requires compress/uncompress executables.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-lib/{libxpm_3.5.14.bb => libxpm_3.5.15.bb}          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxpm_3.5.14.bb => libxpm_3.5.15.bb} (73%)

diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.14.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.15.bb
similarity index 73%
rename from meta/recipes-graphics/xorg-lib/libxpm_3.5.14.bb
rename to meta/recipes-graphics/xorg-lib/libxpm_3.5.15.bb
index 2740341807..32a2b35356 100644
--- a/meta/recipes-graphics/xorg-lib/libxpm_3.5.14.bb
+++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.15.bb
@@ -11,16 +11,17 @@ an extension of the monochrome XBM bitmap specificied in the X \
 protocol."
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=51f4270b012ecd4ab1a164f5f4ed6cf7"
+LIC_FILES_CHKSUM = "file://COPYING;md5=903942ebc9d807dfb68540f40bae5aff"
 DEPENDS += "libxext libsm libxt gettext-native"
 PE = "1"
 
 XORG_PN = "libXpm"
+EXTRA_OECONF += "--disable-open-zfile"
 
 PACKAGES =+ "sxpm cxpm"
 FILES:cxpm = "${bindir}/cxpm"
 FILES:sxpm = "${bindir}/sxpm"
 
-SRC_URI[sha256sum] = "f7eb8f69c039281def8258ae6859adb5f050fbe161ab3d6a2d6ef109a603eac2"
+SRC_URI[sha256sum] = "60bb906c5c317a6db863e39b69c4a83fdbd2ae2154fcf47640f8fefc9fdfd1c1"
 
 BBCLASSEXTEND = "native"
-- 
2.30.2

[PATCH 24/52] rng-tools: upgrade 6.15 -> 6.16

[Alexander Kanavin]

Adjust dependencies to match what is optional and what is not.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../rng-tools/{rng-tools_6.15.bb => rng-tools_6.16.bb}     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-support/rng-tools/{rng-tools_6.15.bb => rng-tools_6.16.bb} (92%)

diff --git a/meta/recipes-support/rng-tools/rng-tools_6.15.bb b/meta/recipes-support/rng-tools/rng-tools_6.16.bb
similarity index 92%
rename from meta/recipes-support/rng-tools/rng-tools_6.15.bb
rename to meta/recipes-support/rng-tools/rng-tools_6.16.bb
index efc08b5e0a..02abe486bb 100644
--- a/meta/recipes-support/rng-tools/rng-tools_6.15.bb
+++ b/meta/recipes-support/rng-tools/rng-tools_6.16.bb
@@ -6,14 +6,14 @@ HOMEPAGE = "https://github.com/nhorman/rng-tools"
 BUGTRACKER = "https://github.com/nhorman/rng-tools/issues"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-DEPENDS = "sysfsutils openssl"
+DEPENDS = "sysfsutils openssl libcap"
 
 SRC_URI = "git://github.com/nhorman/rng-tools.git;branch=master;protocol=https \
            file://init \
            file://default \
            file://rng-tools.service \
            "
-SRCREV = "381f69828b782afda574f259c1b7549f48f9bb77"
+SRCREV = "e061c313b95890eb5fa0ada0cd6eec619dafdfe2"
 
 S = "${WORKDIR}/git"
 
@@ -27,7 +27,8 @@ PACKAGECONFIG:libc-musl = "libargp libjitterentropy"
 PACKAGECONFIG[libargp] = "--with-libargp,--without-libargp,argp-standalone,"
 PACKAGECONFIG[libjitterentropy] = "--enable-jitterentropy,--disable-jitterentropy,libjitterentropy"
 PACKAGECONFIG[libp11] = "--with-pkcs11,--without-pkcs11,libp11 openssl"
-PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2 openssl"
+PACKAGECONFIG[nistbeacon] = "--with-nistbeacon,--without-nistbeacon,curl libxml2"
+PACKAGECONFIG[qrypt] = "--with-qrypt,--without-qrypt,curl"
 
 INITSCRIPT_NAME = "rng-tools"
 INITSCRIPT_PARAMS = "start 03 2 3 4 5 . stop 30 0 6 1 ."
-- 
2.30.2

[PATCH 25/52] fontconfig: upgrade 2.14.1 -> 2.14.2

[Alexander Kanavin]

License-update: remove fccache.c as all licenses are collected in COPYING.

fcache.c used to contain a public domain notice of md5
implementation in the middle of itself, but that too has moved
to COPYING.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../fontconfig/{fontconfig_2.14.1.bb => fontconfig_2.14.2.bb}  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename meta/recipes-graphics/fontconfig/{fontconfig_2.14.1.bb => fontconfig_2.14.2.bb} (92%)

diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.14.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.14.2.bb
similarity index 92%
rename from meta/recipes-graphics/fontconfig/fontconfig_2.14.1.bb
rename to meta/recipes-graphics/fontconfig/fontconfig_2.14.2.bb
index ae5a45be54..a3d29ddbae 100644
--- a/meta/recipes-graphics/fontconfig/fontconfig_2.14.1.bb
+++ b/meta/recipes-graphics/fontconfig/fontconfig_2.14.2.bb
@@ -14,7 +14,6 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
 LICENSE = "MIT & MIT & PD"
 LIC_FILES_CHKSUM = "file://COPYING;md5=00252fd272bf2e722925613ad74cb6c7 \
                     file://src/fcfreetype.c;endline=45;md5=ce976b310a013a6ace6b60afa71851c1 \
-                    file://src/fccache.c;beginline=1671;endline=1686;md5=906c2f04b0c79a1bcc84ecfca4de5619 \
                     "
 
 SECTION = "libs"
@@ -25,7 +24,7 @@ SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \
            file://revert-static-pkgconfig.patch \
            "
 
-SRC_URI[sha256sum] = "ae480e9ca34382790312ff062c625ec70df94d6d9a9366e2b2b3d525f7f90387"
+SRC_URI[sha256sum] = "3ba2dd92158718acec5caaf1a716043b5aa055c27b081d914af3ccb40dce8a55"
 
 UPSTREAM_CHECK_REGEX = "fontconfig-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
 
-- 
2.30.2

[PATCH 26/52] btrfs-tools: upgrade 6.1.2 -> 6.1.3

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../btrfs-tools/{btrfs-tools_6.1.2.bb => btrfs-tools_6.1.3.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/btrfs-tools/{btrfs-tools_6.1.2.bb => btrfs-tools_6.1.3.bb} (98%)

diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.2.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb
similarity index 98%
rename from meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.2.bb
rename to meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb
index b10d7efdb5..b4dfc5b3f3 100644
--- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.2.bb
+++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_6.1.3.bb
@@ -19,7 +19,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git;b
            file://0001-Add-a-possibility-to-specify-where-python-modules-ar.patch \
            file://0001-Use-pread-pwrite-ftruncate-stat-instead-of-64bit-equ.patch \
            "
-SRCREV = "660d10d3fb2e87909d379b0ea3c52934543455c7"
+SRCREV = "908b4b4450320e30fdef693f09b42f4eb93702c3"
 S = "${WORKDIR}/git"
 
 PACKAGECONFIG ??= " \
-- 
2.30.2

[PATCH 27/52] ncurses: upgrade 6.3+20220423 -> 6.4

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../ncurses/files/exit_prototype.patch         | 18 ++++++++++++++----
 ...{ncurses_6.3+20220423.bb => ncurses_6.4.bb} |  4 ++--
 2 files changed, 16 insertions(+), 6 deletions(-)
 rename meta/recipes-core/ncurses/{ncurses_6.3+20220423.bb => ncurses_6.4.bb} (78%)

diff --git a/meta/recipes-core/ncurses/files/exit_prototype.patch b/meta/recipes-core/ncurses/files/exit_prototype.patch
index 791421a338..fd961512e0 100644
--- a/meta/recipes-core/ncurses/files/exit_prototype.patch
+++ b/meta/recipes-core/ncurses/files/exit_prototype.patch
@@ -1,18 +1,28 @@
-Add needed headers for including mbstate_t and exit()
+From 4a769a441d7e57a23017c3037cde3e53fb9f35fe Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Tue, 30 Aug 2022 15:58:32 -0700
+Subject: [PATCH] Add needed headers for including mbstate_t and exit()
 
 Upstream-Status: Inappropriate [Reconfigure will solve it]
 Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index f377f551..163f8899 100755
 --- a/configure
 +++ b/configure
-@@ -3422,6 +3422,7 @@ rm -f "conftest.$ac_objext" "conftest.$a
+@@ -3423,6 +3423,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
    cat >"conftest.$ac_ext" <<_ACEOF
- #line 3423 "configure"
+ #line 3424 "configure"
  #include "confdefs.h"
 +#include <stdlib.h>
  $ac_declaration
  int
  main (void)
-@@ -12997,6 +12998,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
+@@ -13111,6 +13112,7 @@ cat >"conftest.$ac_ext" <<_ACEOF
  #include <stdlib.h>
  #include <stdarg.h>
  #include <stdio.h>
diff --git a/meta/recipes-core/ncurses/ncurses_6.3+20220423.bb b/meta/recipes-core/ncurses/ncurses_6.4.bb
similarity index 78%
rename from meta/recipes-core/ncurses/ncurses_6.3+20220423.bb
rename to meta/recipes-core/ncurses/ncurses_6.4.bb
index fb8c11582b..1eb15673d1 100644
--- a/meta/recipes-core/ncurses/ncurses_6.3+20220423.bb
+++ b/meta/recipes-core/ncurses/ncurses_6.4.bb
@@ -6,10 +6,10 @@ SRC_URI += "file://0001-tic-hang.patch \
            file://exit_prototype.patch \
            "
 # commit id corresponds to the revision in package version
-SRCREV = "20db1fb41ec91cd8a1f528e770362092c5403378"
+SRCREV = "79b9071f2be20a24c7be031655a5638f6032f29f"
 S = "${WORKDIR}/git"
 EXTRA_OECONF += "--with-abi-version=5"
 UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)$"
 
 # This is needed when using patchlevel versions like 6.1+20181013
-CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}"
+#CVE_VERSION = "${@d.getVar("PV").split('+')[0]}.${@d.getVar("PV").split('+')[1]}"
-- 
2.30.2

[PATCH 28/52] mpg123: upgrade 1.31.1 -> 1.31.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../mpg123/{mpg123_1.31.1.bb => mpg123_1.31.2.bb}               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-multimedia/mpg123/{mpg123_1.31.1.bb => mpg123_1.31.2.bb} (96%)

diff --git a/meta/recipes-multimedia/mpg123/mpg123_1.31.1.bb b/meta/recipes-multimedia/mpg123/mpg123_1.31.2.bb
similarity index 96%
rename from meta/recipes-multimedia/mpg123/mpg123_1.31.1.bb
rename to meta/recipes-multimedia/mpg123/mpg123_1.31.2.bb
index a8a2377bd4..0a2d870cfa 100644
--- a/meta/recipes-multimedia/mpg123/mpg123_1.31.1.bb
+++ b/meta/recipes-multimedia/mpg123/mpg123_1.31.2.bb
@@ -10,7 +10,7 @@ LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=e7b9c15fcfb986abb4cc5e8400a24169"
 
 SRC_URI = "https://www.mpg123.de/download/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "5dcb0936efd44cb583498b6585845206f002a7b19d5066a2683be361954d955a"
+SRC_URI[sha256sum] = "b17f22905e31f43b6b401dfdf6a71ed11bb7d056f68db449d70b9f9ae839c7de"
 
 UPSTREAM_CHECK_REGEX = "mpg123-(?P<pver>\d+(\.\d+)+)\.tar"
 
-- 
2.30.2

[PATCH 29/52] python3-pycryptodomex: upgrade 3.16.0 -> 3.17

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...n3-pycryptodomex_3.16.0.bb => python3-pycryptodomex_3.17.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pycryptodomex_3.16.0.bb => python3-pycryptodomex_3.17.bb} (69%)

diff --git a/meta/recipes-devtools/python/python3-pycryptodomex_3.16.0.bb b/meta/recipes-devtools/python/python3-pycryptodomex_3.17.bb
similarity index 69%
rename from meta/recipes-devtools/python/python3-pycryptodomex_3.16.0.bb
rename to meta/recipes-devtools/python/python3-pycryptodomex_3.17.bb
index 36ef772863..720aec2d36 100644
--- a/meta/recipes-devtools/python/python3-pycryptodomex_3.16.0.bb
+++ b/meta/recipes-devtools/python/python3-pycryptodomex_3.17.bb
@@ -1,7 +1,7 @@
 require python-pycryptodome.inc
 inherit setuptools3
 
-SRC_URI[sha256sum] = "e9ba9d8ed638733c9e95664470b71d624a6def149e2db6cc52c1aca5a6a2df1d"
+SRC_URI[sha256sum] = "0af93aad8d62e810247beedef0261c148790c52f3cd33643791cc6396dd217c1"
 
 FILES:${PN}-tests = " \
     ${PYTHON_SITEPACKAGES_DIR}/Cryptodome/SelfTest/ \
-- 
2.30.2

[PATCH 30/52] bind: upgrade 9.18.10 -> 9.18.11

[Alexander Kanavin]

License-update: copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../0001-avoid-start-failure-with-bind-user.patch             | 0
 ...0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0
 ...bind-ensure-searching-for-json-headers-searches-sysr.patch | 0
 .../bind/{bind-9.18.10 => bind-9.18.11}/bind9                 | 0
 .../bind/{bind-9.18.10 => bind-9.18.11}/conf.patch            | 0
 .../bind/{bind-9.18.10 => bind-9.18.11}/generate-rndc-key.sh  | 0
 .../init.d-add-support-for-read-only-rootfs.patch             | 0
 .../make-etc-initd-bind-stop-work.patch                       | 0
 .../bind/{bind-9.18.10 => bind-9.18.11}/named.service         | 0
 .../bind/{bind_9.18.10.bb => bind_9.18.11.bb}                 | 4 ++--
 10 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/0001-avoid-start-failure-with-bind-user.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/bind9 (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/conf.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/generate-rndc-key.sh (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/init.d-add-support-for-read-only-rootfs.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/make-etc-initd-bind-stop-work.patch (100%)
 rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/named.service (100%)
 rename meta/recipes-connectivity/bind/{bind_9.18.10.bb => bind_9.18.11.bb} (96%)

diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.18.11/0001-avoid-start-failure-with-bind-user.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.10/0001-avoid-start-failure-with-bind-user.patch
rename to meta/recipes-connectivity/bind/bind-9.18.11/0001-avoid-start-failure-with-bind-user.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.18.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch
rename to meta/recipes-connectivity/bind/bind-9.18.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.18.11/bind-ensure-searching-for-json-headers-searches-sysr.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.10/bind-ensure-searching-for-json-headers-searches-sysr.patch
rename to meta/recipes-connectivity/bind/bind-9.18.11/bind-ensure-searching-for-json-headers-searches-sysr.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/bind9 b/meta/recipes-connectivity/bind/bind-9.18.11/bind9
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.10/bind9
rename to meta/recipes-connectivity/bind/bind-9.18.11/bind9
diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/conf.patch b/meta/recipes-connectivity/bind/bind-9.18.11/conf.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.10/conf.patch
rename to meta/recipes-connectivity/bind/bind-9.18.11/conf.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.18.11/generate-rndc-key.sh
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.10/generate-rndc-key.sh
rename to meta/recipes-connectivity/bind/bind-9.18.11/generate-rndc-key.sh
diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.18.11/init.d-add-support-for-read-only-rootfs.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.10/init.d-add-support-for-read-only-rootfs.patch
rename to meta/recipes-connectivity/bind/bind-9.18.11/init.d-add-support-for-read-only-rootfs.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.18.11/make-etc-initd-bind-stop-work.patch
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.10/make-etc-initd-bind-stop-work.patch
rename to meta/recipes-connectivity/bind/bind-9.18.11/make-etc-initd-bind-stop-work.patch
diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/named.service b/meta/recipes-connectivity/bind/bind-9.18.11/named.service
similarity index 100%
rename from meta/recipes-connectivity/bind/bind-9.18.10/named.service
rename to meta/recipes-connectivity/bind/bind-9.18.11/named.service
diff --git a/meta/recipes-connectivity/bind/bind_9.18.10.bb b/meta/recipes-connectivity/bind/bind_9.18.11.bb
similarity index 96%
rename from meta/recipes-connectivity/bind/bind_9.18.10.bb
rename to meta/recipes-connectivity/bind/bind_9.18.11.bb
index cb0e251d51..55a06eae5f 100644
--- a/meta/recipes-connectivity/bind/bind_9.18.10.bb
+++ b/meta/recipes-connectivity/bind/bind_9.18.11.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "BIND 9 provides a full-featured Domain Name Server system"
 SECTION = "console/network"
 
 LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9a4a897f202c0710e07f2f2836bc2b62"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d8cf7bd9c4fd5471a588e7e66e672408"
 
 DEPENDS = "openssl libcap zlib libuv"
 
@@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
            file://0001-avoid-start-failure-with-bind-user.patch \
            "
 
-SRC_URI[sha256sum] = "f415a92feb62568b50854a063cb231e257351f8672186d0ab031a49b3de2cac6"
+SRC_URI[sha256sum] = "8ff3352812230cbcbda42df87cad961f94163d3da457c5e4bef8057fd5df2158"
 
 UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
 # follow the ESV versions divisible by 2
-- 
2.30.2

[PATCH 31/52] libjpeg-turbo: upgrade 2.1.4 -> 2.1.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../jpeg/{libjpeg-turbo_2.1.4.bb => libjpeg-turbo_2.1.5.bb}     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/jpeg/{libjpeg-turbo_2.1.4.bb => libjpeg-turbo_2.1.5.bb} (97%)

diff --git a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb
similarity index 97%
rename from meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb
rename to meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb
index 1708fa97f0..4d21ca1e1d 100644
--- a/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.4.bb
+++ b/meta/recipes-graphics/jpeg/libjpeg-turbo_2.1.5.bb
@@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \
            file://0001-libjpeg-turbo-fix-package_qa-error.patch \
            "
 
-SRC_URI[sha256sum] = "d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b"
+SRC_URI[sha256sum] = "bc12bc9dce55300c6bf4342bc233bcc26bd38bf289eedf147360d731c668ddaf"
 UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/"
 UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/"
 
-- 
2.30.2

[PATCH 32/52] pkgconf: upgrade 1.9.3 -> 1.9.4

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../pkgconf/{pkgconf_1.9.3.bb => pkgconf_1.9.4.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/pkgconf/{pkgconf_1.9.3.bb => pkgconf_1.9.4.bb} (96%)

diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.9.3.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.9.4.bb
similarity index 96%
rename from meta/recipes-devtools/pkgconf/pkgconf_1.9.3.bb
rename to meta/recipes-devtools/pkgconf/pkgconf_1.9.4.bb
index 453da89c3d..ab0f371093 100644
--- a/meta/recipes-devtools/pkgconf/pkgconf_1.9.3.bb
+++ b/meta/recipes-devtools/pkgconf/pkgconf_1.9.4.bb
@@ -20,7 +20,7 @@ SRC_URI = "\
     file://pkg-config-native.in \
     file://pkg-config-esdk.in \
 "
-SRC_URI[sha256sum] = "5fb355b487d54fb6d341e4f18d4e2f7e813a6622cf03a9e87affa6a40565699d"
+SRC_URI[sha256sum] = "daccf1bbe5a30d149b556c7d2ffffeafd76d7b514e249271abdd501533c1d8ae"
 
 inherit autotools
 
-- 
2.30.2

[PATCH 33/52] python3-sphinx: upgrade 6.0.0 -> 6.1.3

[Alexander Kanavin]

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{python3-sphinx_6.0.0.bb => python3-sphinx_6.1.3.bb}      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/python/{python3-sphinx_6.0.0.bb => python3-sphinx_6.1.3.bb} (84%)

diff --git a/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
similarity index 84%
rename from meta/recipes-devtools/python/python3-sphinx_6.0.0.bb
rename to meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
index 5e565e745d..f75988a6a0 100644
--- a/meta/recipes-devtools/python/python3-sphinx_6.0.0.bb
+++ b/meta/recipes-devtools/python/python3-sphinx_6.1.3.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Python documentation generator"
 HOMEPAGE = "http://sphinx-doc.org/"
 SECTION = "devel/python"
 LICENSE = "BSD-2-Clause & MIT & BSD-3-Clause"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=2214a89317448c7f792f5b75dd6726e4"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=066da51ab732319a06beae4f10788577"
 
 PYPI_PACKAGE = "Sphinx"
 
-SRC_URI[sha256sum] = "58c140ecd9aa0abbc8ff6da48a266648eac9e5bfc8e49576efd2979bf46f5961"
+SRC_URI[sha256sum] = "0dac3b698538ffef41716cf97ba26c1c7788dba73ce6f150c1ff5b4720786dd2"
 
 inherit python_flit_core pypi
 
-- 
2.30.2

[PATCH 34/52] python3-pycryptodome: upgrade 3.16.0 -> 3.17

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/python/python3-pycryptodome_3.16.0.bb | 5 -----
 meta/recipes-devtools/python/python3-pycryptodome_3.17.bb   | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3-pycryptodome_3.16.0.bb
 create mode 100644 meta/recipes-devtools/python/python3-pycryptodome_3.17.bb

diff --git a/meta/recipes-devtools/python/python3-pycryptodome_3.16.0.bb b/meta/recipes-devtools/python/python3-pycryptodome_3.16.0.bb
deleted file mode 100644
index 15ee31c66a..0000000000
--- a/meta/recipes-devtools/python/python3-pycryptodome_3.16.0.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require python-pycryptodome.inc
-inherit setuptools3
-
-SRC_URI[sha256sum] = "0e45d2d852a66ecfb904f090c3f87dc0dfb89a499570abad8590f10d9cffb350"
-
diff --git a/meta/recipes-devtools/python/python3-pycryptodome_3.17.bb b/meta/recipes-devtools/python/python3-pycryptodome_3.17.bb
new file mode 100644
index 0000000000..05f654f225
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-pycryptodome_3.17.bb
@@ -0,0 +1,5 @@
+require python-pycryptodome.inc
+inherit setuptools3
+
+SRC_URI[sha256sum] = "bce2e2d8e82fcf972005652371a3e8731956a0c1fbb719cc897943b3695ad91b"
+
-- 
2.30.2

[PATCH 35/52] python3-dtschema: upgrade 2022.12 -> 2023.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{python3-dtschema_2022.12.bb => python3-dtschema_2023.1.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-dtschema_2022.12.bb => python3-dtschema_2023.1.bb} (83%)

diff --git a/meta/recipes-devtools/python/python3-dtschema_2022.12.bb b/meta/recipes-devtools/python/python3-dtschema_2023.1.bb
similarity index 83%
rename from meta/recipes-devtools/python/python3-dtschema_2022.12.bb
rename to meta/recipes-devtools/python/python3-dtschema_2023.1.bb
index 9d860111c1..9767c95d30 100644
--- a/meta/recipes-devtools/python/python3-dtschema_2022.12.bb
+++ b/meta/recipes-devtools/python/python3-dtschema_2023.1.bb
@@ -7,7 +7,7 @@ inherit pypi setuptools3
 
 PYPI_PACKAGE = "dtschema"
 
-SRC_URI[sha256sum] = "f532d433a915e507d4b426b7ef57a6730d23c0938b682fb4866f9dfa80a58ec6"
+SRC_URI[sha256sum] = "8fc8c269e4c57e9d008af7b32cd33b77afd4ea1ac9552bcfa96b41b9e0c52586"
 
 DEPENDS += "python3-setuptools-scm-native"
 RDEPENDS:${PN} += "python3-ruamel-yaml python3-jsonschema python3-rfc3987"
-- 
2.30.2

[PATCH 36/52] ell: upgrade 0.55 -> 0.56

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-core/ell/{ell_0.55.bb => ell_0.56.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-core/ell/{ell_0.55.bb => ell_0.56.bb} (89%)

diff --git a/meta/recipes-core/ell/ell_0.55.bb b/meta/recipes-core/ell/ell_0.56.bb
similarity index 89%
rename from meta/recipes-core/ell/ell_0.55.bb
rename to meta/recipes-core/ell/ell_0.56.bb
index 7184701e4e..0ace622835 100644
--- a/meta/recipes-core/ell/ell_0.55.bb
+++ b/meta/recipes-core/ell/ell_0.56.bb
@@ -15,7 +15,7 @@ DEPENDS = "dbus"
 inherit autotools pkgconfig
 
 SRC_URI = "https://mirrors.edge.kernel.org/pub/linux/libs/${BPN}/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "a7e1fd3e13d9083f80eb9787546add49fba5c3d9e9f166b06e2ff9fd8030dc6d"
+SRC_URI[sha256sum] = "58eb8b2b64087f7479d5db6a830a0656c536d93e5f11d4c9a4443ce8760a1b63"
 
 do_configure:prepend () {
     mkdir -p ${S}/build-aux
-- 
2.30.2

[PATCH 37/52] llvm: upgrade 15.0.6 -> 15.0.7

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/llvm/llvm_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/llvm/llvm_git.bb b/meta/recipes-devtools/llvm/llvm_git.bb
index 77fccbccc2..b4e983d2d0 100644
--- a/meta/recipes-devtools/llvm/llvm_git.bb
+++ b/meta/recipes-devtools/llvm/llvm_git.bb
@@ -19,14 +19,14 @@ inherit cmake pkgconfig
 
 PROVIDES += "llvm${PV}"
 
-PV = "15.0.6"
+PV = "15.0.7"
 
 MAJOR_VERSION = "${@oe.utils.trim_version("${PV}", 1)}"
 
 LLVM_RELEASE = "${PV}"
 
 BRANCH = "release/${MAJOR_VERSION}.x"
-SRCREV = "088f33605d8a61ff519c580a71b1dd57d16a03f8"
+SRCREV = "8dfdcc7b7bf66834a761bd8de445840ef68e4d1a"
 SRC_URI = "git://github.com/llvm/llvm-project.git;branch=${BRANCH};protocol=https \
            file://0007-llvm-allow-env-override-of-exe-path.patch;striplevel=2 \
            file://0001-AsmMatcherEmitter-sort-ClassInfo-lists-by-name-as-we.patch;striplevel=2 \
-- 
2.30.2

[PATCH 38/52] puzzles: upgrade to latest revision

[Alexander Kanavin]

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-sato/puzzles/puzzles_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-sato/puzzles/puzzles_git.bb b/meta/recipes-sato/puzzles/puzzles_git.bb
index c94fef4931..1774d0fb20 100644
--- a/meta/recipes-sato/puzzles/puzzles_git.bb
+++ b/meta/recipes-sato/puzzles/puzzles_git.bb
@@ -2,7 +2,7 @@ SUMMARY = "Simon Tatham's Portable Puzzle Collection"
 DESCRIPTION = "Collection of small computer programs which implement one-player puzzle games."
 HOMEPAGE = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/"
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=6e7d24cf1c949887ee9447a1e2a4a24c"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=92d2b7a2fc96b5f7f17101df7db1fefa"
 
 # gtk support includes a bunch of x11 headers
 REQUIRED_DISTRO_FEATURES = "x11"
@@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
 SRC_URI = "git://git.tartarus.org/simon/puzzles.git;branch=main"
 
 UPSTREAM_CHECK_COMMITS = "1"
-SRCREV = "14c025d192579961d1ade51f2a322bd765aef0e5"
+SRCREV = "37df1f2bbc689d224369d963dd8007d68fcd7c6a"
 PE = "2"
 PV = "0.0+git${SRCPV}"
 
-- 
2.30.2

[PATCH 39/52] msmtp: upgrade 1.8.22 -> 1.8.23

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../recipes-extended/msmtp/{msmtp_1.8.22.bb => msmtp_1.8.23.bb} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/msmtp/{msmtp_1.8.22.bb => msmtp_1.8.23.bb} (91%)

diff --git a/meta/recipes-extended/msmtp/msmtp_1.8.22.bb b/meta/recipes-extended/msmtp/msmtp_1.8.23.bb
similarity index 91%
rename from meta/recipes-extended/msmtp/msmtp_1.8.22.bb
rename to meta/recipes-extended/msmtp/msmtp_1.8.23.bb
index d56af7346b..5e68a7ea92 100644
--- a/meta/recipes-extended/msmtp/msmtp_1.8.22.bb
+++ b/meta/recipes-extended/msmtp/msmtp_1.8.23.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 UPSTREAM_CHECK_URI = "https://marlam.de/msmtp/download/"
 
 SRC_URI = "https://marlam.de/${BPN}/releases/${BP}.tar.xz"
-SRC_URI[sha256sum] = "1b04206286a5b82622335e4eb09e17074368b7288e53d134543cbbc6b79ea3e7"
+SRC_URI[sha256sum] = "cf04c16b099b3d414db4b5b93fc5ed9d46aad564c81a352aa107a33964c356b8"
 
 inherit gettext autotools update-alternatives pkgconfig
 
-- 
2.30.2

[PATCH 40/52] dpkg: upgrade 1.21.18 -> 1.21.19

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch | 2 +-
 meta/recipes-devtools/dpkg/{dpkg_1.21.18.bb => dpkg_1.21.19.bb} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/dpkg/{dpkg_1.21.18.bb => dpkg_1.21.19.bb} (95%)

diff --git a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
index 1b5b89644f..160adbbe6e 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0001-build.c-ignore-return-of-1-from-tar-cf.patch
@@ -1,4 +1,4 @@
-From 54ca20a18253bcf0915b2e2985bbee79bf881ebe Mon Sep 17 00:00:00 2001
+From b68fcf0e23b91dca7fecfeeceb1c4267e29e6f9d Mon Sep 17 00:00:00 2001
 From: Paul Eggleton <paul.eggleton@linux.microsoft.com>
 Date: Tue, 16 Jun 2020 03:57:25 +0000
 Subject: [PATCH] build.c: ignore return of 1 from tar -cf
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.21.18.bb b/meta/recipes-devtools/dpkg/dpkg_1.21.19.bb
similarity index 95%
rename from meta/recipes-devtools/dpkg/dpkg_1.21.18.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.21.19.bb
index 3bb84a433a..8d0eb40bd6 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.21.18.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.21.19.bb
@@ -18,6 +18,6 @@ SRC_URI = "git://salsa.debian.org/dpkg-team/dpkg.git;protocol=https;branch=main
 
 SRC_URI:append:class-native = " file://0001-build.c-ignore-return-of-1-from-tar-cf.patch"
 
-SRCREV = "ebc2c3def335ac391b010323ab65a302648f3ec7"
+SRCREV = "2f3105279e0fb2255f39b2e9a11f15837cacd44b"
 
 S = "${WORKDIR}/git"
-- 
2.30.2

[PATCH 41/52] shaderc: upgrade 2022.4 -> 2023.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../shaderc/{shaderc_2022.4.bb => shaderc_2023.2.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-graphics/shaderc/{shaderc_2022.4.bb => shaderc_2023.2.bb} (95%)

diff --git a/meta/recipes-graphics/shaderc/shaderc_2022.4.bb b/meta/recipes-graphics/shaderc/shaderc_2023.2.bb
similarity index 95%
rename from meta/recipes-graphics/shaderc/shaderc_2022.4.bb
rename to meta/recipes-graphics/shaderc/shaderc_2023.2.bb
index 0fe6887cbc..07fae0bb7e 100644
--- a/meta/recipes-graphics/shaderc/shaderc_2022.4.bb
+++ b/meta/recipes-graphics/shaderc/shaderc_2023.2.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
 
-SRCREV = "067e008c80c323b1cd1ab1e547b38f9a5f52269e"
+SRCREV = "55f4bbd993de3a3cad34cb41cd07b82fa1c77dd6"
 SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \
            file://0001-cmake-disable-building-external-dependencies.patch \
            file://0002-libshaderc_util-fix-glslang-header-file-location.patch \
-- 
2.30.2

[PATCH 42/52] sysstat: upgrade 12.6.1 -> 12.6.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../sysstat/{sysstat_12.6.1.bb => sysstat_12.6.2.bb}            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/sysstat/{sysstat_12.6.1.bb => sysstat_12.6.2.bb} (65%)

diff --git a/meta/recipes-extended/sysstat/sysstat_12.6.1.bb b/meta/recipes-extended/sysstat/sysstat_12.6.2.bb
similarity index 65%
rename from meta/recipes-extended/sysstat/sysstat_12.6.1.bb
rename to meta/recipes-extended/sysstat/sysstat_12.6.2.bb
index 6df7bdbb83..f9e5778e76 100644
--- a/meta/recipes-extended/sysstat/sysstat_12.6.1.bb
+++ b/meta/recipes-extended/sysstat/sysstat_12.6.2.bb
@@ -4,4 +4,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a23a74b3f4caf9616230789d94217acb"
 
 SRC_URI += "file://0001-configure.in-remove-check-for-chkconfig.patch"
 
-SRC_URI[sha256sum] = "18ff5a4e149e2568e43385637f72437fe6bafcc1322a93d13d1981e9464a0342"
+SRC_URI[sha256sum] = "3e77134aedaa6fc57d9745da67edfd8990e19adee71ac47196229261c563fb48"
-- 
2.30.2

[PATCH 43/52] piglit: upgrade to latest revision

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-graphics/piglit/piglit_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb
index 7858fa0b08..b12dd46ea0 100644
--- a/meta/recipes-graphics/piglit/piglit_git.bb
+++ b/meta/recipes-graphics/piglit/piglit_git.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https;branch=ma
            "
 UPSTREAM_CHECK_COMMITS = "1"
 
-SRCREV = "e300648a805d62101de341232d99bfec1cce78c5"
+SRCREV = "acc0e009d0f7e843148205d03fda53ad5f1b7c8c"
 # (when PV goes above 1.0 remove the trailing r)
 PV = "1.0+gitr${SRCPV}"
 
-- 
2.30.2

[PATCH 44/52] ltp: upgrade 20220930 -> 20230127

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...0001-testcases-Fix-largefile-support.patch | 426 ------------------
 .../ltp/{ltp_20220930.bb => ltp_20230127.bb}  |   3 +-
 2 files changed, 1 insertion(+), 428 deletions(-)
 delete mode 100644 meta/recipes-extended/ltp/ltp/0001-testcases-Fix-largefile-support.patch
 rename meta/recipes-extended/ltp/{ltp_20220930.bb => ltp_20230127.bb} (98%)

diff --git a/meta/recipes-extended/ltp/ltp/0001-testcases-Fix-largefile-support.patch b/meta/recipes-extended/ltp/ltp/0001-testcases-Fix-largefile-support.patch
deleted file mode 100644
index e9b48c392f..0000000000
--- a/meta/recipes-extended/ltp/ltp/0001-testcases-Fix-largefile-support.patch
+++ /dev/null
@@ -1,426 +0,0 @@
-From 3cca69b85c88c6eb4f02313b3c6a9e0f6cc0b5d7 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Wed, 14 Dec 2022 18:14:22 -0800
-Subject: [PATCH] testcases: Fix largefile support
-
-Use standard functions ( not 64-bit equivalents ) which operate on off_t
-and pass -D_FILE_OFFSET_BITS=64 to enable LFS always so off_t is 64bit
-for these tests.
-
-This helps making it portable across musl which has removed the 64bit
-transition functions from _GNU_SOURCE namespace.
-
-Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2022-December/032310.html]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- testcases/kernel/io/direct_io/Makefile             |  2 +-
- testcases/kernel/io/direct_io/diotest2.c           |  4 ++--
- testcases/kernel/io/direct_io/diotest5.c           | 10 +++++-----
- testcases/kernel/io/direct_io/diotest6.c           |  4 ++--
- testcases/kernel/syscalls/fcntl/fcntl18.c          |  6 +++---
- testcases/kernel/syscalls/fcntl/fcntl34.c          |  2 +-
- testcases/kernel/syscalls/fcntl/fcntl36.c          |  4 ++--
- testcases/kernel/syscalls/llseek/Makefile          |  2 ++
- testcases/kernel/syscalls/llseek/llseek01.c        | 14 +++++++-------
- testcases/kernel/syscalls/llseek/llseek02.c        | 12 ++++++------
- testcases/kernel/syscalls/llseek/llseek03.c        |  6 +++---
- testcases/kernel/syscalls/open/Makefile            |  2 ++
- testcases/kernel/syscalls/open/open12.c            |  6 +++---
- testcases/kernel/syscalls/openat/Makefile          |  2 ++
- testcases/kernel/syscalls/openat/openat02.c        |  6 +++---
- testcases/kernel/syscalls/sync_file_range/Makefile |  2 ++
- .../syscalls/sync_file_range/sync_file_range01.c   |  4 ++--
- .../syscalls/sync_file_range/sync_file_range02.c   |  6 +++---
- 18 files changed, 51 insertions(+), 43 deletions(-)
-
-diff --git a/testcases/kernel/io/direct_io/Makefile b/testcases/kernel/io/direct_io/Makefile
-index 777f7b166..7480d7b0d 100644
---- a/testcases/kernel/io/direct_io/Makefile
-+++ b/testcases/kernel/io/direct_io/Makefile
-@@ -5,7 +5,7 @@ top_srcdir			?= ../../../..
- 
- include $(top_srcdir)/include/mk/testcases.mk
- 
--CFLAGS				+= -DSHARED_OFILE -D_GNU_SOURCE
-+CFLAGS				+= -DSHARED_OFILE -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
- 
- LDLIBS				+= -lpthread
- 
-diff --git a/testcases/kernel/io/direct_io/diotest2.c b/testcases/kernel/io/direct_io/diotest2.c
-index c407c46ae..db47ee8ef 100644
---- a/testcases/kernel/io/direct_io/diotest2.c
-+++ b/testcases/kernel/io/direct_io/diotest2.c
-@@ -78,7 +78,7 @@ int bufsize = BUFSIZE;
-  *	For each iteration, write data starting at offse+iter*bufsize
-  *	location in the file and read from there.
- */
--int runtest(int fd_r, int fd_w, int iter, off64_t offset, int action)
-+int runtest(int fd_r, int fd_w, int iter, off_t offset, int action)
- {
- 	char *buf1;
- 	char *buf2;
-@@ -136,7 +136,7 @@ static void cleanup(void);
- int main(int argc, char *argv[])
- {
- 	int iter = 100;		/* Iterations. Default 100 */
--	off64_t offset = 0;	/* Offset. Default 0 */
-+	off_t offset = 0;	/* Offset. Default 0 */
- 	int i, action, fd_r, fd_w;
- 	int fail_count = 0, total = 0, failed = 0;
- 
-diff --git a/testcases/kernel/io/direct_io/diotest5.c b/testcases/kernel/io/direct_io/diotest5.c
-index 9bf917c64..ac66f2a04 100644
---- a/testcases/kernel/io/direct_io/diotest5.c
-+++ b/testcases/kernel/io/direct_io/diotest5.c
-@@ -75,14 +75,14 @@ int TST_TOTAL = 3;		/* Total number of test conditions */
- static int bufsize = BUFSIZE;	/* Buffer size. Default 4k */
- static int iter = 20;		/* Iterations. Default 20 */
- static int nvector = 20;	/* Vector array. Default 20 */
--static off64_t offset = 0;	/* Start offset. Default 0 */
-+static off_t offset = 0;	/* Start offset. Default 0 */
- static char filename[LEN];	/* Test data file */
- static int fd1 = -1;
- /*
-  * runtest: Write the data in vector array to the file. Read the data
-  *	from the file into another vectory array and verify. Repeat the test.
- */
--int runtest(int fd_r, int fd_w, int iter, off64_t offset, int action)
-+int runtest(int fd_r, int fd_w, int iter, off_t offset, int action)
- {
- 	int i;
- 	struct iovec *iov1, *iov2, *iovp;
-@@ -218,7 +218,7 @@ int main(int argc, char *argv[])
- 		tst_brkm(TBROK, cleanup, "fd_w open failed for %s: %s",
- 			 filename, strerror(errno));
- 	}
--	if ((fd_r = open64(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) {
-+	if ((fd_r = open(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) {
- 		tst_brkm(TBROK, cleanup, "fd_r open failed for %s: %s",
- 			 filename, strerror(errno));
- 	}
-@@ -240,7 +240,7 @@ int main(int argc, char *argv[])
- 		tst_brkm(TBROK, cleanup, "fd_w open failed for %s: %s",
- 			 filename, strerror(errno));
- 	}
--	if ((fd_r = open64(filename, O_RDONLY | O_CREAT, 0666)) < 0) {
-+	if ((fd_r = open(filename, O_RDONLY | O_CREAT, 0666)) < 0) {
- 		tst_brkm(TBROK, cleanup, "fd_r open failed for %s: %s",
- 			 filename, strerror(errno));
- 	}
-@@ -261,7 +261,7 @@ int main(int argc, char *argv[])
- 		tst_brkm(TBROK, cleanup, "fd_w open failed for %s: %s",
- 			 filename, strerror(errno));
- 	}
--	if ((fd_r = open64(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) {
-+	if ((fd_r = open(filename, O_DIRECT | O_RDONLY | O_CREAT, 0666)) < 0) {
- 		tst_brkm(TBROK, cleanup, "fd_r open failed for %s: %s",
- 			 filename, strerror(errno));
- 	}
-diff --git a/testcases/kernel/io/direct_io/diotest6.c b/testcases/kernel/io/direct_io/diotest6.c
-index a06e6b82b..1905380f0 100644
---- a/testcases/kernel/io/direct_io/diotest6.c
-+++ b/testcases/kernel/io/direct_io/diotest6.c
-@@ -62,7 +62,7 @@ int TST_TOTAL = 3;
- 
- static int iter = 100;
- static int bufsize = BUFSIZE;
--static off64_t offset = 0;
-+static off_t offset = 0;
- static int nvector = 20;
- static char filename[LEN];
- static int fd1 = -1;
-@@ -84,7 +84,7 @@ static void prg_usage(void)
- */
- int runtest(int fd_r, int fd_w, int childnum, int action)
- {
--	off64_t seekoff;
-+	off_t seekoff;
- 	int i, ret = -1;
- 	ssize_t n = 0;
- 	struct iovec *iov_r, *iov_w;
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl18.c b/testcases/kernel/syscalls/fcntl/fcntl18.c
-index 5eefbd128..1105dd393 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl18.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl18.c
-@@ -103,11 +103,11 @@ int main(int ac, char **av)
- 	tst_resm(TINFO, "Enter block 2");
- 	fail = 0;
- 	/* Error condition if address is bad */
--	retval = fcntl(fd, F_GETLK64, (struct flock *)INVAL_FLAG);
-+	retval = fcntl(fd, F_GETLK, (struct flock *)INVAL_FLAG);
- 	if (errno == EFAULT) {
--		tst_resm(TPASS, "Test F_GETLK64: for errno EFAULT PASSED");
-+		tst_resm(TPASS, "Test F_GETLK: for errno EFAULT PASSED");
- 	} else {
--		tst_resm(TFAIL, "Test F_GETLK64: for errno EFAULT FAILED");
-+		tst_resm(TFAIL, "Test F_GETLK: for errno EFAULT FAILED");
- 		fail = 1;
- 	}
- 	if (fail) {
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl34.c b/testcases/kernel/syscalls/fcntl/fcntl34.c
-index 3442114ff..536dead29 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl34.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl34.c
-@@ -54,7 +54,7 @@ void *thread_fn_01(void *arg)
- 
- 	memset(buf, (intptr_t)arg, write_size);
- 
--	struct flock64 lck = {
-+	struct flock lck = {
- 		.l_whence = SEEK_SET,
- 		.l_start  = 0,
- 		.l_len    = 1,
-diff --git a/testcases/kernel/syscalls/fcntl/fcntl36.c b/testcases/kernel/syscalls/fcntl/fcntl36.c
-index d6b07fc41..4e4d48afc 100644
---- a/testcases/kernel/syscalls/fcntl/fcntl36.c
-+++ b/testcases/kernel/syscalls/fcntl/fcntl36.c
-@@ -72,7 +72,7 @@ static void *fn_ofd_w(void *arg)
- 	int fd = SAFE_OPEN(fname, O_RDWR);
- 	long wt = pa->cnt;
- 
--	struct flock64 lck = {
-+	struct flock lck = {
- 		.l_whence = SEEK_SET,
- 		.l_start  = pa->offset,
- 		.l_len    = pa->length,
-@@ -151,7 +151,7 @@ static void *fn_ofd_r(void *arg)
- 	int i;
- 	int fd = SAFE_OPEN(fname, O_RDWR);
- 
--	struct flock64 lck = {
-+	struct flock lck = {
- 		.l_whence = SEEK_SET,
- 		.l_start  = pa->offset,
- 		.l_len    = pa->length,
-diff --git a/testcases/kernel/syscalls/llseek/Makefile b/testcases/kernel/syscalls/llseek/Makefile
-index 044619fb8..8a916d0fa 100644
---- a/testcases/kernel/syscalls/llseek/Makefile
-+++ b/testcases/kernel/syscalls/llseek/Makefile
-@@ -6,3 +6,5 @@ top_srcdir		?= ../../../..
- include $(top_srcdir)/include/mk/testcases.mk
- 
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-+
-+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-diff --git a/testcases/kernel/syscalls/llseek/llseek01.c b/testcases/kernel/syscalls/llseek/llseek01.c
-index 50f35493d..efb444dc8 100644
---- a/testcases/kernel/syscalls/llseek/llseek01.c
-+++ b/testcases/kernel/syscalls/llseek/llseek01.c
-@@ -4,7 +4,7 @@
-  *   07/2001 Ported by Wayne Boyer
-  */
- /*
-- * Verify that lseek64() call succeeds to set the file pointer position to an
-+ * Verify that lseek() call succeeds to set the file pointer position to an
-  * offset larger than file size limit (RLIMIT_FSIZE). Also, verify that any
-  * attempt to write to this location fails.
-  */
-@@ -27,22 +27,22 @@ static int fildes;
- 
- static void verify_llseek(void)
- {
--	TEST(lseek64(fildes, (loff_t) (80 * BUFSIZ), SEEK_SET));
-+	TEST(lseek(fildes, (loff_t) (80 * BUFSIZ), SEEK_SET));
- 	if (TST_RET == (80 * BUFSIZ))
--		tst_res(TPASS, "lseek64() can set file pointer position larger than file size limit");
-+		tst_res(TPASS, "lseek() can set file pointer position larger than file size limit");
- 	else
--		tst_res(TFAIL, "lseek64() returned wrong value %ld when write past file size", TST_RET);
-+		tst_res(TFAIL, "lseek() returned wrong value %ld when write past file size", TST_RET);
- 
- 	if (write(fildes, write_buff, BUFSIZ) == -1)
- 		tst_res(TPASS,"write failed after file size limit");
- 	else
- 		tst_brk(TFAIL, "write successful after file size limit");
- 
--	TEST(lseek64(fildes, (loff_t) BUFSIZ, SEEK_SET));
-+	TEST(lseek(fildes, (loff_t) BUFSIZ, SEEK_SET));
- 	if (TST_RET == BUFSIZ)
--		tst_res(TPASS,"lseek64() can set file pointer position under filer size limit");
-+		tst_res(TPASS,"lseek() can set file pointer position under filer size limit");
- 	else
--		tst_brk(TFAIL,"lseek64() returns wrong value %ld when write under file size", TST_RET);
-+		tst_brk(TFAIL,"lseek() returns wrong value %ld when write under file size", TST_RET);
- 
- 	if (write(fildes, write_buff, BUFSIZ) != -1)
- 		tst_res(TPASS, "write succcessfully under file size limit");
-diff --git a/testcases/kernel/syscalls/llseek/llseek02.c b/testcases/kernel/syscalls/llseek/llseek02.c
-index 3d9c21fc9..5431969f9 100644
---- a/testcases/kernel/syscalls/llseek/llseek02.c
-+++ b/testcases/kernel/syscalls/llseek/llseek02.c
-@@ -5,8 +5,8 @@
-  */
- /*
-  * Description:
-- * 1) lseek64(2) fails and sets errno to EINVAL when whence is invalid.
-- * 2) lseek64(2) fails ans sets errno to EBADF when fd is not an open
-+ * 1) lseek(2) fails and sets errno to EINVAL when whence is invalid.
-+ * 2) lseek(2) fails ans sets errno to EBADF when fd is not an open
-  * file descriptor.
-  */
- 
-@@ -39,17 +39,17 @@ static void verify_llseek(unsigned int n)
- {
- 	struct tcase *tc = &tcases[n];
- 
--	TEST(lseek64(*tc->fd, (loff_t) 1, tc->whence));
-+	TEST(lseek(*tc->fd, (loff_t) 1, tc->whence));
- 	if (TST_RET != (off_t) -1) {
--		tst_res(TFAIL, "lseek64(%d, 1, %d) succeeded unexpectedly (%ld)",
-+		tst_res(TFAIL, "lseek(%d, 1, %d) succeeded unexpectedly (%ld)",
- 			*tc->fd, tc->whence, TST_RET);
- 		return;
- 	}
- 	if (TST_ERR == tc->exp_err) {
--		tst_res(TPASS | TTERRNO, "lseek64(%d, 1, %d) failed as expected",
-+		tst_res(TPASS | TTERRNO, "lseek(%d, 1, %d) failed as expected",
- 			*tc->fd, tc->whence);
- 	} else {
--		tst_res(TFAIL | TTERRNO, "lseek64(%d, 1, %d) failed "
-+		tst_res(TFAIL | TTERRNO, "lseek(%d, 1, %d) failed "
- 		        "unexpectedly, expected %s", *tc->fd, tc->whence,
- 		        tst_strerrno(tc->exp_err));
- 	}
-diff --git a/testcases/kernel/syscalls/llseek/llseek03.c b/testcases/kernel/syscalls/llseek/llseek03.c
-index d780f2af6..6c34119e5 100644
---- a/testcases/kernel/syscalls/llseek/llseek03.c
-+++ b/testcases/kernel/syscalls/llseek/llseek03.c
-@@ -72,7 +72,7 @@ static const char *str_whence(int whence)
- 	}
- }
- 
--static void verify_lseek64(unsigned int n)
-+static void verify_lseek(unsigned int n)
- {
- 	struct tcase *tc = &tcases[n];
- 	char read_buf[128];
-@@ -82,7 +82,7 @@ static void verify_lseek64(unsigned int n)
- 
- 	SAFE_READ(1, fd, read_buf, 4);
- 
--	TEST(lseek64(fd, tc->off, tc->whence));
-+	TEST(lseek(fd, tc->off, tc->whence));
- 
- 	if (TST_RET == -1) {
-                 tst_res(TFAIL | TTERRNO, "llseek failed on %s ", TEST_FILE);
-@@ -121,6 +121,6 @@ exit:
- static struct tst_test test = {
- 	.needs_tmpdir = 1,
- 	.setup = setup,
--	.test = verify_lseek64,
-+	.test = verify_lseek,
- 	.tcnt = ARRAY_SIZE(tcases),
- };
-diff --git a/testcases/kernel/syscalls/open/Makefile b/testcases/kernel/syscalls/open/Makefile
-index 044619fb8..8a916d0fa 100644
---- a/testcases/kernel/syscalls/open/Makefile
-+++ b/testcases/kernel/syscalls/open/Makefile
-@@ -6,3 +6,5 @@ top_srcdir		?= ../../../..
- include $(top_srcdir)/include/mk/testcases.mk
- 
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-+
-+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-diff --git a/testcases/kernel/syscalls/open/open12.c b/testcases/kernel/syscalls/open/open12.c
-index bdf29a9a8..c840de53d 100644
---- a/testcases/kernel/syscalls/open/open12.c
-+++ b/testcases/kernel/syscalls/open/open12.c
-@@ -233,14 +233,14 @@ static void test_cloexec(void)
- static void test_largefile(void)
- {
- 	int fd;
--	off64_t offset;
-+	off_t offset;
- 
- 	fd = SAFE_OPEN(cleanup, LARGE_FILE,
- 				O_LARGEFILE | O_RDWR | O_CREAT, 0777);
- 
--	offset = lseek64(fd, 4.1*1024*1024*1024, SEEK_SET);
-+	offset = lseek(fd, 4.1*1024*1024*1024, SEEK_SET);
- 	if (offset == -1)
--		tst_brkm(TBROK | TERRNO, cleanup, "lseek64 failed");
-+		tst_brkm(TBROK | TERRNO, cleanup, "lseek failed");
- 
- 	SAFE_WRITE(cleanup, 1, fd, LARGE_FILE, sizeof(LARGE_FILE));
- 
-diff --git a/testcases/kernel/syscalls/openat/Makefile b/testcases/kernel/syscalls/openat/Makefile
-index 044619fb8..8a916d0fa 100644
---- a/testcases/kernel/syscalls/openat/Makefile
-+++ b/testcases/kernel/syscalls/openat/Makefile
-@@ -6,3 +6,5 @@ top_srcdir		?= ../../../..
- include $(top_srcdir)/include/mk/testcases.mk
- 
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-+
-+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-diff --git a/testcases/kernel/syscalls/openat/openat02.c b/testcases/kernel/syscalls/openat/openat02.c
-index 2ce119033..f6113852a 100644
---- a/testcases/kernel/syscalls/openat/openat02.c
-+++ b/testcases/kernel/syscalls/openat/openat02.c
-@@ -22,7 +22,7 @@
-  *   2)openat() succeeds to enable the close-on-exec flag for a
-  *     file descriptor, when 'flags' is set to O_CLOEXEC.
-  *   3)openat() succeeds to allow files whose sizes cannot be
-- *     represented in an off_t but can be represented in an off64_t
-+ *     represented in an off_t but can be represented in an off_t
-  *     to be opened, when 'flags' is set to O_LARGEFILE.
-  *   4)openat() succeeds to not update the file last access time
-  *     (st_atime in the inode) when the file is read, when 'flags'
-@@ -193,12 +193,12 @@ void testfunc_cloexec(void)
- void testfunc_largefile(void)
- {
- 	int fd;
--	off64_t offset;
-+	off_t offset;
- 
- 	fd = SAFE_OPEN(cleanup, LARGE_FILE,
- 				O_LARGEFILE | O_RDWR | O_CREAT, 0777);
- 
--	offset = lseek64(fd, 4.1*1024*1024*1024, SEEK_SET);
-+	offset = lseek(fd, 4.1*1024*1024*1024, SEEK_SET);
- 	if (offset == -1)
- 		tst_brkm(TBROK | TERRNO, cleanup, "lseek64 failed");
- 
-diff --git a/testcases/kernel/syscalls/sync_file_range/Makefile b/testcases/kernel/syscalls/sync_file_range/Makefile
-index 044619fb8..8a916d0fa 100644
---- a/testcases/kernel/syscalls/sync_file_range/Makefile
-+++ b/testcases/kernel/syscalls/sync_file_range/Makefile
-@@ -6,3 +6,5 @@ top_srcdir		?= ../../../..
- include $(top_srcdir)/include/mk/testcases.mk
- 
- include $(top_srcdir)/include/mk/generic_leaf_target.mk
-+
-+CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c
-index 187ef6071..47188aa48 100644
---- a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c
-+++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c
-@@ -44,8 +44,8 @@ static int bfd = -1;
- 
- struct test_case {
- 	int *fd;
--	off64_t offset;
--	off64_t nbytes;
-+	off_t offset;
-+	off_t nbytes;
- 	unsigned int flags;
- 	int error;
- } tcases[] = {
-diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c
-index 5da751c70..28a8156c8 100644
---- a/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c
-+++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range02.c
-@@ -31,10 +31,10 @@
- 
- struct testcase {
- 	char *fname;
--	off64_t sync_off;
--	off64_t sync_size;
-+	off_t sync_off;
-+	off_t sync_size;
- 	size_t exp_sync_size;
--	off64_t write_off;
-+	off_t write_off;
- 	size_t write_size_mb;
- 	const char *desc;
- };
diff --git a/meta/recipes-extended/ltp/ltp_20220930.bb b/meta/recipes-extended/ltp/ltp_20230127.bb
similarity index 98%
rename from meta/recipes-extended/ltp/ltp_20220930.bb
rename to meta/recipes-extended/ltp/ltp_20230127.bb
index 568a6320c1..4325aa6672 100644
--- a/meta/recipes-extended/ltp/ltp_20220930.bb
+++ b/meta/recipes-extended/ltp/ltp_20230127.bb
@@ -24,12 +24,11 @@ TUNE_CCARGS:remove:x86-64 = "-mfpmath=sse"
 
 CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__"
 CFLAGS:append:mipsarchn64 = " -D__SANE_USERSPACE_TYPES__"
-SRCREV = "b763f81998f19f783982d3937d1fd05bcf649c16"
+SRCREV = "dd2d61ac1a1e09797a6165f478abd4a9f4f43035"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=https \
            file://0001-Remove-OOM-tests-from-runtest-mm.patch \
            file://disable_hanging_tests.patch \
-           file://0001-testcases-Fix-largefile-support.patch \
            "
 
 S = "${WORKDIR}/git"
-- 
2.30.2

[PATCH 45/52] linux-firmware: upgrade 20221214 -> 20230117

[Alexander Kanavin]

License-Update: additional firmwares, copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...inux-firmware_20221214.bb => linux-firmware_20230117.bb} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-kernel/linux-firmware/{linux-firmware_20221214.bb => linux-firmware_20230117.bb} (99%)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb
similarity index 99%
rename from meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb
rename to meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb
index c2354e627f..1dce06c8f5 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_20221214.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230117.bb
@@ -70,7 +70,7 @@ LICENSE = "\
 LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \
                     file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \
-                    file://LICENSE.amdgpu;md5=44c1166d052226cb2d6c8d7400090203 \
+                    file://LICENSE.amdgpu;md5=a2589a05ea5b6bd2b7f4f623c7e7a649 \
                     file://LICENSE.amd-ucode;md5=6ca90c57f7b248de1e25c7f68ffc4698 \
                     file://LICENSE.amlogic_vdec;md5=dc44f59bf64a81643e500ad3f39a468a \
                     file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \
@@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \
                     "
 # WHENCE checksum is defined separately to ease overriding it if
 # class-devupstream is selected.
-WHENCE_CHKSUM  = "bf7c716d16e48fe118c6209f99b13253"
+WHENCE_CHKSUM  = "05f1d941972cedadbf667c05f6010378"
 
 # These are not common licenses, set NO_GENERIC_LICENSE for them
 # so that the license files will be copied from fetched source
@@ -209,7 +209,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw
 # Pin this to the 20220509 release, override this in local.conf
 SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae"
 
-SRC_URI[sha256sum] = "e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331"
+SRC_URI[sha256sum] = "df11e25ba2fb4d5343473757e17a3b4cef599250a26b1f7e0f038850f0cb3d64"
 
 inherit allarch
 
-- 
2.30.2

[PATCH 46/52] libinput: upgrade 1.22.0 -> 1.22.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../wayland/{libinput_1.22.0.bb => libinput_1.22.1.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/wayland/{libinput_1.22.0.bb => libinput_1.22.1.bb} (95%)

diff --git a/meta/recipes-graphics/wayland/libinput_1.22.0.bb b/meta/recipes-graphics/wayland/libinput_1.22.1.bb
similarity index 95%
rename from meta/recipes-graphics/wayland/libinput_1.22.0.bb
rename to meta/recipes-graphics/wayland/libinput_1.22.1.bb
index 5a5fc9f35d..f86885d3e3 100644
--- a/meta/recipes-graphics/wayland/libinput_1.22.0.bb
+++ b/meta/recipes-graphics/wayland/libinput_1.22.1.bb
@@ -12,11 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bab4ac7dc1c10bc0fb037dc76c46ef8a"
 
 DEPENDS = "libevdev udev mtdev libcheck"
 
-SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=main \
+SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=1.22-branch \
            file://run-ptest \
            file://determinism.patch \
            "
-SRCREV = "fc59e574e050c502c9a3adefacf97babf3d09c7a"
+SRCREV = "d9f45fd1261da85b4eb44f8aa82e1500b99f303b"
 S = "${WORKDIR}/git"
 
 UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
-- 
2.30.2

[PATCH 47/52] sudo: upgrade 1.9.12p1 -> 1.9.12p2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../sudo/{sudo_1.9.12p1.bb => sudo_1.9.12p2.bb}                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/sudo/{sudo_1.9.12p1.bb => sudo_1.9.12p2.bb} (96%)

diff --git a/meta/recipes-extended/sudo/sudo_1.9.12p1.bb b/meta/recipes-extended/sudo/sudo_1.9.12p2.bb
similarity index 96%
rename from meta/recipes-extended/sudo/sudo_1.9.12p1.bb
rename to meta/recipes-extended/sudo/sudo_1.9.12p2.bb
index 1495b67b8b..ae7207c081 100644
--- a/meta/recipes-extended/sudo/sudo_1.9.12p1.bb
+++ b/meta/recipes-extended/sudo/sudo_1.9.12p2.bb
@@ -8,7 +8,7 @@ SRC_URI = "https://www.sudo.ws/dist/sudo-${PV}.tar.gz \
 
 PAM_SRC_URI = "file://sudo.pam"
 
-SRC_URI[sha256sum] = "475a18a8eb3da8b2917ceab063a6baf51ea09128c3c47e3e0e33ab7497bab7d8"
+SRC_URI[sha256sum] = "b9a0b1ae0f1ddd9be7f3eafe70be05ee81f572f6f536632c44cd4101bb2a8539"
 
 DEPENDS += " virtual/crypt ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS:${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
-- 
2.30.2

[PATCH 48/52] diffoscope: upgrade 230 -> 234

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../diffoscope/{diffoscope_230.bb => diffoscope_234.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-support/diffoscope/{diffoscope_230.bb => diffoscope_234.bb} (92%)

diff --git a/meta/recipes-support/diffoscope/diffoscope_230.bb b/meta/recipes-support/diffoscope/diffoscope_234.bb
similarity index 92%
rename from meta/recipes-support/diffoscope/diffoscope_230.bb
rename to meta/recipes-support/diffoscope/diffoscope_234.bb
index 496ed9e602..994d3e9422 100644
--- a/meta/recipes-support/diffoscope/diffoscope_230.bb
+++ b/meta/recipes-support/diffoscope/diffoscope_234.bb
@@ -12,7 +12,7 @@ PYPI_PACKAGE = "diffoscope"
 
 inherit pypi setuptools3
 
-SRC_URI[sha256sum] = "a35908c15bb006058f74c2d4f2be3b1ac7cf62c872cfbd2950114a8a705d8108"
+SRC_URI[sha256sum] = "6091d555bc88ceca285dc40e63df56b57385aa0dc552daa70bde81e8a69f8c7a"
 
 RDEPENDS:${PN} += "binutils vim squashfs-tools python3-libarchive-c python3-magic python3-rpm"
 
-- 
2.30.2

[PATCH 49/52] texinfo: upgrade 7.0.1 -> 7.0.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../texinfo/{texinfo_7.0.1.bb => texinfo_7.0.2.bb}              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/texinfo/{texinfo_7.0.1.bb => texinfo_7.0.2.bb} (97%)

diff --git a/meta/recipes-extended/texinfo/texinfo_7.0.1.bb b/meta/recipes-extended/texinfo/texinfo_7.0.2.bb
similarity index 97%
rename from meta/recipes-extended/texinfo/texinfo_7.0.1.bb
rename to meta/recipes-extended/texinfo/texinfo_7.0.2.bb
index f0f9211594..da455df4bb 100644
--- a/meta/recipes-extended/texinfo/texinfo_7.0.1.bb
+++ b/meta/recipes-extended/texinfo/texinfo_7.0.2.bb
@@ -35,7 +35,7 @@ SRC_URI = "${GNU_MIRROR}/texinfo/${BP}.tar.gz \
            ${TARGET_PATCH} \
            "
 
-SRC_URI[sha256sum] = "53c01dd34c9bf116866d03aabd38c5cd9ee95ac10043d61aa33dec0d27825d8d"
+SRC_URI[sha256sum] = "a9c646bc4f6bb31843f129f8408a3a627334575faf7b22ebc416be5cb1570553"
 
 tex_texinfo = "texmf/tex/texinfo"
 
-- 
2.30.2

[PATCH 50/52] stress-ng: upgrade 0.15.02 -> 0.15.03

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../stress-ng/{stress-ng_0.15.02.bb => stress-ng_0.15.03.bb}    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/stress-ng/{stress-ng_0.15.02.bb => stress-ng_0.15.03.bb} (95%)

diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.15.02.bb b/meta/recipes-extended/stress-ng/stress-ng_0.15.03.bb
similarity index 95%
rename from meta/recipes-extended/stress-ng/stress-ng_0.15.02.bb
rename to meta/recipes-extended/stress-ng/stress-ng_0.15.03.bb
index 75400f589e..13a8b49f70 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.15.02.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.15.03.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master \
            file://0001-test-float-Make-variables-global.patch \
            file://0001-Pass-LD_GOLD-1-via-makefile-to-enable-gold-linker.patch"
-SRCREV = "4164f6842c712c2d9a13619c3c70fd35d8d02cdb"
+SRCREV = "f3be0447c10fd5652b4c3753d56bcaac13fd8917"
 S = "${WORKDIR}/git"
 
 DEPENDS = "coreutils-native libbsd"
-- 
2.30.2

[PATCH 51/52] libgit2: upgrade 1.5.0 -> 1.5.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../libgit2/{libgit2_1.5.0.bb => libgit2_1.5.1.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/libgit2/{libgit2_1.5.0.bb => libgit2_1.5.1.bb} (78%)

diff --git a/meta/recipes-support/libgit2/libgit2_1.5.0.bb b/meta/recipes-support/libgit2/libgit2_1.5.1.bb
similarity index 78%
rename from meta/recipes-support/libgit2/libgit2_1.5.0.bb
rename to meta/recipes-support/libgit2/libgit2_1.5.1.bb
index ee4d79b11a..59866ce385 100644
--- a/meta/recipes-support/libgit2/libgit2_1.5.0.bb
+++ b/meta/recipes-support/libgit2/libgit2_1.5.1.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=112e6bb421dea73cd41de09e777f2d2c"
 
 DEPENDS = "curl openssl zlib libssh2 libgcrypt libpcre2"
 
-SRC_URI = "git://github.com/libgit2/libgit2.git;branch=main;protocol=https"
-SRCREV = "fbea439d4b6fc91c6b619d01b85ab3b7746e4c19"
+SRC_URI = "git://github.com/libgit2/libgit2.git;branch=maint/v1.5;protocol=https"
+SRCREV = "42e5db98b963ae503229c63e44e06e439df50e56"
 
 S = "${WORKDIR}/git"
 
-- 
2.30.2

[PATCH 52/52] python3-pathspec: upgrade 0.10.3 -> 0.11.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{python3-pathspec_0.10.3.bb => python3-pathspec_0.11.0.bb}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/python/{python3-pathspec_0.10.3.bb => python3-pathspec_0.11.0.bb} (78%)

diff --git a/meta/recipes-devtools/python/python3-pathspec_0.10.3.bb b/meta/recipes-devtools/python/python3-pathspec_0.11.0.bb
similarity index 78%
rename from meta/recipes-devtools/python/python3-pathspec_0.10.3.bb
rename to meta/recipes-devtools/python/python3-pathspec_0.11.0.bb
index bd1e7e3639..bf0dfbd728 100644
--- a/meta/recipes-devtools/python/python3-pathspec_0.10.3.bb
+++ b/meta/recipes-devtools/python/python3-pathspec_0.11.0.bb
@@ -4,7 +4,7 @@ SECTION = "devel/python"
 LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=815ca599c9df247a0c7f619bab123dad"
 
-SRC_URI[sha256sum] = "56200de4077d9d0791465aa9095a01d421861e405b5096955051deefd697d6f6"
+SRC_URI[sha256sum] = "64d338d4e0914e91c1792321e6907b5a593f1ab1851de7fc269557a21b30ebbc"
 
 inherit pypi setuptools3
 
-- 
2.30.2

Re: [OE-core] [PATCH 01/52] ifupdown: update 0.8.43 -> 0.8.41

[ChenQi]

Typo. It should be 0.8.39 -> 0.8.41

Regards,
Qi

On 2/8/23 15:20, Alexander Kanavin wrote:
> Do not apply patch conditionally, there is no need for that,
> and conditional patches are problematic with upgrades and devtool.
>
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>   .../0001-Define-FNM_EXTMATCH-for-musl.patch   |  8 +++-----
>   ...not-use-dpkg-for-determining-OS-type.patch |  3 ++-
>   .../0001-ifupdown-skip-wrong-test-case.patch  | 12 +++++-------
>   ...t-rely-on-dpkg-architecture-to-set-a.patch | 10 ++++------
>   .../ifupdown/files/tweak-ptest-script.patch   | 19 +++++++++++--------
>   ...{ifupdown_0.8.39.bb => ifupdown_0.8.41.bb} |  8 ++++----
>   6 files changed, 29 insertions(+), 31 deletions(-)
>   rename meta/recipes-core/ifupdown/{ifupdown_0.8.39.bb => ifupdown_0.8.41.bb} (92%)
>
> diff --git a/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch b/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
> index 7bf02ea536..6c4ed526bf 100644
> --- a/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
> +++ b/meta/recipes-core/ifupdown/files/0001-Define-FNM_EXTMATCH-for-musl.patch
> @@ -1,4 +1,4 @@
> -From ff714d6461569d69b253089110ec659e4ebec248 Mon Sep 17 00:00:00 2001
> +From 8dfbcf02e424ba1fdef587d81c9e08a37ab8c1b6 Mon Sep 17 00:00:00 2001
>   From: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
>   Date: Tue, 2 Jul 2019 20:10:42 +0200
>   Subject: [PATCH] Define FNM_EXTMATCH for musl
> @@ -24,12 +24,13 @@ function); did you mean 'FNM_NOMATCH'?
>   Upstream-Status: Submitted [https://salsa.debian.org/debian/ifupdown/merge_requests/5]
>   
>   Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>
> +
>   ---
>    archcommon.h | 4 ++++
>    1 file changed, 4 insertions(+)
>   
>   diff --git a/archcommon.h b/archcommon.h
> -index fe99950..f257f9d 100644
> +index 818b0b6..ad9cd1a 100644
>   --- a/archcommon.h
>   +++ b/archcommon.h
>   @@ -1,5 +1,9 @@
> @@ -42,6 +43,3 @@ index fe99950..f257f9d 100644
>    bool execable(const char *);
>    
>    #define iface_is_link() (!_iface_has(ifd->real_iface, ":."))
> ---
> -2.17.1
> -
> diff --git a/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch b/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
> index 57c8d04fd7..6e15a25224 100644
> --- a/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
> +++ b/meta/recipes-core/ifupdown/files/0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch
> @@ -1,10 +1,11 @@
> -From 7ace0656bd325f9e7749f2cde641eddc057bc98a Mon Sep 17 00:00:00 2001
> +From 7fe516cbaf9fda09d99dcb54d4645367cffc8a4d Mon Sep 17 00:00:00 2001
>   From: Alexander Kanavin <alex.kanavin@gmail.com>
>   Date: Thu, 9 Jan 2020 15:38:06 +0100
>   Subject: [PATCH] Makefile: do not use dpkg for determining OS type
>   
>   Upstream-Status: Inappropriate [oe-core specific]
>   Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> +
>   ---
>    Makefile | 2 +-
>    1 file changed, 1 insertion(+), 1 deletion(-)
> diff --git a/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch b/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
> index c751e4fab0..9ae24da51e 100644
> --- a/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
> +++ b/meta/recipes-core/ifupdown/files/0001-ifupdown-skip-wrong-test-case.patch
> @@ -1,4 +1,4 @@
> -From 98243deface88614e3f332c4a85d04a9abce55ff Mon Sep 17 00:00:00 2001
> +From 782d8a869c266820d0f34974436f244f67afaea7 Mon Sep 17 00:00:00 2001
>   From: Zqiang <qiang.zhang@windriver.com>
>   Date: Mon, 19 Apr 2021 14:15:45 +0800
>   Subject: [PATCH] ifupdown: skip wrong test case
> @@ -10,23 +10,21 @@ and are skipped directly.
>   Upstream-Status: Inappropriate [oe-core specific]
>   
>   Signed-off-by: Zqiang <qiang.zhang@windriver.com>
> +
>   ---
>    tests/testbuild-linux | 2 +-
>    1 file changed, 1 insertion(+), 1 deletion(-)
>   
>   diff --git a/tests/testbuild-linux b/tests/testbuild-linux
> -index 1181ea0..5f148eb 100755
> +index 2fa1b8b..2c69856 100755
>   --- a/tests/testbuild-linux
>   +++ b/tests/testbuild-linux
>   @@ -3,7 +3,7 @@
>    dir=tests/linux
>    
>    result=true
> --for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18; do
> -+for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
> +-for test in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19; do
> ++for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
>    	if [ -e $dir/testcase.$test ]; then
>    		args="$(cat $dir/testcase.$test | sed -n 's/^# RUN: //p')"
>    	else
> ---
> -2.17.1
> -
> diff --git a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch b/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
> index d1c3d260ed..7b4b761e6a 100644
> --- a/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
> +++ b/meta/recipes-core/ifupdown/files/defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch
> @@ -1,7 +1,7 @@
> -From 40257d65b338b6e2ed9d89d6fa7c7b8701a4c311 Mon Sep 17 00:00:00 2001
> +From fc8e8d4cb19ff30e69aa1855332544f1017f974c Mon Sep 17 00:00:00 2001
>   From: Paul Gortmaker <paul.gortmaker@windriver.com>
>   Date: Wed, 6 Aug 2014 14:54:12 -0400
> -Subject: [PATCH 1/2] defn2[c|man]: don't rely on dpkg-architecture to set arch
> +Subject: [PATCH] defn2[c|man]: don't rely on dpkg-architecture to set arch
>   
>   In yocto we'll always be cross compiling, and we'll always
>   be building on linux for linux (vs. *BSD, hurd, etc.)
> @@ -13,13 +13,14 @@ like the loopback device not being configured/enabled.
>   
>   Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
>   Upstream-Status: Pending
> +
>   ---
>    defn2c.pl   | 6 +++---
>    defn2man.pl | 6 +++---
>    2 files changed, 6 insertions(+), 6 deletions(-)
>   
>   diff --git a/defn2c.pl b/defn2c.pl
> -index 8798dc2..f2551c7 100755
> +index fa7a02e..bb4987d 100755
>   --- a/defn2c.pl
>   +++ b/defn2c.pl
>   @@ -2,9 +2,9 @@
> @@ -52,6 +53,3 @@ index 6ddcfdd..c9c4dd0 100755
>    
>    # declarations
>    my $line;
> ---
> -2.17.1
> -
> diff --git a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
> index ea88a9086a..fa6bb84df3 100644
> --- a/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
> +++ b/meta/recipes-core/ifupdown/files/tweak-ptest-script.patch
> @@ -1,14 +1,19 @@
> -Tweak tests of ifupdown to make it work with oe-core ptest framework.
> +From a6bb2ac5f521c678abbbdb1960d28f750f4357a6 Mon Sep 17 00:00:00 2001
> +From: Kai Kang <kai.kang@windriver.com>
> +Date: Mon, 3 Feb 2020 17:33:11 +0800
> +Subject: [PATCH] Tweak tests of ifupdown to make it work with oe-core ptest
> + framework.
>   
>   Upstream-Status: Inappropriate [oe-core specific]
>   
>   Signed-off-by: Kai Kang <kai.kang@windriver.com>
> +
>   ---
>    tests/testbuild-linux | 11 ++++++-----
>    1 file changed, 6 insertions(+), 5 deletions(-)
>   
>   diff --git a/tests/testbuild-linux b/tests/testbuild-linux
> -index 5f148eb..d9b1698 100755
> +index 2c69856..05f0703 100755
>   --- a/tests/testbuild-linux
>   +++ b/tests/testbuild-linux
>   @@ -1,6 +1,7 @@
> @@ -19,8 +24,8 @@ index 5f148eb..d9b1698 100755
>   +dir=$curdir/linux
>    
>    result=true
> - for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
> -@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
> + for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
> +@@ -12,7 +13,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
>            echo "Testcase $test: $args"
>    
>    	exitcode=0
> @@ -29,7 +34,7 @@ index 5f148eb..d9b1698 100755
>                    >$dir/up-res-out.$test 2>$dir/up-res-err.$test || exitcode=$?
>    
>            (echo "exit code: $exitcode";
> -@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
> +@@ -20,7 +21,7 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
>             echo "====stderr===="; cat $dir/up-res-err.$test) > $dir/up-res.$test
>    
>    	exitcode=0
> @@ -38,7 +43,7 @@ index 5f148eb..d9b1698 100755
>                   >$dir/down-res-out.$test 2>$dir/down-res-err.$test || exitcode=$?
>    
>            (echo "exit code: $exitcode";
> -@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18; do
> +@@ -28,9 +29,9 @@ for test in 1 2 3 4 5 6 7 8 9 10 11 16 17 18 19; do
>             echo "====stderr===="; cat $dir/down-res-err.$test) > $dir/down-res.$test
>    
>            if diff -ub $dir/up.$test $dir/up-res.$test && diff -ub $dir/down.$test $dir/down-res.$test; then
> @@ -50,5 +55,3 @@ index 5f148eb..d9b1698 100755
>                    result=false
>            fi
>            echo "=========="
> ---
> -2.17.1
> diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb
> similarity index 92%
> rename from meta/recipes-core/ifupdown/ifupdown_0.8.39.bb
> rename to meta/recipes-core/ifupdown/ifupdown_0.8.41.bb
> index 7096bc94d7..5dbd6193b8 100644
> --- a/meta/recipes-core/ifupdown/ifupdown_0.8.39.bb
> +++ b/meta/recipes-core/ifupdown/ifupdown_0.8.41.bb
> @@ -8,15 +8,15 @@ LICENSE = "GPL-2.0-only"
>   LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>   
>   SRC_URI = "git://salsa.debian.org/debian/ifupdown.git;protocol=https;branch=master \
> -           file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
>              file://99_network \
> +           file://run-ptest \
>              file://0001-Define-FNM_EXTMATCH-for-musl.patch \
>              file://0001-Makefile-do-not-use-dpkg-for-determining-OS-type.patch \
> -           file://run-ptest \
>              file://0001-ifupdown-skip-wrong-test-case.patch \
> -           ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'file://tweak-ptest-script.patch', '', d)} \
> +           file://defn2-c-man-don-t-rely-on-dpkg-architecture-to-set-a.patch \
> +           file://tweak-ptest-script.patch \
>              "
> -SRCREV = "be91dd267b4a8db502a6bbf5758563f7048b8078"
> +SRCREV = "369d9d3c13a0c56ad09fd4f13b4a80eb9a94e270"
>   
>   S = "${WORKDIR}/git"
>   
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#176841): https://lists.openembedded.org/g/openembedded-core/message/176841
> Mute This Topic: https://lists.openembedded.org/mt/96825753/7304865
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [Qi.Chen@eng.windriver.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [OE-core] [PATCH 01/52] ifupdown: update 0.8.43 -> 0.8.41

[Luca Ceresoli]

Hi Chen, Alex,

On Wed, 8 Feb 2023 15:48:40 +0800
"Chen Qi" <Qi.Chen@windriver.com> wrote:

> Typo. It should be 0.8.39 -> 0.8.41

Thanks for noticing! I have fixed the message while applying to my
testing branch.

Alex, I also skipped "python3-sphinx: upgrade 6.0.0 -> 6.1.3" as I
already have a patch by Tim doing the same upgrade in my branch.

Best regards,
-- 
Luca Ceresoli, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH 30/52] bind: upgrade 9.18.10 -> 9.18.11

[Takayasu Ito]

Hi All

The following CVEs have been FIXed in this upgrade
CVE-2022-3094 ,CVE-2022-3736 and CVE-2022-3924

https://bind9.readthedocs.io/en/v9_18_11/notes.html#notes-for-bind-9-18-11


On 2023/02/08 16:21, Alexander Kanavin wrote:
> License-update: copyright years
> 
> Signed-off-by: Alexander Kanavin <alex@linutronix.de>
> ---
>   .../0001-avoid-start-failure-with-bind-user.patch             | 0
>   ...0001-named-lwresd-V-and-start-log-hide-build-options.patch | 0
>   ...bind-ensure-searching-for-json-headers-searches-sysr.patch | 0
>   .../bind/{bind-9.18.10 => bind-9.18.11}/bind9                 | 0
>   .../bind/{bind-9.18.10 => bind-9.18.11}/conf.patch            | 0
>   .../bind/{bind-9.18.10 => bind-9.18.11}/generate-rndc-key.sh  | 0
>   .../init.d-add-support-for-read-only-rootfs.patch             | 0
>   .../make-etc-initd-bind-stop-work.patch                       | 0
>   .../bind/{bind-9.18.10 => bind-9.18.11}/named.service         | 0
>   .../bind/{bind_9.18.10.bb => bind_9.18.11.bb}                 | 4 ++--
>   10 files changed, 2 insertions(+), 2 deletions(-)
>   rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/0001-avoid-start-failure-with-bind-user.patch (100%)
>   rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/0001-named-lwresd-V-and-start-log-hide-build-options.patch (100%)
>   rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/bind-ensure-searching-for-json-headers-searches-sysr.patch (100%)
>   rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/bind9 (100%)
>   rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/conf.patch (100%)
>   rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/generate-rndc-key.sh (100%)
>   rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/init.d-add-support-for-read-only-rootfs.patch (100%)
>   rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/make-etc-initd-bind-stop-work.patch (100%)
>   rename meta/recipes-connectivity/bind/{bind-9.18.10 => bind-9.18.11}/named.service (100%)
>   rename meta/recipes-connectivity/bind/{bind_9.18.10.bb => bind_9.18.11.bb} (96%)
> 
> diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.18.11/0001-avoid-start-failure-with-bind-user.patch
> similarity index 100%
> rename from meta/recipes-connectivity/bind/bind-9.18.10/0001-avoid-start-failure-with-bind-user.patch
> rename to meta/recipes-connectivity/bind/bind-9.18.11/0001-avoid-start-failure-with-bind-user.patch
> diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch b/meta/recipes-connectivity/bind/bind-9.18.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch
> similarity index 100%
> rename from meta/recipes-connectivity/bind/bind-9.18.10/0001-named-lwresd-V-and-start-log-hide-build-options.patch
> rename to meta/recipes-connectivity/bind/bind-9.18.11/0001-named-lwresd-V-and-start-log-hide-build-options.patch
> diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/bind-ensure-searching-for-json-headers-searches-sysr.patch b/meta/recipes-connectivity/bind/bind-9.18.11/bind-ensure-searching-for-json-headers-searches-sysr.patch
> similarity index 100%
> rename from meta/recipes-connectivity/bind/bind-9.18.10/bind-ensure-searching-for-json-headers-searches-sysr.patch
> rename to meta/recipes-connectivity/bind/bind-9.18.11/bind-ensure-searching-for-json-headers-searches-sysr.patch
> diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/bind9 b/meta/recipes-connectivity/bind/bind-9.18.11/bind9
> similarity index 100%
> rename from meta/recipes-connectivity/bind/bind-9.18.10/bind9
> rename to meta/recipes-connectivity/bind/bind-9.18.11/bind9
> diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/conf.patch b/meta/recipes-connectivity/bind/bind-9.18.11/conf.patch
> similarity index 100%
> rename from meta/recipes-connectivity/bind/bind-9.18.10/conf.patch
> rename to meta/recipes-connectivity/bind/bind-9.18.11/conf.patch
> diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind-9.18.11/generate-rndc-key.sh
> similarity index 100%
> rename from meta/recipes-connectivity/bind/bind-9.18.10/generate-rndc-key.sh
> rename to meta/recipes-connectivity/bind/bind-9.18.11/generate-rndc-key.sh
> diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/init.d-add-support-for-read-only-rootfs.patch b/meta/recipes-connectivity/bind/bind-9.18.11/init.d-add-support-for-read-only-rootfs.patch
> similarity index 100%
> rename from meta/recipes-connectivity/bind/bind-9.18.10/init.d-add-support-for-read-only-rootfs.patch
> rename to meta/recipes-connectivity/bind/bind-9.18.11/init.d-add-support-for-read-only-rootfs.patch
> diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/make-etc-initd-bind-stop-work.patch b/meta/recipes-connectivity/bind/bind-9.18.11/make-etc-initd-bind-stop-work.patch
> similarity index 100%
> rename from meta/recipes-connectivity/bind/bind-9.18.10/make-etc-initd-bind-stop-work.patch
> rename to meta/recipes-connectivity/bind/bind-9.18.11/make-etc-initd-bind-stop-work.patch
> diff --git a/meta/recipes-connectivity/bind/bind-9.18.10/named.service b/meta/recipes-connectivity/bind/bind-9.18.11/named.service
> similarity index 100%
> rename from meta/recipes-connectivity/bind/bind-9.18.10/named.service
> rename to meta/recipes-connectivity/bind/bind-9.18.11/named.service
> diff --git a/meta/recipes-connectivity/bind/bind_9.18.10.bb b/meta/recipes-connectivity/bind/bind_9.18.11.bb
> similarity index 96%
> rename from meta/recipes-connectivity/bind/bind_9.18.10.bb
> rename to meta/recipes-connectivity/bind/bind_9.18.11.bb
> index cb0e251d51..55a06eae5f 100644
> --- a/meta/recipes-connectivity/bind/bind_9.18.10.bb
> +++ b/meta/recipes-connectivity/bind/bind_9.18.11.bb
> @@ -4,7 +4,7 @@ DESCRIPTION = "BIND 9 provides a full-featured Domain Name Server system"
>   SECTION = "console/network"
>   
>   LICENSE = "MPL-2.0"
> -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9a4a897f202c0710e07f2f2836bc2b62"
> +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=d8cf7bd9c4fd5471a588e7e66e672408"
>   
>   DEPENDS = "openssl libcap zlib libuv"
>   
> @@ -20,7 +20,7 @@ SRC_URI = "https://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.xz \
>              file://0001-avoid-start-failure-with-bind-user.patch \
>              "
>   
> -SRC_URI[sha256sum] = "f415a92feb62568b50854a063cb231e257351f8672186d0ab031a49b3de2cac6"
> +SRC_URI[sha256sum] = "8ff3352812230cbcbda42df87cad961f94163d3da457c5e4bef8057fd5df2158"
>   
>   UPSTREAM_CHECK_URI = "https://ftp.isc.org/isc/bind9/"
>   # follow the ESV versions divisible by 2
> 
> 
> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#176869): https://lists.openembedded.org/g/openembedded-core/message/176869
> Mute This Topic: https://lists.openembedded.org/mt/96825781/3617373
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [ito@lineo.co.jp]
> -=-=-=-=-=-=-=-=-=-=-=-
> 

-- 
Takayasu Ito
Yocto Project Ambassador
Solution Department Lineo Solutions, Inc.
https://www.lineo.co.jp/english/
Email: ito@lineo.co.jp