[PATCH 01/25] systemd: update 251.8 -> 252.4

[PATCH 01/25] systemd: update 251.8 -> 252.4

[Alexander Kanavin]

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

diff --git a/meta/recipes-core/systemd/systemd-boot_251.8.bb b/meta/recipes-core/systemd/systemd-boot_252.4.bb
similarity index 100%
rename from meta/recipes-core/systemd/systemd-boot_251.8.bb
rename to meta/recipes-core/systemd/systemd-boot_252.4.bb
diff --git a/meta/recipes-core/systemd/systemd.inc b/meta/recipes-core/systemd/systemd.inc
index 3bb6b0efe6..9d747ef64d 100644
--- a/meta/recipes-core/systemd/systemd.inc
+++ b/meta/recipes-core/systemd/systemd.inc
@@ -14,8 +14,8 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
                     file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
 
-SRCREV = "ae8b249af4acb055f920134f2ac584c4cbc86e3b"
-SRCBRANCH = "v251-stable"
+SRCREV = "4b48117716f84751dc6c8ee16c94de9858eaef4f"
+SRCBRANCH = "v252-stable"
 SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH} \
 "
 
diff --git a/meta/recipes-core/systemd/systemd_251.8.bb b/meta/recipes-core/systemd/systemd_252.4.bb
similarity index 99%
rename from meta/recipes-core/systemd/systemd_251.8.bb
rename to meta/recipes-core/systemd/systemd_252.4.bb
index 8f2fb90455..3271b225fc 100644
--- a/meta/recipes-core/systemd/systemd_251.8.bb
+++ b/meta/recipes-core/systemd/systemd_252.4.bb
@@ -602,6 +602,7 @@ FILES:${PN} = " ${base_bindir}/* \
                 ${sysconfdir}/resolv-conf.systemd \
                 ${sysconfdir}/X11/xinit/xinitrc.d/* \
                 ${rootlibexecdir}/systemd/* \
+                ${rootlibdir}/systemd/libsystemd-core* \
                 ${libdir}/pam.d \
                 ${nonarch_libdir}/pam.d \
                 ${systemd_unitdir}/* \
@@ -616,6 +617,7 @@ FILES:${PN} = " ${base_bindir}/* \
                 ${bindir}/timedatectl \
                 ${bindir}/bootctl \
                 ${bindir}/oomctl \
+                ${bindir}/userdbctl \
                 ${exec_prefix}/lib/tmpfiles.d/*.conf \
                 ${exec_prefix}/lib/systemd \
                 ${exec_prefix}/lib/modules-load.d \
@@ -658,7 +660,7 @@ INSANE_SKIP:${PN}-dbg += "libdir"
 INSANE_SKIP:${PN}-doc += " libdir"
 INSANE_SKIP:libsystemd-shared += "libdir"
 
-FILES:libsystemd-shared = "${rootlibexecdir}/systemd/libsystemd-shared*.so"
+FILES:libsystemd-shared = "${rootlibdir}/systemd/libsystemd-shared*.so"
 
 RPROVIDES:udev = "hotplug"
 
-- 
2.30.2

[PATCH 02/25] dpkg: update 1.21.9 -> 1.21.13

[Alexander Kanavin]

libmd is a new dependency.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-devtools/dpkg/dpkg.inc            |  4 ++--
 ...uild.c-ignore-return-of-1-from-tar-cf.patch |  7 ++-----
 ...ts-expect-D-to-be-set-when-running-in.patch | 18 ++++++++----------
 .../dpkg/{dpkg_1.21.9.bb => dpkg_1.21.13.bb}   |  2 +-
 4 files changed, 13 insertions(+), 18 deletions(-)
 rename meta/recipes-devtools/dpkg/{dpkg_1.21.9.bb => dpkg_1.21.13.bb} (95%)

diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index 0d17a98b80..b3e8c05d62 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -4,8 +4,8 @@ HOMEPAGE = "https://salsa.debian.org/dpkg-team/dpkg"
 DESCRIPTION = "The primary interface for the dpkg suite is the dselect program. A more low-level and less user-friendly interface is available in the form of the dpkg command."
 SECTION = "base"
 
-DEPENDS = "zlib bzip2 perl ncurses"
-DEPENDS:class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native"
+DEPENDS = "zlib bzip2 perl ncurses libmd"
+DEPENDS:class-native = "bzip2-replacement-native zlib-native virtual/update-alternatives-native gettext-native perl-native libmd-native"
 RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_update-alternatives} perl"
 RDEPENDS:${PN}:class-native = ""
 
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 dc0d9bfc2e..1b5b89644f 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 839f228556c00739f72534e8635195935eb3752f Mon Sep 17 00:00:00 2001
+From 54ca20a18253bcf0915b2e2985bbee79bf881ebe 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
@@ -29,7 +29,7 @@ Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/src/deb/build.c b/src/deb/build.c
-index 76613ad..7c216d1 100644
+index 76613adec..7c216d1a9 100644
 --- a/src/deb/build.c
 +++ b/src/deb/build.c
 @@ -482,6 +482,7 @@ tarball_pack(const char *dir, filenames_feed_func *tar_filenames_feeder,
@@ -51,6 +51,3 @@ index 76613ad..7c216d1 100644
  }
  
  static intmax_t
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
index 75ae848264..bd4d5d5353 100644
--- a/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
+++ b/meta/recipes-devtools/dpkg/dpkg/0003-Our-pre-postinsts-expect-D-to-be-set-when-running-in.patch
@@ -1,4 +1,4 @@
-From dd11ed66640f79143e42d778b58fdd5a61fb5836 Mon Sep 17 00:00:00 2001
+From ff325b35639a797edd92b373fbebf7b8b9f3f0c3 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Wed, 26 Aug 2015 16:25:45 +0300
 Subject: [PATCH] Our pre/postinsts expect $D to be set when running in a
@@ -11,22 +11,23 @@ RP 2011/12/07
 ALIMON 2016/05/26
 ALIMON 2017/02/21
 KKang 2019/02/20
+
 ---
- src/main/script.c | 54 +++--------------------------------------------
- 1 file changed, 3 insertions(+), 51 deletions(-)
+ src/main/script.c | 53 +++--------------------------------------------
+ 1 file changed, 3 insertions(+), 50 deletions(-)
 
 diff --git a/src/main/script.c b/src/main/script.c
-index abe65b6..0edb8f1 100644
+index ecce4d842..16f4e6ff5 100644
 --- a/src/main/script.c
 +++ b/src/main/script.c
-@@ -96,58 +96,10 @@ setexecute(const char *path, struct stat *stab)
- static const char *
+@@ -97,58 +97,11 @@ static const char *
  maintscript_pre_exec(struct command *cmd)
  {
+ 	const char *instdir = dpkg_fsys_get_dir();
 -	const char *admindir = dpkg_db_get_dir();
 -	const char *changedir;
 -	size_t instdirlen = strlen(instdir);
--
+ 
 -	if (instdirlen > 0 && in_force(FORCE_SCRIPT_CHROOTLESS))
 -		changedir = instdir;
 -	else
@@ -81,6 +82,3 @@ index abe65b6..0edb8f1 100644
  }
  
  /**
--- 
-2.25.1
-
diff --git a/meta/recipes-devtools/dpkg/dpkg_1.21.9.bb b/meta/recipes-devtools/dpkg/dpkg_1.21.13.bb
similarity index 95%
rename from meta/recipes-devtools/dpkg/dpkg_1.21.9.bb
rename to meta/recipes-devtools/dpkg/dpkg_1.21.13.bb
index feb579723f..8637dcfaf5 100644
--- a/meta/recipes-devtools/dpkg/dpkg_1.21.9.bb
+++ b/meta/recipes-devtools/dpkg/dpkg_1.21.13.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 = "c2d6b7de5849c62d3a4f55f61dbc53c1992f74ee"
+SRCREV = "ff61d6d650e0455d4c070306a482cf757285d58b"
 
 S = "${WORKDIR}/git"
-- 
2.30.2

[PATCH 03/25] python3-installer: update 0.5.1 -> 0.6.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../python3-installer/interpreter.patch       | 24 +++++++++++++------
 ...er_0.5.1.bb => python3-installer_0.6.0.bb} |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)
 rename meta/recipes-devtools/python/{python3-installer_0.5.1.bb => python3-installer_0.6.0.bb} (89%)

diff --git a/meta/recipes-devtools/python/python3-installer/interpreter.patch b/meta/recipes-devtools/python/python3-installer/interpreter.patch
index ef10ef1b45..7906769b90 100644
--- a/meta/recipes-devtools/python/python3-installer/interpreter.patch
+++ b/meta/recipes-devtools/python/python3-installer/interpreter.patch
@@ -1,3 +1,8 @@
+From 74fe171fa4a25c120607e9f8450cbdfee675c959 Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.burton@arm.com>
+Date: Mon, 14 Mar 2022 14:39:22 +0000
+Subject: [PATCH] python3-installer: add installer module
+
 Let us override the hashbang directly (possibly upstreamable), and don't
 play games with hashbangs: for now assume that even hashbangs with spaces
 are simple (assume the spaces are only used to separate arguments) and
@@ -6,13 +11,18 @@ we don't have long hashbangs.
 Upstream-Status: Inappropriate
 Signed-off-by: Ross Burton <ross.burton@arm.com>
 
+---
+ src/installer/__main__.py |  9 ++++++++-
+ src/installer/scripts.py  | 15 +--------------
+ 2 files changed, 9 insertions(+), 15 deletions(-)
+
 diff --git a/src/installer/__main__.py b/src/installer/__main__.py
-index 3357ec5..d2fd8d2 100644
+index 51014b9..38de286 100644
 --- a/src/installer/__main__.py
 +++ b/src/installer/__main__.py
-@@ -23,6 +23,13 @@ def _get_main_parser() -> argparse.ArgumentParser:
+@@ -30,6 +30,13 @@ def _get_main_parser() -> argparse.ArgumentParser:
          type=str,
-         help="destination directory (prefix to prepend to each file)",
+         help="override prefix to install packages to",
      )
 +    parser.add_argument(
 +        "--interpreter",
@@ -24,10 +34,10 @@ index 3357ec5..d2fd8d2 100644
      parser.add_argument(
          "--compile-bytecode",
          action="append",
-@@ -73,7 +80,7 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None:
+@@ -86,7 +93,7 @@ def _main(cli_args: Sequence[str], program: Optional[str] = None) -> None:
      with WheelFile.open(args.wheel) as source:
          destination = SchemeDictionaryDestination(
-             scheme_dict=_get_scheme_dict(source.distribution),
+             scheme_dict=_get_scheme_dict(source.distribution, prefix=args.prefix),
 -            interpreter=sys.executable,
 +            interpreter=args.interpreter,
              script_kind=get_launcher_kind(),
@@ -56,6 +66,6 @@ index 7e3c8fc..ba6ed5a 100644
 -    # I don't understand a lick what this is trying to do.
 -    return b"#!/bin/sh\n'''exec' " + quoted + b' "$0" "$@"\n' + b"' '''"
 +    return b"#!" + executable_bytes
-
-
+ 
+ 
  class InvalidScript(ValueError):
diff --git a/meta/recipes-devtools/python/python3-installer_0.5.1.bb b/meta/recipes-devtools/python/python3-installer_0.6.0.bb
similarity index 89%
rename from meta/recipes-devtools/python/python3-installer_0.5.1.bb
rename to meta/recipes-devtools/python/python3-installer_0.6.0.bb
index 07bbafa81f..e728e47cec 100644
--- a/meta/recipes-devtools/python/python3-installer_0.5.1.bb
+++ b/meta/recipes-devtools/python/python3-installer_0.6.0.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5038641aec7a77451e31da828ebfae00"
 
 SRC_URI += "file://interpreter.patch"
 
-SRC_URI[sha256sum] = "f970995ec2bb815e2fdaf7977b26b2091e1e386f0f42eafd5ac811953dc5d445"
+SRC_URI[sha256sum] = "f3bd36cd261b440a88a1190b1becca0578fee90b4b62decc796932fdd5ae8839"
 
 inherit pypi python_flit_core
 
-- 
2.30.2

[PATCH 04/25] python3: update 3.11.0 -> 3.11.1

[Alexander Kanavin]

Drop 0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch:
the patch has been rejected upstream (see the bug), and does quite a
bit more than just fix the mips softfloat problem. If the problem
still exists, then the fix needs to be re-done, and re-submitted.

The other two patches have been merged upstream.

License-Update: http->https

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...-search-system-for-headers-libraries.patch |   2 +-
 ...-use-prefix-value-from-build-configu.patch |   2 +-
 ...-detection-of-mips-architecture-for-.patch | 227 ------------------
 ...asename-to-replace-CC-for-checking-c.patch |  24 +-
 ...add-more-elements-in-test_determinis.patch |  27 ---
 ...tutils-prefix-is-inside-staging-area.patch |   2 +-
 .../python/python3/cve-2022-37460.patch       |  95 --------
 .../{python3_3.11.0.bb => python3_3.11.1.bb}  |   7 +-
 8 files changed, 17 insertions(+), 369 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
 delete mode 100644 meta/recipes-devtools/python/python3/0001-test_marshal.py-add-more-elements-in-test_determinis.patch
 delete mode 100644 meta/recipes-devtools/python/python3/cve-2022-37460.patch
 rename meta/recipes-devtools/python/{python3_3.11.0.bb => python3_3.11.1.bb} (98%)

diff --git a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
index d6d9e451ff..bd696ade92 100644
--- a/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
+++ b/meta/recipes-devtools/python/python3/0001-Don-t-search-system-for-headers-libraries.patch
@@ -1,4 +1,4 @@
-From 910a905aaeb6edb6b042ef65b3e2b73faada80aa Mon Sep 17 00:00:00 2001
+From 32aba1dfba1e27103e7367bbb9e4bef0e31aeac5 Mon Sep 17 00:00:00 2001
 From: Jeremy Puhlman <jpuhlman@mvista.com>
 Date: Wed, 4 Mar 2020 00:06:42 +0000
 Subject: [PATCH] Don't search system for headers/libraries
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
index 5ca855e7ed..cb79d9c671 100644
--- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
+++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
@@ -1,4 +1,4 @@
-From 45548f40668d429adcb7532d35db1ac16fe74562 Mon Sep 17 00:00:00 2001
+From a73020a9c388b4882c384087882a77ab2c7b3729 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 10 Sep 2021 12:28:31 +0200
 Subject: [PATCH] Lib/sysconfig.py: use values from build configuration file
diff --git a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch b/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
deleted file mode 100644
index f303eb35dc..0000000000
--- a/meta/recipes-devtools/python/python3/0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-From d2abe7328cea770425405aa0da2f4c2dac89fcad Mon Sep 17 00:00:00 2001
-From: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
-Date: Fri, 31 May 2019 15:34:34 +0200
-Subject: [PATCH] bpo-36852: proper detection of mips architecture for soft
-
- float
-
-When (cross) compiling for softfloat mips, __mips_hard_float will not be
-defined and detection of OS triplet in configure.ac / configure will fail.
-
-This also has to do with the custom detection of the build triplet. Trying
-to do this in a more autoconf/autotools manner.
-
-Upstream-Status: Submitted [https://github.com/python/cpython/pull/13196]
-Signed-off-by: Matthias Schoepfer <matthias.schoepfer@ithinx.io>
-
----
- configure.ac | 196 ++++++---------------------------------------------
- 1 file changed, 21 insertions(+), 175 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 358b6ea..085fc0b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -907,181 +907,27 @@ then
- fi
- 
- 
--AC_MSG_CHECKING([for the platform triplet based on compiler characteristics])
--cat > conftest.c <<EOF
--#undef bfin
--#undef cris
--#undef fr30
--#undef linux
--#undef hppa
--#undef hpux
--#undef i386
--#undef mips
--#undef powerpc
--#undef sparc
--#undef unix
--#if defined(__ANDROID__)
--    # Android is not a multiarch system.
--#elif defined(__linux__)
--# if defined(__x86_64__) && defined(__LP64__)
--        x86_64-linux-gnu
--# elif defined(__x86_64__) && defined(__ILP32__)
--        x86_64-linux-gnux32
--# elif defined(__i386__)
--        i386-linux-gnu
--# elif defined(__aarch64__) && defined(__AARCH64EL__)
--#  if defined(__ILP32__)
--        aarch64_ilp32-linux-gnu
--#  else
--        aarch64-linux-gnu
--#  endif
--# elif defined(__aarch64__) && defined(__AARCH64EB__)
--#  if defined(__ILP32__)
--        aarch64_be_ilp32-linux-gnu
--#  else
--        aarch64_be-linux-gnu
--#  endif
--# elif defined(__alpha__)
--        alpha-linux-gnu
--# elif defined(__ARM_EABI__) && defined(__ARM_PCS_VFP)
--#  if defined(__ARMEL__)
--        arm-linux-gnueabihf
--#  else
--        armeb-linux-gnueabihf
--#  endif
--# elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP)
--#  if defined(__ARMEL__)
--        arm-linux-gnueabi
--#  else
--        armeb-linux-gnueabi
--#  endif
--# elif defined(__hppa__)
--        hppa-linux-gnu
--# elif defined(__ia64__)
--        ia64-linux-gnu
--# elif defined(__m68k__) && !defined(__mcoldfire__)
--        m68k-linux-gnu
--# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6) && defined(_MIPSEL)
--#  if _MIPS_SIM == _ABIO32
--        mipsisa32r6el-linux-gnu
--#  elif _MIPS_SIM == _ABIN32
--        mipsisa64r6el-linux-gnuabin32
--#  elif _MIPS_SIM == _ABI64
--        mipsisa64r6el-linux-gnuabi64
--#  else
--#   error unknown platform triplet
--#  endif
--# elif defined(__mips_hard_float) && defined(__mips_isa_rev) && (__mips_isa_rev >=6)
--#  if _MIPS_SIM == _ABIO32
--        mipsisa32r6-linux-gnu
--#  elif _MIPS_SIM == _ABIN32
--        mipsisa64r6-linux-gnuabin32
--#  elif _MIPS_SIM == _ABI64
--        mipsisa64r6-linux-gnuabi64
--#  else
--#   error unknown platform triplet
--#  endif
--# elif defined(__mips_hard_float) && defined(_MIPSEL)
--#  if _MIPS_SIM == _ABIO32
--        mipsel-linux-gnu
--#  elif _MIPS_SIM == _ABIN32
--        mips64el-linux-gnuabin32
--#  elif _MIPS_SIM == _ABI64
--        mips64el-linux-gnuabi64
--#  else
--#   error unknown platform triplet
--#  endif
--# elif defined(__mips_hard_float)
--#  if _MIPS_SIM == _ABIO32
--        mips-linux-gnu
--#  elif _MIPS_SIM == _ABIN32
--        mips64-linux-gnuabin32
--#  elif _MIPS_SIM == _ABI64
--        mips64-linux-gnuabi64
--#  else
--#   error unknown platform triplet
--#  endif
--# elif defined(__or1k__)
--        or1k-linux-gnu
--# elif defined(__powerpc__) && defined(__SPE__)
--        powerpc-linux-gnuspe
--# elif defined(__powerpc64__)
--#  if defined(__LITTLE_ENDIAN__)
--        powerpc64le-linux-gnu
--#  else
--        powerpc64-linux-gnu
--#  endif
--# elif defined(__powerpc__)
--        powerpc-linux-gnu
--# elif defined(__s390x__)
--        s390x-linux-gnu
--# elif defined(__s390__)
--        s390-linux-gnu
--# elif defined(__sh__) && defined(__LITTLE_ENDIAN__)
--        sh4-linux-gnu
--# elif defined(__sparc__) && defined(__arch64__)
--        sparc64-linux-gnu
--# elif defined(__sparc__)
--        sparc-linux-gnu
--# elif defined(__riscv)
--#  if __riscv_xlen == 32
--        riscv32-linux-gnu
--#  elif __riscv_xlen == 64
--        riscv64-linux-gnu
--#  else
--#   error unknown platform triplet
--#  endif
--# else
--#   error unknown platform triplet
--# endif
--#elif defined(__FreeBSD_kernel__)
--# if defined(__LP64__)
--        x86_64-kfreebsd-gnu
--# elif defined(__i386__)
--        i386-kfreebsd-gnu
--# else
--#   error unknown platform triplet
--# endif
--#elif defined(__gnu_hurd__)
--        i386-gnu
--#elif defined(__APPLE__)
--        darwin
--#elif defined(__VXWORKS__)
--        vxworks
--#elif defined(__wasm32__)
--#  if defined(__EMSCRIPTEN__)
--	wasm32-emscripten
--#  elif defined(__wasi__)
--	wasm32-wasi
--#  else
--#    error unknown wasm32 platform
--#  endif
--#elif defined(__wasm64__)
--#  if defined(__EMSCRIPTEN)
--	wasm64-emscripten
--#  elif defined(__wasi__)
--	wasm64-wasi
--#  else
--#    error unknown wasm64 platform
--#  endif
--#else
--# error unknown platform triplet
--#endif
--
--EOF
--
--if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
--  PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' 	'`
--  case "$build_os" in
--  linux-musl*)
--    PLATFORM_TRIPLET=`echo "$PLATFORM_TRIPLET" | sed 's/linux-gnu/linux-musl/'`
--    ;;
--  esac
--  AC_MSG_RESULT([$PLATFORM_TRIPLET])
--else
--  AC_MSG_RESULT([none])
--fi
--rm -f conftest.c conftest.out
-+AC_CANONICAL_TARGET
-+## Not using $target to filter out vendor
-+## Need to handle macos, vxworks and hurd special (?) :-/
-+case ${target_os} in
-+     darwin*)
-+     	PLATFORM_TRIPLET=darwin
-+	;;
-+     hurd*)
-+     	PLATFORM_TRIPLET=i386-gnu
-+	;;
-+     vxworks*)
-+     	PLATFORM_TRIPLET=vxworks
-+	;;
-+     *)
-+        if test "${target_cpu}" != "i686"; then
-+		PLATFORM_TRIPLET=${target_cpu}-${target_os}
-+	else
-+		PLATFORM_TRIPLET=i386-${target_os}
-+	fi
-+	;;
-+esac	
- 
- AC_MSG_CHECKING([for multiarch])
- AS_CASE([$ac_sys_system],
diff --git a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
index 4d589dd759..ef8edca51f 100644
--- a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
+++ b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch
@@ -1,4 +1,4 @@
-From 175ed10e0a59a5395546ef88702f23d100b909f9 Mon Sep 17 00:00:00 2001
+From 4ba40ee527f844a804be571e52d9dc5447ae4cdd Mon Sep 17 00:00:00 2001
 From: Changqing Li <changqing.li@windriver.com>
 Date: Mon, 22 Oct 2018 15:19:51 +0800
 Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler
@@ -27,7 +27,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  1 file changed, 10 insertions(+), 9 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 77fb609..358b6ea 100644
+index 90008bc..bf56195 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -134,6 +134,7 @@ AC_CONFIG_HEADERS([pyconfig.h])
@@ -38,7 +38,7 @@ index 77fb609..358b6ea 100644
  
  AS_VAR_IF([cross_compiling], [maybe],
   [AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])]
-@@ -877,7 +878,7 @@ AC_MSG_RESULT($with_cxx_main)
+@@ -887,7 +888,7 @@ AC_MSG_RESULT($with_cxx_main)
  preset_cxx="$CXX"
  if test -z "$CXX"
  then
@@ -47,7 +47,7 @@ index 77fb609..358b6ea 100644
          gcc)    AC_PATH_TOOL(CXX, [g++], [g++], [notfound]) ;;
          cc)     AC_PATH_TOOL(CXX, [c++], [c++], [notfound]) ;;
          clang|*/clang)     AC_PATH_TOOL(CXX, [clang++], [clang++], [notfound]) ;;
-@@ -1290,7 +1291,7 @@ rmdir CaseSensitiveTestDir
+@@ -1300,7 +1301,7 @@ rmdir CaseSensitiveTestDir
  
  case $ac_sys_system in
  hp*|HP*)
@@ -56,16 +56,16 @@ index 77fb609..358b6ea 100644
      cc|*/cc) CC="$CC -Ae";;
      esac;;
  esac
-@@ -1798,7 +1799,7 @@ esac
+@@ -1834,7 +1835,7 @@ esac
  ],
  [AC_MSG_RESULT(no)])
  if test "$Py_LTO" = 'true' ; then
 -  case $CC in
 +  case $cc_basename in
      *clang*)
-       dnl flag to disable lto during linking
        LDFLAGS_NOLTO="-fno-lto"
-@@ -1917,7 +1918,7 @@ then
+       dnl Clang linker requires -flto in order to link objects with LTO information.
+@@ -1955,7 +1956,7 @@ then
    fi
  fi
  LLVM_PROF_ERR=no
@@ -74,7 +74,7 @@ index 77fb609..358b6ea 100644
    *clang*)
      # Any changes made here should be reflected in the GCC+Darwin case below
      PGO_PROF_GEN_FLAG="-fprofile-instr-generate"
-@@ -1978,7 +1979,7 @@ esac
+@@ -2016,7 +2017,7 @@ esac
  # compiler and platform.  BASECFLAGS tweaks need to be made even if the
  # user set OPT.
  
@@ -83,7 +83,7 @@ index 77fb609..358b6ea 100644
      *clang*)
          cc_is_clang=1
          ;;
-@@ -2197,7 +2198,7 @@ yes)
+@@ -2235,7 +2236,7 @@ yes)
  
      # ICC doesn't recognize the option, but only emits a warning
      ## XXX does it emit an unused result warning and can it be disabled?
@@ -92,7 +92,7 @@ index 77fb609..358b6ea 100644
              [*icc*], [ac_cv_disable_unused_result_warning=no]
              [PY_CHECK_CC_WARNING([disable], [unused-result])])
      AS_VAR_IF([ac_cv_disable_unused_result_warning], [yes],
-@@ -2439,7 +2440,7 @@ yes)
+@@ -2477,7 +2478,7 @@ yes)
      ;;
  esac
  
@@ -101,7 +101,7 @@ index 77fb609..358b6ea 100644
  *icc*)
      # ICC needs -fp-model strict or floats behave badly
      CFLAGS_NODIST="$CFLAGS_NODIST -fp-model strict"
-@@ -3281,7 +3282,7 @@ then
+@@ -3319,7 +3320,7 @@ then
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
  		fi;;
@@ -110,7 +110,7 @@ index 77fb609..358b6ea 100644
  		  *gcc*)
  		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
  		    then
-@@ -6370,7 +6371,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then
+@@ -6410,7 +6411,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then
      # Some versions of gcc miscompile inline asm:
      # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491
      # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html
diff --git a/meta/recipes-devtools/python/python3/0001-test_marshal.py-add-more-elements-in-test_determinis.patch b/meta/recipes-devtools/python/python3/0001-test_marshal.py-add-more-elements-in-test_determinis.patch
deleted file mode 100644
index 9da7f94255..0000000000
--- a/meta/recipes-devtools/python/python3/0001-test_marshal.py-add-more-elements-in-test_determinis.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 076a4f9ab06105b94c87386c0dfe17b823502a13 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Thu, 1 Dec 2022 19:02:51 +0100
-Subject: [PATCH] test_marshal.py: add more elements in test_deterministic_sets
-
-Existing elements do produce different output on x86_64, but they
-do not on x86. Let's make the data longer to ensure it differs.
-
-Upstream-Status: Submitted [https://github.com/python/cpython/pull/99935]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- Lib/test/test_marshal.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py
-index aae86cc..29d95ad 100644
---- a/Lib/test/test_marshal.py
-+++ b/Lib/test/test_marshal.py
-@@ -352,7 +352,7 @@ class BugsTestCase(unittest.TestCase):
-             for elements in (
-                 "float('nan'), b'a', b'b', b'c', 'x', 'y', 'z'",
-                 # Also test for bad interactions with backreferencing:
--                "('Spam', 0), ('Spam', 1), ('Spam', 2)",
-+                "('Spam', 0), ('Spam', 1), ('Spam', 2), ('Spam', 3), ('Spam', 4), ('Spam', 5)",
-             ):
-                 s = f"{kind}([{elements}])"
-                 with self.subTest(s):
diff --git a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
index 7b497b83ca..1879024e16 100644
--- a/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
+++ b/meta/recipes-devtools/python/python3/12-distutils-prefix-is-inside-staging-area.patch
@@ -1,4 +1,4 @@
-From 2918d431cb5607933755fc80a6220135dd7fcb1d Mon Sep 17 00:00:00 2001
+From 3bdf292be303e239e78ed39dd8106fbd5f7ee645 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 14 May 2013 15:00:26 -0700
 Subject: [PATCH] python3: Add target and native recipes
diff --git a/meta/recipes-devtools/python/python3/cve-2022-37460.patch b/meta/recipes-devtools/python/python3/cve-2022-37460.patch
deleted file mode 100644
index 12177684fd..0000000000
--- a/meta/recipes-devtools/python/python3/cve-2022-37460.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 94582bb643f98bc58b1ff206d1d2a56f97c3a7e5 Mon Sep 17 00:00:00 2001
-From: "Miss Islington (bot)"
- <31488909+miss-islington@users.noreply.github.com>
-Date: Wed, 28 Sep 2022 16:46:11 -0700
-Subject: [PATCH] gh-97612: Fix shell injection in get-remote-certificate.py
- (GH-97613)
-
-Fix a shell code injection vulnerability in the
-get-remote-certificate.py example script. The script no longer uses a
-shell to run "openssl" commands. Issue reported and initial fix by
-Caleb Shortt.
-
-Remove the Windows code path to send "quit" on stdin to the "openssl
-s_client" command: use DEVNULL on all platforms instead.
-
-Co-authored-by: Caleb Shortt <caleb@rgauge.com>
-(cherry picked from commit 83a0f44ffd8b398673ae56c310cf5768d359c341)
-
-Co-authored-by: Victor Stinner <vstinner@python.org>
----
-CVE: CVE-2022-37460
-
-Upstream-Status: Backport [https://github.com/python/cpython.git]
-                          [commit 94582bb643... unmodified]
-
-Signed-off-by: Joe Slater <joe.slater@windriver.com>
-
----
- ...2-09-28-12-10-57.gh-issue-97612.y6NvOQ.rst |  3 +++
- Tools/scripts/get-remote-certificate.py       | 25 ++++++-------------
- 2 files changed, 10 insertions(+), 18 deletions(-)
- create mode 100644 Misc/NEWS.d/next/Security/2022-09-28-12-10-57.gh-issue-97612.y6NvOQ.rst
-
-diff --git a/Misc/NEWS.d/next/Security/2022-09-28-12-10-57.gh-issue-97612.y6NvOQ.rst b/Misc/NEWS.d/next/Security/2022-09-28-12-10-57.gh-issue-97612.y6NvOQ.rst
-new file mode 100644
-index 0000000000..2f113492d4
---- /dev/null
-+++ b/Misc/NEWS.d/next/Security/2022-09-28-12-10-57.gh-issue-97612.y6NvOQ.rst
-@@ -0,0 +1,3 @@
-+Fix a shell code injection vulnerability in the ``get-remote-certificate.py``
-+example script. The script no longer uses a shell to run ``openssl`` commands.
-+Issue reported and initial fix by Caleb Shortt. Patch by Victor Stinner.
-diff --git a/Tools/scripts/get-remote-certificate.py b/Tools/scripts/get-remote-certificate.py
-index 38901286e1..68272fca83 100755
---- a/Tools/scripts/get-remote-certificate.py
-+++ b/Tools/scripts/get-remote-certificate.py
-@@ -15,8 +15,8 @@
- def fetch_server_certificate (host, port):
- 
-     def subproc(cmd):
--        from subprocess import Popen, PIPE, STDOUT
--        proc = Popen(cmd, stdout=PIPE, stderr=STDOUT, shell=True)
-+        from subprocess import Popen, PIPE, STDOUT, DEVNULL
-+        proc = Popen(cmd, stdout=PIPE, stderr=STDOUT, stdin=DEVNULL)
-         status = proc.wait()
-         output = proc.stdout.read()
-         return status, output
-@@ -33,8 +33,8 @@ def strip_to_x509_cert(certfile_contents, outfile=None):
-                 fp.write(m.group(1) + b"\n")
-             try:
-                 tn2 = (outfile or tempfile.mktemp())
--                status, output = subproc(r'openssl x509 -in "%s" -out "%s"' %
--                                         (tn, tn2))
-+                cmd = ['openssl', 'x509', '-in', tn, '-out', tn2]
-+                status, output = subproc(cmd)
-                 if status != 0:
-                     raise RuntimeError('OpenSSL x509 failed with status %s and '
-                                        'output: %r' % (status, output))
-@@ -45,20 +45,9 @@ def strip_to_x509_cert(certfile_contents, outfile=None):
-             finally:
-                 os.unlink(tn)
- 
--    if sys.platform.startswith("win"):
--        tfile = tempfile.mktemp()
--        with open(tfile, "w") as fp:
--            fp.write("quit\n")
--        try:
--            status, output = subproc(
--                'openssl s_client -connect "%s:%s" -showcerts < "%s"' %
--                (host, port, tfile))
--        finally:
--            os.unlink(tfile)
--    else:
--        status, output = subproc(
--            'openssl s_client -connect "%s:%s" -showcerts < /dev/null' %
--            (host, port))
-+    cmd = ['openssl', 's_client', '-connect', '%s:%s' % (host, port), '-showcerts']
-+    status, output = subproc(cmd)
-+
-     if status != 0:
-         raise RuntimeError('OpenSSL connect failed with status %s and '
-                            'output: %r' % (status, output))
--- 
-2.38.1
-
diff --git a/meta/recipes-devtools/python/python3_3.11.0.bb b/meta/recipes-devtools/python/python3_3.11.1.bb
similarity index 98%
rename from meta/recipes-devtools/python/python3_3.11.0.bb
rename to meta/recipes-devtools/python/python3_3.11.1.bb
index ff25fe1ac4..37092d30d2 100644
--- a/meta/recipes-devtools/python/python3_3.11.0.bb
+++ b/meta/recipes-devtools/python/python3_3.11.1.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Python is a programming language that lets you work more quickly
 LICENSE = "PSF-2.0"
 SECTION = "devel/python"
 
-LIC_FILES_CHKSUM = "file://LICENSE;md5=4b8801e752a2c70ac41a5f9aa243f766"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=a1822df8d0f068628ca6090aedc5bfc8"
 
 SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://run-ptest \
@@ -18,7 +18,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            ${@bb.utils.contains('PACKAGECONFIG', 'tk', '', 'file://avoid_warning_about_tkinter.patch', d)} \
            file://0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch \
            file://0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch \
-           file://0001-bpo-36852-proper-detection-of-mips-architecture-for-.patch \
            file://crosspythonpath.patch \
            file://0001-test_locale.py-correct-the-test-output-format.patch \
            file://0017-setup.py-do-not-report-missing-dependencies-for-disa.patch \
@@ -32,8 +31,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0001-setup.py-Do-not-detect-multiarch-paths-when-cross-co.patch \
            file://deterministic_imports.patch \
            file://0001-Avoid-shebang-overflow-on-python-config.py.patch \
-           file://cve-2022-37460.patch \
-           file://0001-test_marshal.py-add-more-elements-in-test_determinis.patch \
            "
 
 SRC_URI:append:class-native = " \
@@ -41,7 +38,7 @@ SRC_URI:append:class-native = " \
            file://12-distutils-prefix-is-inside-staging-area.patch \
            file://0001-Don-t-search-system-for-headers-libraries.patch \
            "
-SRC_URI[sha256sum] = "a57dc82d77358617ba65b9841cee1e3b441f386c3789ddc0676eca077f2951c3"
+SRC_URI[sha256sum] = "85879192f2cffd56cb16c092905949ebf3e5e394b7f764723529637901dfb58f"
 
 # exclude pre-releases for both python 2.x and 3.x
 UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
-- 
2.30.2

[PATCH 05/25] weston: update 11.0.0 -> 11.0.1

[Alexander Kanavin]

Upstream has published the tarball in a non-standard location. If
this persists, we might want to switch to git.

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

diff --git a/meta/recipes-graphics/wayland/weston_11.0.0.bb b/meta/recipes-graphics/wayland/weston_11.0.1.bb
similarity index 96%
rename from meta/recipes-graphics/wayland/weston_11.0.0.bb
rename to meta/recipes-graphics/wayland/weston_11.0.1.bb
index ba4f4062d0..b943842bc4 100644
--- a/meta/recipes-graphics/wayland/weston_11.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_11.0.1.bb
@@ -6,14 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \
                     file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \
                     "
 
-SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \
+SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/uploads/f5648c818fba5432edc3ea63c4db4813/${BPN}-${PV}.tar.xz \
            file://weston.png \
            file://weston.desktop \
            file://xwayland.weston-start \
            file://systemd-notify.weston-start \
            "
 
-SRC_URI[sha256sum] = "a6138d4dc9554560ac304312df456019f4be025ec79130f05fb5f2e41c091e1d"
+SRC_URI[sha256sum] = "a413f68c252957fc3191c3650823ec356ae8c124ccc0cb440da5cdc4e2cb9e57"
 
 UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html"
 UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)"
-- 
2.30.2

[PATCH 06/25] xhost: update 1.0.8 -> 1.0.9

[Alexander Kanavin]

gettext-native is needed for xgettext executable.

License-Update: copyright years

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-app/{xhost_1.0.8.bb => xhost_1.0.9.bb}          | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xhost_1.0.8.bb => xhost_1.0.9.bb} (72%)

diff --git a/meta/recipes-graphics/xorg-app/xhost_1.0.8.bb b/meta/recipes-graphics/xorg-app/xhost_1.0.9.bb
similarity index 72%
rename from meta/recipes-graphics/xorg-app/xhost_1.0.8.bb
rename to meta/recipes-graphics/xorg-app/xhost_1.0.9.bb
index 26bec3f0dd..d54e6cae65 100644
--- a/meta/recipes-graphics/xorg-app/xhost_1.0.8.bb
+++ b/meta/recipes-graphics/xorg-app/xhost_1.0.9.bb
@@ -9,12 +9,13 @@ and security. Environments which require more sophisticated measures \
 should implement the user-based mechanism or use the hooks in the \
 protocol for passing other authentication data to the server."
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199"
-DEPENDS += "libxmu libxau"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b1f81049109f21bb3c365d9f42f79f3b"
+DEPENDS += "libxmu libxau gettext-native"
 PE = "1"
 
-SRC_URI[md5sum] = "a48c72954ae6665e0616f6653636da8c"
-SRC_URI[sha256sum] = "a2dc3c579e13674947395ef8ccc1b3763f89012a216c2cc6277096489aadc396"
+SRC_URI_EXT = "xz"
+
+SRC_URI[sha256sum] = "ea86b531462035b19a2e5e01ef3d9a35cca7d984086645e2fc844d8f0e346645"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-- 
2.30.2

[PATCH 07/25] xinit: update 1.4.1 -> 1.4.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-app/{xinit_1.4.1.bb => xinit_1.4.2.bb}              | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xinit_1.4.1.bb => xinit_1.4.2.bb} (83%)

diff --git a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb b/meta/recipes-graphics/xorg-app/xinit_1.4.2.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-app/xinit_1.4.1.bb
rename to meta/recipes-graphics/xorg-app/xinit_1.4.2.bb
index e6ebf273e8..82c0b0d833 100644
--- a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb
+++ b/meta/recipes-graphics/xorg-app/xinit_1.4.2.bb
@@ -14,8 +14,9 @@ PE = "1"
 
 SRC_URI += "file://0001-Make-manpage-multilib-identical.patch"
 
-SRC_URI[md5sum] = "6d506ab2efc17a08e87778654e099d37"
-SRC_URI[sha256sum] = "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9"
+SRC_URI_EXT = "xz"
+
+SRC_URI[sha256sum] = "b7d8dc8d22ef9f15985a10b606ee4f2aad6828befa437359934647e88d331f23"
 
 EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie"
 
-- 
2.30.2

[PATCH 08/25] xkbcomp: update 1.4.5 -> 1.4.6

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-app/{xkbcomp_1.4.5.bb => xkbcomp_1.4.6.bb}            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta/recipes-graphics/xorg-app/{xkbcomp_1.4.5.bb => xkbcomp_1.4.6.bb} (83%)

diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.4.5.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.4.6.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-app/xkbcomp_1.4.5.bb
rename to meta/recipes-graphics/xorg-app/xkbcomp_1.4.6.bb
index 657ec7580d..44f462f523 100644
--- a/meta/recipes-graphics/xorg-app/xkbcomp_1.4.5.bb
+++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.4.6.bb
@@ -15,4 +15,5 @@ BBCLASSEXTEND = "native"
 
 EXTRA_OECONF += "--disable-selective-werror"
 
-SRC_URI[sha256sum] = "6851086c4244b6fd0cc562880d8ff193fb2bbf1e141c73632e10731b31d4b05e"
+SRC_URI_EXT = "xz"
+SRC_URI[sha256sum] = "fa50d611ef41e034487af7bd8d8c718df53dd18002f591cca16b0384afc58e98"
-- 
2.30.2

[PATCH 09/25] xprop: update 1.2.5 -> 1.2.6

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-app/{xprop_1.2.5.bb => xprop_1.2.6.bb}                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta/recipes-graphics/xorg-app/{xprop_1.2.5.bb => xprop_1.2.6.bb} (82%)

diff --git a/meta/recipes-graphics/xorg-app/xprop_1.2.5.bb b/meta/recipes-graphics/xorg-app/xprop_1.2.6.bb
similarity index 82%
rename from meta/recipes-graphics/xorg-app/xprop_1.2.5.bb
rename to meta/recipes-graphics/xorg-app/xprop_1.2.6.bb
index b1589a8d75..438a897f1e 100644
--- a/meta/recipes-graphics/xorg-app/xprop_1.2.5.bb
+++ b/meta/recipes-graphics/xorg-app/xprop_1.2.6.bb
@@ -14,4 +14,5 @@ DEPENDS += "libxmu"
 
 PE = "1"
 
-SRC_URI[sha256sum] = "9b92ed0316bf2486121d8bac88bd1878f16b43bd335f18009b1f941f1eca93a1"
+SRC_URI_EXT = "xz"
+SRC_URI[sha256sum] = "580b8525b12ecc0144aa16c88b0aafa76d2e799b44c8c6c50f9ce92788b5586e"
-- 
2.30.2

[PATCH 10/25] xset: update 1.2.4 -> 1.2.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-app/xset/disable-xkb.patch           | 23 ++++++++++++-------
 .../xorg-app/{xset_1.2.4.bb => xset_1.2.5.bb} |  5 ++--
 2 files changed, 18 insertions(+), 10 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xset_1.2.4.bb => xset_1.2.5.bb} (76%)

diff --git a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
index a97c7b72fa..0bb05a3b88 100644
--- a/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
+++ b/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch
@@ -1,14 +1,21 @@
-add "-disable-xkb" option
+From 3090dcafac7c8080091b5e3e3720209c65251a1a Mon Sep 17 00:00:00 2001
+From: Richard Purdie <richard@openedhand.com>
+Date: Mon, 22 May 2006 22:15:57 +0000
+Subject: [PATCH] add "-disable-xkb" option
 
 Upstream-Status: Pending
 
 Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com>
 
-Index: xset-1.2.3/configure.ac
-===================================================================
---- xset-1.2.3.orig/configure.ac
-+++ xset-1.2.3/configure.ac
-@@ -53,11 +53,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext,
+---
+ configure.ac | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index e7c2bdf..8e1ed5e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext,
  	AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>])
  	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
  
@@ -22,5 +29,5 @@ Index: xset-1.2.3/configure.ac
  	CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
 +fi
  
- AC_ARG_WITH(xf86misc, AS_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]),
-                 [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"])
+ AC_ARG_WITH(xf86misc, AS_HELP_STRING([--with-xf86misc],[Enable xf86misc support.]),
+                 [USE_XF86MISC="$withval"], [USE_XF86MISC="no"])
diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.4.bb b/meta/recipes-graphics/xorg-app/xset_1.2.5.bb
similarity index 76%
rename from meta/recipes-graphics/xorg-app/xset_1.2.4.bb
rename to meta/recipes-graphics/xorg-app/xset_1.2.5.bb
index e21120e788..398530f342 100644
--- a/meta/recipes-graphics/xorg-app/xset_1.2.4.bb
+++ b/meta/recipes-graphics/xorg-app/xset_1.2.5.bb
@@ -12,8 +12,9 @@ PE = "1"
 
 SRC_URI += "file://disable-xkb.patch"
 
-SRC_URI[md5sum] = "70ea7bc7bacf1a124b1692605883f620"
-SRC_URI[sha256sum] = "e4fd95280df52a88e9b0abc1fee11dcf0f34fc24041b9f45a247e52df941c957"
+SRC_URI_EXT = "xz"
+
+SRC_URI[sha256sum] = "9f692d55635b3862cd63633b1222a87680ec283c7a8e8ed6dd698a3147f75e2f"
 
 CFLAGS += "-D_GNU_SOURCE"
 EXTRA_OECONF = "--disable-xkb --without-fontcache"
-- 
2.30.2

[PATCH 11/25] xvinfo: update 1.1.4 -> 1.1.5

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-app/{xvinfo_1.1.4.bb => xvinfo_1.1.5.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-app/{xvinfo_1.1.4.bb => xvinfo_1.1.5.bb} (71%)

diff --git a/meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb b/meta/recipes-graphics/xorg-app/xvinfo_1.1.5.bb
similarity index 71%
rename from meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb
rename to meta/recipes-graphics/xorg-app/xvinfo_1.1.5.bb
index a913ae11f3..d7e5d917ef 100644
--- a/meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb
+++ b/meta/recipes-graphics/xorg-app/xvinfo_1.1.5.bb
@@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b664101ad7a1dc758a4c4109bf978e68"
 DEPENDS += " libxv"
 PE = "1"
 
-SRC_URI[md5sum] = "b13afec137b9b331814a9824ab03ec80"
-SRC_URI[sha256sum] = "0353220d6606077ba42363db65f50410759f9815352f77adc799e2adfa76e73f"
+SRC_URI_EXT = "xz"
+SRC_URI[sha256sum] = "3ede71ecb26d9614ccbc6916720285e95a2c7e0c5e19b8570eaaf72ad7c5c404"
-- 
2.30.2

[PATCH 12/25] xf86-video-vesa: update 2.5.0 -> 2.6.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{xf86-video-vesa_2.5.0.bb => xf86-video-vesa_2.6.0.bb}     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta/recipes-graphics/xorg-driver/{xf86-video-vesa_2.5.0.bb => xf86-video-vesa_2.6.0.bb} (81%)

diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.6.0.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.6.0.bb
index 05bb905b35..33c2035f6b 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.5.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.6.0.bb
@@ -15,5 +15,6 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 RRECOMMENDS:${PN} += "xserver-xorg-module-libint10"
 
-SRC_URI[sha256sum] = "1f1624f3c73906801ad1bc98335a2cb5676a7a4d18e5374d9a1d18464e54c659"
+XORG_DRIVER_COMPRESSOR = ".tar.xz"
+SRC_URI[sha256sum] = "10082771b1a8f659c60b3d9b70456a4b59948a75b3cade2dfa33b8b05e549bb1"
 
-- 
2.30.2

[PATCH 13/25] libice: update 1.0.10 -> 1.1.1

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-lib/{libice_1.0.10.bb => libice_1.1.1.bb}            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libice_1.0.10.bb => libice_1.1.1.bb} (85%)

diff --git a/meta/recipes-graphics/xorg-lib/libice_1.0.10.bb b/meta/recipes-graphics/xorg-lib/libice_1.1.1.bb
similarity index 85%
rename from meta/recipes-graphics/xorg-lib/libice_1.0.10.bb
rename to meta/recipes-graphics/xorg-lib/libice_1.1.1.bb
index 44339eb27a..5c8f732fa3 100644
--- a/meta/recipes-graphics/xorg-lib/libice_1.0.10.bb
+++ b/meta/recipes-graphics/xorg-lib/libice_1.1.1.bb
@@ -20,8 +20,8 @@ XORG_PN = "libICE"
 
 BBCLASSEXTEND = "native nativesdk"
 
-SRC_URI[md5sum] = "76d77499ee7120a56566891ca2c0dbcf"
-SRC_URI[sha256sum] = "6f86dce12cf4bcaf5c37dddd8b1b64ed2ddf1ef7b218f22b9942595fb747c348"
+XORG_EXT = "tar.xz"
+SRC_URI[sha256sum] = "03e77afaf72942c7ac02ccebb19034e6e20f456dcf8dddadfeb572aa5ad3e451"
 
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd"
-- 
2.30.2

[PATCH 14/25] libxcomposite: update 0.4.5 -> 0.4.6

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{libxcomposite_0.4.5.bb => libxcomposite_0.4.6.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxcomposite_0.4.5.bb => libxcomposite_0.4.6.bb} (86%)

diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.5.bb b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb
similarity index 86%
rename from meta/recipes-graphics/xorg-lib/libxcomposite_0.4.5.bb
rename to meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb
index c07f31b92d..cd7d56e810 100644
--- a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.6.bb
@@ -24,5 +24,5 @@ XORG_PN = "libXcomposite"
 
 SRC_URI += " file://change-include-order.patch"
 
-SRC_URI[md5sum] = "3fa0841ea89024719b20cd702a9b54e0"
-SRC_URI[sha256sum] = "b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f"
+XORG_EXT = "tar.xz"
+SRC_URI[sha256sum] = "fe40bcf0ae1a09070eba24088a5eb9810efe57453779ec1e20a55080c6dc2c87"
-- 
2.30.2

[PATCH 15/25] libxdamage: update 1.1.5 -> 1.1.6

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-lib/{libxdamage_1.1.5.bb => libxdamage_1.1.6.bb}     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxdamage_1.1.5.bb => libxdamage_1.1.6.bb} (87%)

diff --git a/meta/recipes-graphics/xorg-lib/libxdamage_1.1.5.bb b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.6.bb
similarity index 87%
rename from meta/recipes-graphics/xorg-lib/libxdamage_1.1.5.bb
rename to meta/recipes-graphics/xorg-lib/libxdamage_1.1.6.bb
index b201124d86..1d297ecd80 100644
--- a/meta/recipes-graphics/xorg-lib/libxdamage_1.1.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.6.bb
@@ -23,7 +23,7 @@ PE = "1"
 
 XORG_PN = "libXdamage"
 
-SRC_URI[md5sum] = "e3f554267a7a04b042dc1f6352bd6d99"
-SRC_URI[sha256sum] = "b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45"
+XORG_EXT = "tar.xz"
+SRC_URI[sha256sum] = "52733c1f5262fca35f64e7d5060c6fcd81a880ba8e1e65c9621cf0727afb5d11"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.30.2

[PATCH 16/25] libxres: update 1.2.1 -> 1.2.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-lib/{libxres_1.2.1.bb => libxres_1.2.2.bb}            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta/recipes-graphics/xorg-lib/{libxres_1.2.1.bb => libxres_1.2.2.bb} (81%)

diff --git a/meta/recipes-graphics/xorg-lib/libxres_1.2.1.bb b/meta/recipes-graphics/xorg-lib/libxres_1.2.2.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-lib/libxres_1.2.1.bb
rename to meta/recipes-graphics/xorg-lib/libxres_1.2.2.bb
index 29a799a328..cddecbb9d2 100644
--- a/meta/recipes-graphics/xorg-lib/libxres_1.2.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxres_1.2.2.bb
@@ -16,4 +16,5 @@ PE = "1"
 
 XORG_PN = "libXres"
 
-SRC_URI[sha256sum] = "b6e6fb1ebb61610e56017edd928fb89a5f53b3f4f990078309877468663b2b11"
+XORG_EXT = "tar.xz"
+SRC_URI[sha256sum] = "9a7446f3484b9b7538ac5ee30d2c1ce9e5b7fbbaf1440e02f6cca186a1fa745f"
-- 
2.30.2

[PATCH 17/25] libxscrnsaver: update 1.2.3 -> 1.2.4

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../{libxscrnsaver_1.2.3.bb => libxscrnsaver_1.2.4.bb}        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxscrnsaver_1.2.3.bb => libxscrnsaver_1.2.4.bb} (83%)

diff --git a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.4.bb
similarity index 83%
rename from meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb
rename to meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.4.bb
index b52fd00f1a..b69727b696 100644
--- a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.4.bb
@@ -19,5 +19,5 @@ PE = "1"
 
 XORG_PN = "libXScrnSaver"
 
-SRC_URI[md5sum] = "eeea9d5af3e6c143d0ea1721d27a5e49"
-SRC_URI[sha256sum] = "f917075a1b7b5a38d67a8b0238eaab14acd2557679835b154cf2bca576e89bf8"
+XORG_EXT = "tar.xz"
+SRC_URI[sha256sum] = "75cd2859f38e207a090cac980d76bc71e9da99d48d09703584e00585abc920fe"
-- 
2.30.2

[PATCH 18/25] libxv: update 1.0.11 -> 1.0.12

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../xorg-lib/{libxv_1.0.11.bb => libxv_1.0.12.bb}             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/xorg-lib/{libxv_1.0.11.bb => libxv_1.0.12.bb} (77%)

diff --git a/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb b/meta/recipes-graphics/xorg-lib/libxv_1.0.12.bb
similarity index 77%
rename from meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb
rename to meta/recipes-graphics/xorg-lib/libxv_1.0.12.bb
index 3c8bf08153..c587000c28 100644
--- a/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb
+++ b/meta/recipes-graphics/xorg-lib/libxv_1.0.12.bb
@@ -14,6 +14,6 @@ DEPENDS += "libxext xorgproto"
 
 XORG_PN = "libXv"
 
-SRC_URI[md5sum] = "210b6ef30dda2256d54763136faa37b9"
-SRC_URI[sha256sum] = "d26c13eac99ac4504c532e8e76a1c8e4bd526471eb8a0a4ff2a88db60cb0b088"
+XORG_EXT = "tar.xz"
+SRC_URI[sha256sum] = "aaf7fa09f689f7a2000fe493c0d64d1487a1210db154053e9e2336b860c63848"
 
-- 
2.30.2

[PATCH 19/25] jquery: upgrade 3.6.1 -> 3.6.2

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../jquery/{jquery_3.6.1.bb => jquery_3.6.2.bb}             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/jquery/{jquery_3.6.1.bb => jquery_3.6.2.bb} (81%)

diff --git a/meta/recipes-devtools/jquery/jquery_3.6.1.bb b/meta/recipes-devtools/jquery/jquery_3.6.2.bb
similarity index 81%
rename from meta/recipes-devtools/jquery/jquery_3.6.1.bb
rename to meta/recipes-devtools/jquery/jquery_3.6.2.bb
index a474889099..fe6c57d206 100644
--- a/meta/recipes-devtools/jquery/jquery_3.6.1.bb
+++ b/meta/recipes-devtools/jquery/jquery_3.6.2.bb
@@ -13,9 +13,9 @@ SRC_URI = "\
     https://code.jquery.com/${BP}.min.map;name=map;subdir=${BP} \
     "
 
-SRC_URI[js.sha256sum] = "df3941e6cdaec28533ad72b7053ec05f7172be88ecada345c42736bc2ffba4d2"
-SRC_URI[min.sha256sum] = "a3cf00c109d907e543bc4f6dbc85eb31068f94515251347e9e57509b52ee3d74"
-SRC_URI[map.sha256sum] = "856ee620cebac56e872d6e99b09de05f81ccd3f3dc346e9b55eb694611a6d5e1"
+SRC_URI[js.sha256sum] = "a649f609466685e49ecacb18c37bcca75fb1cae6f89be7be40ae2c42c92fba8e"
+SRC_URI[min.sha256sum] = "da4ad864a87ffcf71c851b5df87f95cb242867f7b711cae4c6133cc9cc0048f0"
+SRC_URI[map.sha256sum] = "f46902fc1b81c286e51f4eb4812382ee9eedba0e9fc855e4dc3af59e0c57f404"
 
 UPSTREAM_CHECK_REGEX = "jquery-(?P<pver>\d+(\.\d+)+)\.js"
 
-- 
2.30.2

[PATCH 20/25] libmodule-build-perl: update 0.4231 -> 0.4232

[Alexander Kanavin]

License-Update: formatting, position of the license statement moved in the README

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...e-build-perl_0.4231.bb => libmodule-build-perl_0.4232.bb} | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta/recipes-devtools/perl/{libmodule-build-perl_0.4231.bb => libmodule-build-perl_0.4232.bb} (94%)

diff --git a/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb b/meta/recipes-devtools/perl/libmodule-build-perl_0.4232.bb
similarity index 94%
rename from meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb
rename to meta/recipes-devtools/perl/libmodule-build-perl_0.4232.bb
index 881d5e672e..748412b414 100644
--- a/meta/recipes-devtools/perl/libmodule-build-perl_0.4231.bb
+++ b/meta/recipes-devtools/perl/libmodule-build-perl_0.4232.bb
@@ -11,13 +11,12 @@ SECTION = "libs"
 HOMEPAGE = "https://metacpan.org/release/Module-Build"
 
 LICENSE = "Artistic-1.0 | GPL-1.0-or-later"
-LIC_FILES_CHKSUM = "file://README;beginline=949;endline=954;md5=624c06db56a2af4d70cf9edc29fcae1b"
+LIC_FILES_CHKSUM = "file://README;beginline=881;endline=886;md5=3027f56c664545e54678c26b7f1ac19c"
 
 SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Module-Build-${PV}.tar.gz \
            file://run-ptest \
            "
-SRC_URI[md5sum] = "066b193e461d7dfe1eca17a139353001"
-SRC_URI[sha256sum] = "7e0f4c692c1740c1ac84ea14d7ea3d8bc798b2fb26c09877229e04f430b2b717"
+SRC_URI[sha256sum] = "67c82ee245d94ba06decfa25572ab75fdcd26a9009094289d8f45bc54041771b"
 
 S = "${WORKDIR}/Module-Build-${PV}"
 
-- 
2.30.2

[PATCH 21/25] python3-chardet: upgrade 5.0.0 -> 5.1.0

[Alexander Kanavin]

Transition to python_setuptools_build_meta.

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

diff --git a/meta/recipes-devtools/python/python3-chardet_5.0.0.bb b/meta/recipes-devtools/python/python3-chardet_5.1.0.bb
similarity index 79%
rename from meta/recipes-devtools/python/python3-chardet_5.0.0.bb
rename to meta/recipes-devtools/python/python3-chardet_5.1.0.bb
index 80baed7986..9b2644e648 100644
--- a/meta/recipes-devtools/python/python3-chardet_5.0.0.bb
+++ b/meta/recipes-devtools/python/python3-chardet_5.1.0.bb
@@ -3,12 +3,12 @@ HOMEPAGE = "https://pypi.org/project/chardet/"
 LICENSE = "LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c"
 
-SRC_URI[sha256sum] = "0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa"
+SRC_URI[sha256sum] = "0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"
 
 # setup.py of chardet needs this.
 DEPENDS += "${PYTHON_PN}-pytest-runner-native"
 
-inherit pypi setuptools3
+inherit pypi python_setuptools_build_meta
 
 PACKAGES =+ "${PN}-cli"
 FILES:${PN}-cli += " \
-- 
2.30.2

[PATCH 22/25] libarchive: upgrade 3.6.1 -> 3.6.2

[Alexander Kanavin]

Use --without-iconv as otherwise autotools write a bogus iconv
dependency into .pc file.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...t-include-sys-mount.h-when-linux-fs..patch | 47 ------------------
 .../libarchive/cve-2022-36227.patch           | 48 -------------------
 ...ibarchive_3.6.1.bb => libarchive_3.6.2.bb} |  9 ++--
 3 files changed, 3 insertions(+), 101 deletions(-)
 delete mode 100644 meta/recipes-extended/libarchive/libarchive/0001-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch
 delete mode 100644 meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch
 rename meta/recipes-extended/libarchive/{libarchive_3.6.1.bb => libarchive_3.6.2.bb} (89%)

diff --git a/meta/recipes-extended/libarchive/libarchive/0001-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch b/meta/recipes-extended/libarchive/libarchive/0001-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch
deleted file mode 100644
index 0d21799682..0000000000
--- a/meta/recipes-extended/libarchive/libarchive/0001-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 25 Jul 2022 10:56:53 -0700
-Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is
- present
-
-These headers are in conflict and only one is needed by
-archive_read_disk_posix.c therefore include linux/fs.h if it exists
-otherwise include sys/mount.h
-
-It also helps compiling with glibc 2.36
-where sys/mount.h conflicts with linux/mount.h see [1]
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36
-
-Upstream-Status: Submitted [https://github.com/libarchive/libarchive/pull/1761]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- libarchive/archive_read_disk_posix.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
-index 2b39e672..a96008db 100644
---- a/libarchive/archive_read_disk_posix.c
-+++ b/libarchive/archive_read_disk_posix.c
-@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
--#ifdef HAVE_SYS_MOUNT_H
--#include <sys/mount.h>
--#endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
-@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
- #endif
- #ifdef HAVE_LINUX_FS_H
- #include <linux/fs.h>
-+#elif HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
- #endif
- /*
-  * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.
--- 
-2.25.1
-
diff --git a/meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch b/meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch
deleted file mode 100644
index 4d13bf6492..0000000000
--- a/meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
-From: obiwac <obiwac@gmail.com>
-Date: Fri, 22 Jul 2022 22:41:10 +0200
-Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754)
-
----
- libarchive/archive_write.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
----
-CVE: CVE-2022-36227
-
-Source-Repo: https://github.com/libarchive/libarchive.git
-
-Upstream-Status: Backport [bff38efe8c... unmodified]
-
-Signed-off-by: Joe Slater <joe.slater@windriver.com>
-
----
-diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
-index 66592e82..27626b54 100644
---- a/libarchive/archive_write.c
-+++ b/libarchive/archive_write.c
-@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
- 	struct archive_write_filter *f;
- 
- 	f = calloc(1, sizeof(*f));
-+
-+	if (f == NULL)
-+		return (NULL);
-+
- 	f->archive = _a;
- 	f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
- 	if (a->filter_first == NULL)
-@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
- 	a->client_data = client_data;
- 
- 	client_filter = __archive_write_allocate_filter(_a);
-+
-+	if (client_filter == NULL)
-+		return (ARCHIVE_FATAL);
-+
- 	client_filter->open = archive_write_client_open;
- 	client_filter->write = archive_write_client_write;
- 	client_filter->close = archive_write_client_close;
--- 
-2.38.1
-
diff --git a/meta/recipes-extended/libarchive/libarchive_3.6.1.bb b/meta/recipes-extended/libarchive/libarchive_3.6.2.bb
similarity index 89%
rename from meta/recipes-extended/libarchive/libarchive_3.6.1.bb
rename to meta/recipes-extended/libarchive/libarchive_3.6.2.bb
index c812038352..f447035b67 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.6.1.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.6.2.bb
@@ -30,15 +30,12 @@ PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4,"
 PACKAGECONFIG[mbedtls] = "--with-mbedtls,--without-mbedtls,mbedtls,"
 PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd,"
 
-EXTRA_OECONF += "--enable-largefile"
+EXTRA_OECONF += "--enable-largefile --without-iconv"
 
-SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
-           file://0001-libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch \
-           file://cve-2022-36227.patch \
-           "
+SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz"
 UPSTREAM_CHECK_URI = "http://libarchive.org/"
 
-SRC_URI[sha256sum] = "c676146577d989189940f1959d9e3980d28513d74eedfbc6b7f15ea45fe54ee2"
+SRC_URI[sha256sum] = "ba6d02f15ba04aba9c23fd5f236bb234eab9d5209e95d1c4df85c44d5f19b9b3"
 
 inherit autotools update-alternatives pkgconfig
 
-- 
2.30.2

[PATCH 23/25] stress-ng: upgrade 0.15.00 -> 0.15.01

[Alexander Kanavin]

libbsd is required for splay tree macros in tree.h

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../stress-ng/{stress-ng_0.15.00.bb => stress-ng_0.15.01.bb}  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/stress-ng/{stress-ng_0.15.00.bb => stress-ng_0.15.01.bb} (90%)

diff --git a/meta/recipes-extended/stress-ng/stress-ng_0.15.00.bb b/meta/recipes-extended/stress-ng/stress-ng_0.15.01.bb
similarity index 90%
rename from meta/recipes-extended/stress-ng/stress-ng_0.15.00.bb
rename to meta/recipes-extended/stress-ng/stress-ng_0.15.01.bb
index e0d8a58517..38fd6698b3 100644
--- a/meta/recipes-extended/stress-ng/stress-ng_0.15.00.bb
+++ b/meta/recipes-extended/stress-ng/stress-ng_0.15.01.bb
@@ -6,10 +6,10 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 SRC_URI = "git://github.com/ColinIanKing/stress-ng.git;protocol=https;branch=master"
-SRCREV = "91ec6bccd7e94fd04674b29e081e579710b97d71"
+SRCREV = "8c7c3d95555c50148470553b55477db895a4f1ad"
 S = "${WORKDIR}/git"
 
-DEPENDS = "coreutils-native"
+DEPENDS = "coreutils-native libbsd"
 
 PROVIDES = "stress"
 RPROVIDES:${PN} = "stress"
-- 
2.30.2

[PATCH 24/25] vulkan: upgrade 1.3.231.1 -> 1.3.236.0

[Alexander Kanavin]

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../glslang/{glslang_1.3.231.1.bb => glslang_1.3.236.0.bb}    | 2 +-
 ...{spirv-headers_1.3.231.1.bb => spirv-headers_1.3.236.0.bb} | 2 +-
 .../{spirv-tools_1.3.231.1.bb => spirv-tools_1.3.236.0.bb}    | 2 +-
 ...ulkan-headers_1.3.231.1.bb => vulkan-headers_1.3.236.0.bb} | 2 +-
 ...{vulkan-loader_1.3.231.1.bb => vulkan-loader_1.3.236.0.bb} | 4 ++--
 .../{vulkan-tools_1.3.231.1.bb => vulkan-tools_1.3.236.0.bb}  | 4 ++--
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename meta/recipes-graphics/glslang/{glslang_1.3.231.1.bb => glslang_1.3.236.0.bb} (95%)
 rename meta/recipes-graphics/spir/{spirv-headers_1.3.231.1.bb => spirv-headers_1.3.236.0.bb} (92%)
 rename meta/recipes-graphics/spir/{spirv-tools_1.3.231.1.bb => spirv-tools_1.3.236.0.bb} (96%)
 rename meta/recipes-graphics/vulkan/{vulkan-headers_1.3.231.1.bb => vulkan-headers_1.3.236.0.bb} (93%)
 rename meta/recipes-graphics/vulkan/{vulkan-loader_1.3.231.1.bb => vulkan-loader_1.3.236.0.bb} (94%)
 rename meta/recipes-graphics/vulkan/{vulkan-tools_1.3.231.1.bb => vulkan-tools_1.3.236.0.bb} (93%)

diff --git a/meta/recipes-graphics/glslang/glslang_1.3.231.1.bb b/meta/recipes-graphics/glslang/glslang_1.3.236.0.bb
similarity index 95%
rename from meta/recipes-graphics/glslang/glslang_1.3.231.1.bb
rename to meta/recipes-graphics/glslang/glslang_1.3.236.0.bb
index fede2516b1..99eca6a6c1 100644
--- a/meta/recipes-graphics/glslang/glslang_1.3.231.1.bb
+++ b/meta/recipes-graphics/glslang/glslang_1.3.236.0.bb
@@ -8,7 +8,7 @@ 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 = "5755de46b07e4374c05fb1081f65f7ae1f8cca81"
+SRCREV = "77551c429f86c0e077f26552b7c1c0f12a9f235e"
 SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \
            file://0001-generate-glslang-pkg-config.patch"
 PE = "1"
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.236.0.bb
similarity index 92%
rename from meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb
rename to meta/recipes-graphics/spir/spirv-headers_1.3.236.0.bb
index fdcc8d523f..e35628ecbf 100644
--- a/meta/recipes-graphics/spir/spirv-headers_1.3.231.1.bb
+++ b/meta/recipes-graphics/spir/spirv-headers_1.3.236.0.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d"
 
-SRCREV = "85a1ed200d50660786c1a88d9166e871123cce39"
+SRCREV = "1d31a100405cf8783ca7a31e31cdd727c9fc54c3"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=master"
 PE = "1"
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb
similarity index 96%
rename from meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
rename to meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb
index e175cde145..c921bdef72 100644
--- a/meta/recipes-graphics/spir/spirv-tools_1.3.231.1.bb
+++ b/meta/recipes-graphics/spir/spirv-tools_1.3.236.0.bb
@@ -7,7 +7,7 @@ SECTION = "graphics"
 LICENSE  = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
-SRCREV = "eb0a36633d2acf4de82588504f951ad0f2cecacb"
+SRCREV = "40f5bf59c6acb4754a0bffd3c53a715732883a12"
 SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=master;protocol=https"
 PE = "1"
 UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)"
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.236.0.bb
similarity index 93%
rename from meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.bb
rename to meta/recipes-graphics/vulkan/vulkan-headers_1.3.236.0.bb
index b41b82af9d..8716376fc0 100644
--- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.231.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.236.0.bb
@@ -11,7 +11,7 @@ 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 = "98f440ce6868c94f5ec6e198cc1adda4760e8849"
+SRCREV = "b75e5a02b6933caf86c5822d019067b335492c85"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.236.0.bb
similarity index 94%
rename from meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb
rename to meta/recipes-graphics/vulkan/vulkan-loader_1.3.236.0.bb
index 7aab7446f6..56f9d765f8 100644
--- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.231.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.236.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.231;protocol=https"
-SRCREV = "eedbf08292a6be19c3527e77ae2df3f209cab285"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=sdk-1.3.236;protocol=https"
+SRCREV = "1ee83a25c2c20e2efbfc0ac976c7a3ddb5fc291c"
 
 S = "${WORKDIR}/git"
 
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.236.0.bb
similarity index 93%
rename from meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb
rename to meta/recipes-graphics/vulkan/vulkan-tools_1.3.236.0.bb
index 9066821de0..a3561bbb5c 100644
--- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.231.1.bb
+++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.236.0.bb
@@ -6,8 +6,8 @@ SECTION = "libs"
 
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
-SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.3.231;protocol=https"
-SRCREV = "8d2d3e22d684540fdc5a76c15e456fc2fd11e4b7"
+SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=master;protocol=https"
+SRCREV = "ce45337c51ed53e6f1b337aa746a5a96c5018f86"
 
 S = "${WORKDIR}/git"
 
-- 
2.30.2

[PATCH 25/25] Revert "python3-native: further tweak to sysconfig.py to find python includes correctly"

[Alexander Kanavin]

Unfortunately, sysconfig is used by:
- setuptools to find out where to install new headers
- autoconf-archive to find where Python.h is

In the first case we want the target location, in the second case we want
the sysroot location. The second case is not yet used in the wild
(as projects such as gpgpme are using outdated distutils-based m4 macros),
but it will become a problem once python 3.12 is out, and
said projects are forced to migrate to sysconfig. Let's deal with it
then in a more careful manner, and hopefully convince upstream that
there is a general problem too.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 ...g.py-use-prefix-value-from-build-configu.patch | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
index cb79d9c671..dc06baf504 100644
--- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
+++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch
@@ -1,23 +1,24 @@
 From a73020a9c388b4882c384087882a77ab2c7b3729 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex@linutronix.de>
 Date: Fri, 10 Sep 2021 12:28:31 +0200
-Subject: [PATCH] Lib/sysconfig.py: use values from build configuration file
+Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration
+ file
 
-This allows correctly substituting them for target builds using
+This allows correctly substituting them for target installs using
 native python.
 
 Upstream-Status: Inappropriate [oe-core cross builds]
 Signed-off-by: Alexander Kanavin <alex@linutronix.de>
 
 ---
- Lib/sysconfig.py | 7 +++++++
- 1 file changed, 7 insertions(+)
+ Lib/sysconfig.py | 5 +++++
+ 1 file changed, 5 insertions(+)
 
 diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py
-index 93c6f73..a87870f 100644
+index 93c6f73..ff399e2 100644
 --- a/Lib/sysconfig.py
 +++ b/Lib/sysconfig.py
-@@ -668,6 +668,13 @@ def get_config_vars(*args):
+@@ -668,6 +668,11 @@ def get_config_vars(*args):
              _CONFIG_VARS['VPATH'] = sys._vpath
          if os.name == 'posix':
              _init_posix(_CONFIG_VARS)
@@ -26,8 +27,6 @@ index 93c6f73..a87870f 100644
 +        _CONFIG_VARS['installed_platbase'] = _CONFIG_VARS['prefix']
 +        _CONFIG_VARS['platbase'] = _CONFIG_VARS['prefix']
 +        _CONFIG_VARS['platlibdir'] = _CONFIG_VARS['PLATLIBDIR']
-+        _INSTALL_SCHEMES['posix_prefix']['include'] = _CONFIG_VARS['INCLUDEPY']
-+        _INSTALL_SCHEMES['posix_prefix']['platinclude'] = _CONFIG_VARS['INCLUDEPY']
          if _HAS_USER_BASE:
              # Setting 'userbase' is done below the call to the
              # init function to enable using 'get_config_var' in
-- 
2.30.2