Update for 2023.05-rc3

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/bird: bump to version 2.0.12
2023-06-04 13:10:30 +02:00 · 2023-06-04 12:47:21 +02:00 · 2023-06-03 22:44:41 +02:00 · 2023-06-03 21:48:50 +02:00 · 2023-06-03 21:47:56 +02:00 · 2023-06-03 21:44:04 +02:00
112 changed files with 1401 additions and 524 deletions
@@ -74,7 +74,6 @@ board/pine64/rockpro64/post-build.sh Shellcheck
 board/qemu/aarch64-sbsa/assemble-flash-images Shellcheck
 board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch Upstream
 board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch Upstream
-board/qemu/ppc-mpc8544ds/patches/linux/0001-powerpc-Fix-mcpu-options-for-SPE-only-compiler.patch Upstream
 board/qemu/x86/post-build.sh Shellcheck
 board/qemu/x86_64/post-build.sh Shellcheck
 board/qmtech/zynq/patches/linux/0001-DTS-for-QMTech-Zynq-starter-kit.patch Upstream
@@ -104,7 +103,7 @@ board/versal/post-build.sh Shellcheck
 board/versal/post-image.sh Shellcheck TrailingSpace
 board/zynq/post-build.sh Shellcheck
 board/zynq/post-image.sh Shellcheck
-board/zynqmp/kria/kv260/kv260.sh Shellcheck TrailingSpace
+board/zynqmp/kria/kv260/kv260.sh Shellcheck
 board/zynqmp/kria/patches/uboot/v1-0001-makefile-add-multi_dtb_fit-dep.patch ApplyOrder Upstream
 board/zynqmp/post-build.sh Shellcheck
 board/zynqmp/post-image.sh Shellcheck
@@ -519,14 +518,9 @@ package/gcc/10.4.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch Upstr
 package/gcc/10.4.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch Upstream
 package/gcc/10.4.0/0004-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch Upstream
 package/gcc/10.4.0/0005-disable-split-stack-for-non-thread-builds.patch Upstream
-package/gcc/11.3.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch Upstream
-package/gcc/11.3.0/0002-or1k-Use-cmodel-large-when-building-crtstuff.patch Upstream
-package/gcc/11.3.0/0003-gcc-define-_REENTRANT-for-OpenRISC-when-pthread-is-p.patch Upstream
-package/gcc/11.3.0/0004-disable-split-stack-for-non-thread-builds.patch Upstream
-package/gcc/11.3.0/0005-rs6000-Improve-.machine.patch Upstream
-package/gcc/11.3.0/0006-rs6000-Do-not-use-rs6000_cpu-for-.machine-ppc-and-pp.patch Upstream
-package/gcc/12.2.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream
-package/gcc/12.2.0/0002-fix-condvar.patch Upstream
+package/gcc/11.4.0/0001-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch Upstream
+package/gcc/11.4.0/0004-disable-split-stack-for-non-thread-builds.patch Upstream
+package/gcc/12.3.0/0001-disable-split-stack-for-non-thread-builds.patch Upstream
 package/gcc/8.4.0/0001-xtensa-fix-PR-target-91880.patch Upstream
 package/gcc/8.4.0/0002-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch Upstream
 package/gcc/8.4.0/0003-libsanitizer-Remove-cyclades-from-libsanitizer.patch Upstream
@@ -949,9 +943,9 @@ package/lua/5.1.5/0012-fix-reader-at-eoz.patch Upstream
 package/lua/5.3.6/0001-root-path.patch Upstream
 package/lua/5.3.6/0002-shared-libs-for-lua.patch Upstream
 package/lua/5.3.6/0003-linenoise.patch Upstream
-package/lua/5.4.5/0001-root-path.patch Upstream
-package/lua/5.4.5/0002-shared-libs-for-lua.patch Upstream
-package/lua/5.4.5/0011-linenoise.patch Upstream
+package/lua/5.4.6/0001-root-path.patch Upstream
+package/lua/5.4.6/0002-shared-libs-for-lua.patch Upstream
+package/lua/5.4.6/0011-linenoise.patch Upstream
 package/luajit/0001-no-bin-symlink.patch Upstream
 package/luajit/0002-install-inc.patch Upstream
 package/luasyslog/0001-remove-AX_LUA_LIBS.patch Upstream
@@ -1135,7 +1129,7 @@ package/open-iscsi/0001-SHA3-is-not-supported-by-libressl.patch Upstream
 package/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch Upstream
 package/open-plc-utils/0002-plc-plc.h-fix-build-with-gcc-10.patch Upstream
 package/open2300/0001-fix-makefile.patch Upstream
-package/openjdk/17.0.6+10/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream
+package/openjdk/17.0.7+7/0001-Add-ARCv2-ISA-processors-support-to-Zero.patch Upstream
 package/openldap/0001-fix_cross_strip.patch Upstream
 package/openldap/0002-fix-bignum.patch Upstream
 package/openldap/0003-disable-docs.patch Upstream
@@ -1596,9 +1590,6 @@ package/vde2/0001-no-cxx.patch Upstream
 package/vde2/0002-fstp-Add-static-to-inline-functions.patch Upstream
 package/vde2/0003-vde_l3-Add-static-to-inline-functions.patch Upstream
 package/vdr/0001-getloadavg.patch Upstream
-package/vdr/0002-musl-compat.patch Upstream
-package/vdr/0003-include-missing-limits.patch Upstream
-package/vdr/0004-i18n.c-_nl_msg_cat_cntr-is-an-internal-symbol-of-som.patch Upstream
 package/vlc/0001-Disable-building-of-statically-linked-vlc-binary.patch Upstream
 package/vlc/0002-automake-add-subdir-objects-option.patch Upstream
 package/vlc/0003-build-use-pkg-config-to-get-tremor-libs.patch Upstream
@@ -1,3 +1,31 @@
+2023.05-rc3, released June 4th, 2023
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: bird, containerd, earlyoom, gcc,
+	ipython, kexec, kodi-skin-confluence, libcurl, libopenssl,
+	mesa3d, minidlna, mpd, openjdk, openjdk-bin,
+	python-matplotlib, sdl2_net, vdr
+
+	New packages: python-asttokens, python-executing,
+	python-pure-eval, python-stack-data
+
+2023.05-rc2, released May 28th, 2023
+
+	Fixes all over the tree.
+
+	Updated/fixed packages: busybox, clamav, crudini,
+	kodi-pvr-vbox, libcurl, libmnl, libpqxx, libressl, libssh,
+	llvm, lua, mesa3d, perl-http-message, python-can,
+	python-django, sdl2_mixer, webkitgtk, zfs, znc
+
+	New packages: perl-clone
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#15421: qemu_aarch64_ebbr_defconfig: Missing Linux kernel source..
+	#15581: qemu_ppc_mpc8544ds_defconfig: Fails due to non-working patch
+
 2023.05-rc1, released May 15th, 2023

 	Fixes all over the tree and new features.
@@ -146,6 +146,13 @@ endif

 comment "Legacy options removed in 2023.05"

+config BR2_KERNEL_HEADERS_6_2
+	bool "kernel headers version 6.2.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 6.2.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
 config BR2_PACKAGE_ATK
 	bool "atk removed"
 	select BR2_LEGACY
@@ -662,7 +662,7 @@ N:	Damien Lanson <damien@kal-host.com>
 F:	package/libvdpau/
 F:	package/log4cpp/

-N:	Damien Le Moal <damien.lemoal@wdc.com>
+N:	Damien Le Moal <dlemoal@kernel.org>
 F:	package/python-kflash/
 F:	board/canaan/
 F:	configs/canaan_kd233_defconfig
@@ -862,7 +862,7 @@ F:	package/szip/
 N:	Esben Haabendal <esben@haabendal.dk>
 F:	package/python-kiwisolver/

-N:	Etienne Carriere <etienne.carriere@linaro.org>
+N:	Etienne Carriere <etienne.carriere@foss.st.com>
 F:	boot/optee-os/
 F:	package/optee-client/
 F:	package/optee-examples/
@@ -90,9 +90,9 @@ all:
 .PHONY: all

 # Set and export the version string
-export BR2_VERSION := 2023.05-rc1
+export BR2_VERSION := 2023.05-rc3
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1684130000
+BR2_VERSION_EPOCH = 1685877000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
@@ -1,53 +0,0 @@
-From a0919e3177295f4aaa9006915adcddc31788d809 Mon Sep 17 00:00:00 2001
-From: Ben Hutchings <ben@decadent.org.uk>
-Date: Wed, 26 Dec 2018 00:00:40 +0000
-Subject: [PATCH] powerpc: Fix -mcpu= options for SPE-only compiler
-
-GCC for Debian's "powerpcspe" architecture only supports 32-bit
-SPE targets, and using -mcpu=powerpc or -mcpu=powerpc64 is a fatal
-error.
-
-* Change the test for a biarch compiler to pass both the -m32 and -m64
-  options, so that it doesn't catch 32-bit-only compilers
-* Add an ifdef CONFIG_PPC64 around the 64-bit CPU option definitions
-
-Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
-[Romain: Patch from Debian repository:
-https://salsa.debian.org/kernel-team/linux/-/blob/buster/debian/patches/bugfix/powerpc/powerpc-fix-mcpu-options-for-spe-only-compiler.patch]
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
- arch/powerpc/Makefile | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
-index 5c8c06215dd4..e3dbea6d7ae0 100644
--- a/arch/powerpc/Makefile
-+++ b/arch/powerpc/Makefile
-@@ -12,7 +12,7 @@
- # Rewritten by Cort Dougan and Paul Mackerras
- #
- 
-HAS_BIARCH	:= $(call cc-option-yn, -m32)
-+HAS_BIARCH	:= $(call cc-option-yn, -m32 -m64)
- 
- # Set default 32 bits cross compilers for vdso and boot wrapper
- CROSS32_COMPILE ?=
-@@ -164,6 +164,7 @@ CFLAGS-$(CONFIG_PPC32)	+= $(call cc-option, $(MULTIPLEWORD))
- 
- CFLAGS-$(CONFIG_PPC32)	+= $(call cc-option,-mno-readonly-in-sdata)
- 
-+ifdef CONFIG_PPC64
- ifdef CONFIG_PPC_BOOK3S_64
- ifdef CONFIG_CPU_LITTLE_ENDIAN
- CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power8
-@@ -175,6 +176,7 @@ endif
- else
- CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
- endif
-+endif
- 
- ifdef CONFIG_FUNCTION_TRACER
- CC_FLAGS_FTRACE := -pg
-- 
-2.17.1
-
@@ -1,8 +1,8 @@
 #!/bin/sh

 # This is a temporary work around for generating kv260 u-boot.itb.
-# The problem is there is no way to currently configure u-boot to apply 
-# the carrier board dtb overlay during build, so all kv260 carrier board 
+# The problem is there is no way to currently configure u-boot to apply
+# the carrier board dtb overlay during build, so all kv260 carrier board
 # drivers are missing.
 # This will be removed when u-boot can build the kv260 u-boot.itb natively.

@@ -3,7 +3,6 @@ BR2_powerpc=y
 BR2_powerpc_8548=y

 # System
-BR2_GLOBAL_PATCH_DIR="board/qemu/ppc-mpc8544ds/patches"
 BR2_SYSTEM_DHCP="eth0"

 # Filesystem
@@ -76,37 +76,37 @@
 	</div>
      </div>
 -->
-      <h3 style="text-align: center;">Latest release candidate: <b>2023.05-rc1</b></h3>
+      <h3 style="text-align: center;">Latest release candidate: <b>2023.05-rc3</b></h3>
      <div class="row mt centered">
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2023.05-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2023.05-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2023.05-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2023.05-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>

-	  <h3><a href="/downloads/buildroot-2023.05-rc1.tar.gz">buildroot-2023.05-rc1.tar.gz</a></h3>
-	  <p><a href="/downloads/buildroot-2023.05-rc1.tar.gz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2023.05-rc3.tar.gz">buildroot-2023.05-rc3.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2023.05-rc3.tar.gz.sign">PGP signature</a></p>
 	</div>
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2023.05-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2023.05-rc3.tar.xz"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2023.05-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2023.05-rc3.tar.xz"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>

-	  <h3><a href="/downloads/buildroot-2023.05-rc1.tar.xz">buildroot-2023.05-rc1.tar.xz</a></h3>
-	  <p><a href="/downloads/buildroot-2023.05-rc1.tar.xz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2023.05-rc3.tar.xz">buildroot-2023.05-rc3.tar.xz</a></h3>
+	  <p><a href="/downloads/buildroot-2023.05-rc3.tar.xz.sign">PGP signature</a></p>
 	</div>
      </div>

@@ -9,6 +9,48 @@
 <h2>News</h2>
 <ul class="timeline">

+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2023.05-rc3 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>4 June 2023</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>2023.05-rc3 has been released with more cleanups and build fixes. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2023.05-rc3">CHANGES</a>
+	  file for details.</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2023.05-rc3.tar.xz">2023.05-rc3
+	  release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
+  <li class="timeline-inverted">
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2023.05-rc2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>28 May 2023</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>2023.05-rc2 has been released with more cleanups and build fixes. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2023.05-rc2">CHANGES</a>
+	  file for details.</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2023.05-rc2.tar.xz">2023.05-rc2
+	  release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
  <li>
    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
    <div class="timeline-panel">
@@ -128,7 +128,7 @@ endif

 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "6.3.2" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "6.3.5" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
@@ -1,14 +1,13 @@
 # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  b612ecf282ca3f7989ff6d9f39082833b7dc2d522cb969a05334d3614e9c5328  linux-6.3.2.tar.xz
-sha256  9ffa34921044660c6adb3eb5fd996192e322b15bbf532fe4e4e7a47079ed8fc1  linux-6.2.15.tar.xz
-sha256  7a094c1428b20fef0b5429e4effcc6ed962a674ac6f04e606d63be1ddcc3a6f0  linux-6.1.28.tar.xz
+sha256  f5cd478c3d8b908ab606afd1e95a4f8f77e7186b4a82829251d6e6aaafff825e  linux-6.3.5.tar.xz
+sha256  e86917bba1990e967943645484182a64ba325f98b114a1906cc1d50992e073c1  linux-6.1.31.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256  77ceea259c0158dd624304871170d09b2e59ed612f3a4d436fe0f07362dcaec2  linux-5.15.111.tar.xz
-sha256  1bbd445c154b053eea46acc883be548a98179988a9ed3a0b81bddfbf30a37e29  linux-5.10.179.tar.xz
-sha256  142f9aed1c9f2e409dd72c5c490ad824dddf31f955ed2097d5989c4b5074fc28  linux-5.4.242.tar.xz
+sha256  e981ea5d219f77735bf5a3f7e84a8af578df8ac3e1c4ff1b0649e2b0795277d2  linux-5.15.114.tar.xz
+sha256  ace6ceb73f5f2504bc1bcb9b8cd5b55d6ff8e90a81ee244ad2315fdd671ba4e7  linux-5.10.181.tar.xz
+sha256  90f5280e95ed7b374ad6f3979ed08008e29a051e5f372d367c06ed75b002a21b  linux-5.4.244.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256  43a514997d3a9052b765a9e1c8fbf7f5a810771937f8754a529ed09e0e02e20b  linux-4.19.282.tar.xz
-sha256  876c01f0d12ad0147b5c9ee2de919bedc7ffb7c2714dbfb7ccf44426f6f49153  linux-4.14.314.tar.xz
+sha256  7fb9ee20c7e52f9be6d9f501e8498a22f4b364abfde136143749a77e597fd03e  linux-4.19.284.tar.xz
+sha256  ac8318f1c1d387e23ccfa760ec042943372df23e3c4e2408177fb5a3f6488f76  linux-4.14.316.tar.xz
 # Locally computed
 sha256  fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae  linux-cip-5.10.162-cip24.tar.gz
 sha256  b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441  linux-cip-5.10.162-cip24-rt10.tar.gz
@@ -796,6 +796,7 @@ menu "Perl libraries/modules"
 	source "package/perl-class-method-modifiers/Config.in"
 	source "package/perl-class-std/Config.in"
 	source "package/perl-class-std-fast/Config.in"
+	source "package/perl-clone/Config.in"
 	source "package/perl-convert-asn1/Config.in"
 	source "package/perl-cookie-baker/Config.in"
 	source "package/perl-crypt-blowfish/Config.in"
@@ -966,6 +967,7 @@ menu "External python modules"
 	source "package/python-arrow/Config.in"
 	source "package/python-asgiref/Config.in"
 	source "package/python-asn1crypto/Config.in"
+	source "package/python-asttokens/Config.in"
 	source "package/python-async-generator/Config.in"
 	source "package/python-async-lru/Config.in"
 	source "package/python-async-timeout/Config.in"
@@ -1050,6 +1052,7 @@ menu "External python modules"
 	source "package/python-entrypoints/Config.in"
 	source "package/python-esptool/Config.in"
 	source "package/python-evdev/Config.in"
+	source "package/python-executing/Config.in"
 	source "package/python-falcon/Config.in"
 	source "package/python-filelock/Config.in"
 	source "package/python-fire/Config.in"
@@ -1188,6 +1191,7 @@ menu "External python modules"
 	source "package/python-psycopg2/Config.in"
 	source "package/python-ptyprocess/Config.in"
 	source "package/python-pudb/Config.in"
+	source "package/python-pure-eval/Config.in"
 	source "package/python-py/Config.in"
 	source "package/python-pyaes/Config.in"
 	source "package/python-pyalsa/Config.in"
@@ -1306,6 +1310,7 @@ menu "External python modules"
 	source "package/python-sqlalchemy/Config.in"
 	source "package/python-sqliteschema/Config.in"
 	source "package/python-sqlparse/Config.in"
+	source "package/python-stack-data/Config.in"
 	source "package/python-systemd/Config.in"
 	source "package/python-tabledata/Config.in"
 	source "package/python-tempora/Config.in"
@@ -1,2 +1,2 @@
-sha256  60a7b83b67b9d089d2a745a11fddd12461f631abc7b645b6c085adf90b3f55d6  bird-2.0.11.tar.gz
+sha256  3ec462a237d06d1f4455d6ec00a42f0b1686061fc988e5c89a841d01dd753b53  bird-2.0.12.tar.gz
 sha256  94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2  README
@@ -4,7 +4,7 @@
 #
 ################################################################################

-BIRD_VERSION = 2.0.11
+BIRD_VERSION = 2.0.12
 BIRD_SITE = https://bird.network.cz/download
 BIRD_LICENSE = GPL-2.0+
 BIRD_LICENSE_FILES = README
@@ -0,0 +1,103 @@
+From 93e0898c663a533082b5f3c2e7dcce93ec47076d Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Thu, 26 Jan 2023 12:56:33 +0100
+Subject: [PATCH] shell: fix SIGWINCH and SIGCHLD (in hush) interrupting line
+ input, closes 15256
+
+function                                             old     new   delta
+record_pending_signo                                  32      63     +31
+lineedit_read_key                                    231     224      -7
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 1/1 up/down: 31/-7)              Total: 24 bytes
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+Upstream: https://git.busybox.net/busybox/commit/?id=93e0898c663a533082b5f3c2e7dcce93ec47076d
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ libbb/lineedit.c | 17 ++++++++++-------
+ shell/ash.c      |  3 ++-
+ shell/hush.c     | 10 ++++++++--
+ 3 files changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/libbb/lineedit.c b/libbb/lineedit.c
+index d6b2e76ff..b942f540a 100644
+--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
+@@ -2180,7 +2180,8 @@ static int lineedit_read_key(char *read_key_buffer, int timeout)
+ 		 * "\xff\n",pause,"ls\n" invalid and thus won't lose "ls".
+ 		 *
+ 		 * If LI_INTERRUPTIBLE, return -1 if got EINTR in poll()
+-		 * inside read_key, or if bb_got_signal != 0 (IOW: if signal
+		 * inside read_key and bb_got_signal became != 0,
+		 * or if bb_got_signal != 0 (IOW: if signal
+ 		 * arrived before poll() is reached).
+ 		 *
+ 		 * Note: read_key sets errno to 0 on success.
+@@ -2197,14 +2198,16 @@ static int lineedit_read_key(char *read_key_buffer, int timeout)
+ 			IF_FEATURE_EDITING_WINCH(S.ok_to_redraw = 0;)
+ 			if (errno != EINTR)
+ 				break;
+			/* It was EINTR. Repeat read_key() unless... */
+ 			if (state->flags & LI_INTERRUPTIBLE) {
+-				/* LI_INTERRUPTIBLE bails out on EINTR,
+-				 * but nothing really guarantees that bb_got_signal
+-				 * is nonzero. Follow the least surprise principle:
+				/* LI_INTERRUPTIBLE bails out on EINTR
+				 * if bb_got_signal became nonzero.
+				 * (It may stay zero: for example, our SIGWINCH
+				 * handler does not set it. This is used for signals
+				 * which should not interrupt line editing).
+ 				 */
+-				if (bb_got_signal == 0)
+-					bb_got_signal = 255;
+-				goto ret;
+				if (bb_got_signal != 0)
+					goto ret; /* will return -1 */
+ 			}
+ 		}
+ 
+diff --git a/shell/ash.c b/shell/ash.c
+index 18ccc1329..5f8c8ea19 100644
+--- a/shell/ash.c
+++ b/shell/ash.c
+@@ -10821,7 +10821,8 @@ preadfd(void)
+  again:
+ 		/* For shell, LI_INTERRUPTIBLE is set:
+ 		 * read_line_input will abort on either
+-		 * getting EINTR in poll(), or if it sees bb_got_signal != 0
+		 * getting EINTR in poll() and bb_got_signal became != 0,
+		 * or if it sees bb_got_signal != 0
+ 		 * (IOW: if signal arrives before poll() is reached).
+ 		 * Interactive testcases:
+ 		 * (while kill -INT $$; do sleep 1; done) &
+diff --git a/shell/hush.c b/shell/hush.c
+index d111f0cc5..f064b8fd2 100644
+--- a/shell/hush.c
+++ b/shell/hush.c
+@@ -1946,7 +1946,12 @@ static void record_pending_signo(int sig)
+ {
+ 	sigaddset(&G.pending_set, sig);
+ #if ENABLE_FEATURE_EDITING
+-	bb_got_signal = sig; /* for read_line_input: "we got a signal" */
+	if (sig != SIGCHLD
+	 || (G_traps && G_traps[SIGCHLD] && G_traps[SIGCHLD][0])
+	 /* ^^^ if SIGCHLD, interrupt line reading only if it has a trap */
+	) {
+		bb_got_signal = sig; /* for read_line_input: "we got a signal" */
+	}
+ #endif
+ #if ENABLE_HUSH_FAST
+ 	if (sig == SIGCHLD) {
+@@ -2669,7 +2674,8 @@ static int get_user_input(struct in_str *i)
+ 		} else {
+ 			/* For shell, LI_INTERRUPTIBLE is set:
+ 			 * read_line_input will abort on either
+-			 * getting EINTR in poll(), or if it sees bb_got_signal != 0
+			 * getting EINTR in poll() and bb_got_signal became != 0,
+			 * or if it sees bb_got_signal != 0
+ 			 * (IOW: if signal arrives before poll() is reached).
+ 			 * Interactive testcases:
+ 			 * (while kill -INT $$; do sleep 1; done) &
+-- 
+2.30.2
+
@@ -54,7 +54,7 @@ CLAMAV_CONF_OPTS = \
 	-DENABLE_MILTER=OFF \
 	-DENABLE_TESTS=OFF \
 	-DHAVE_SYSTEM_LFS_FTS=ON \
-	-DRUST_COMPILER_TARGET=$(ARCH)-unknown-$(TARGET_OS)-$(LIBC)$(ABI) \
+	-DRUST_COMPILER_TARGET=$(RUSTC_TARGET_NAME) \
 	-Dtest_run_result=ON \
 	-Dtest_run_result__TRYRUN_OUTPUT=ON

@@ -1,3 +1,3 @@
 # Computed locally
-sha256  819086ccdca44cfc5f108e226c7a9294d8fad3eb32031a621623da80dedbfb11  containerd-1.6.20.tar.gz
+sha256  9452e95455d03a00d78ae0587595d0c18555bae7912068269efa25a724efe713  containerd-1.6.21.tar.gz
 sha256  4bbe3b885e8cd1907ab4cf9a41e862e74e24b5422297a4f2fe524e6a30ada2b4  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-CONTAINERD_VERSION = 1.6.20
+CONTAINERD_VERSION = 1.6.21
 CONTAINERD_SITE = $(call github,containerd,containerd,v$(CONTAINERD_VERSION))
 CONTAINERD_LICENSE = Apache-2.0
 CONTAINERD_LICENSE_FILES = LICENSE
@@ -0,0 +1,41 @@
+From d81b703f3e8e29c1547386135c7e9ca539c1f054 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Tue, 2 Aug 2022 14:40:37 +0100
+Subject: [PATCH] prefer shlex over pipes
+
+pipes is deprecated since python 3.10
+and slated for removal in python 3.13
+
+[Romain backport to 0.9.3]
+Upstream: https://github.com/pixelb/crudini/commit/e1650941054822faad4cda788bff6fe364eb4ca3
+Signed-off-by: Romain Naour <romain.naour@smile.fr>
+---
+ crudini | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/crudini b/crudini
+index 669596b..a136241 100755
+--- a/crudini
+++ b/crudini
+@@ -17,15 +17,17 @@ import getopt
+ import hashlib
+ import iniparse
+ import os
+-import pipes
+import re
+ import shutil
+ import string
+ import tempfile
+ 
+ if sys.version_info[0] >= 3:
+    import shlex as pipes
+     from io import StringIO
+     import configparser
+ else:
+    import pipes
+     from cStringIO import StringIO
+     import ConfigParser as configparser
+ 
+-- 
+2.34.3
+
@@ -8,8 +8,8 @@ EARLYOOM_ARGS=""
 [ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"

 start() {
-	printf() 'Starting %s: ' "$DAEMON"
-	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/bin/$DAEMON" \
+	printf 'Starting %s: ' "$DAEMON"
+	start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/usr/bin/$DAEMON" \
 	       -- $EARLYOOM_ARGS
 	status=$?
 	if [ "$status" -eq 0 ]; then
@@ -11,7 +11,7 @@ EARLYOOM_LICENSE_FILES = LICENSE

 EARLYOOM_BUILD_TARGETS = earlyoom.service earlyoom
 EARLYOOM_INSTALL_TARGETS = install-default install-bin
-EARLYOOM_CFLAGS = '$(TARGET_CFLAGS) -std=gnu99 -DVERSION=\"1.6\"'
+EARLYOOM_CFLAGS = '$(TARGET_CFLAGS) -std=gnu99 -DVERSION=\"$(EARLYOOM_VERSION)\"'

 EARLYOOM_MAKE_OPTS = \
 	$(TARGET_CONFIGURE_OPTS) \
@@ -1,120 +0,0 @@
-From ca2c3a7d3db7a699c358d3408f820396dd536fc8 Mon Sep 17 00:00:00 2001
-From: Segher Boessenkool <segher@kernel.crashing.org>
-Date: Tue, 1 Mar 2022 17:04:29 +0000
-Subject: [PATCH] rs6000: Improve .machine
-
-This adds more correct .machine for most older CPUs.  It should be
-conservative in the sense that everything we handled before we handle at
-least as well now.  This does not yet revamp the server CPU handling, it
-is too risky at this point in time.
-
-Tested on powerpc64-linux {-m32,-m64}.  Also manually tested with all
-mcpu=, and the output of that passed through the GNU assembler.
-
-2022-03-04  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	* config/rs6000/rs6000.c (rs6000_machine_from_flags): Restructure a
-	bit.  Handle most older CPUs.
-
-(cherry picked from commit 77eccbf39ed55297802bb66dff5f62507a7239e3)
-(cherry picked from commit fc7e603edc67c66a14f893f3b5a0a34e7d26f77c)
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
- gcc/config/rs6000/rs6000.c | 81 +++++++++++++++++++++++++-------------
- 1 file changed, 54 insertions(+), 27 deletions(-)
-
-diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
-index 0421dc7adb3..0a55c979c36 100644
--- a/gcc/config/rs6000/rs6000.c
-+++ b/gcc/config/rs6000/rs6000.c
-@@ -5742,33 +5742,60 @@ const char *rs6000_machine;
- const char *
- rs6000_machine_from_flags (void)
- {
-  /* For some CPUs, the machine cannot be determined by ISA flags.  We have to
-     check them first.  */
-  switch (rs6000_cpu)
-    {
-    case PROCESSOR_PPC8540:
-    case PROCESSOR_PPC8548:
-      return "e500";
-
-    case PROCESSOR_PPCE300C2:
-    case PROCESSOR_PPCE300C3:
-      return "e300";
-
-    case PROCESSOR_PPCE500MC:
-      return "e500mc";
-
-    case PROCESSOR_PPCE500MC64:
-      return "e500mc64";
-
-    case PROCESSOR_PPCE5500:
-      return "e5500";
-
-    case PROCESSOR_PPCE6500:
-      return "e6500";
-
-    default:
-      break;
-    }
-+  /* e300 and e500 */
-+  if (rs6000_cpu == PROCESSOR_PPCE300C2 || rs6000_cpu == PROCESSOR_PPCE300C3)
-+    return "e300";
-+  if (rs6000_cpu == PROCESSOR_PPC8540 || rs6000_cpu == PROCESSOR_PPC8548)
-+    return "e500";
-+  if (rs6000_cpu == PROCESSOR_PPCE500MC)
-+    return "e500mc";
-+  if (rs6000_cpu == PROCESSOR_PPCE500MC64)
-+    return "e500mc64";
-+  if (rs6000_cpu == PROCESSOR_PPCE5500)
-+    return "e5500";
-+  if (rs6000_cpu == PROCESSOR_PPCE6500)
-+    return "e6500";
-+
-+  /* 400 series */
-+  if (rs6000_cpu == PROCESSOR_PPC403)
-+    return "\"403\"";
-+  if (rs6000_cpu == PROCESSOR_PPC405)
-+    return "\"405\"";
-+  if (rs6000_cpu == PROCESSOR_PPC440)
-+    return "\"440\"";
-+  if (rs6000_cpu == PROCESSOR_PPC476)
-+    return "\"476\"";
-+
-+  /* A2 */
-+  if (rs6000_cpu == PROCESSOR_PPCA2)
-+    return "a2";
-+
-+  /* Cell BE */
-+  if (rs6000_cpu == PROCESSOR_CELL)
-+    return "cell";
-+
-+  /* Titan */
-+  if (rs6000_cpu == PROCESSOR_TITAN)
-+    return "titan";
-+
-+  /* 500 series and 800 series */
-+  if (rs6000_cpu == PROCESSOR_MPCCORE)
-+    return "\"821\"";
-+
-+  /* 600 series and 700 series, "classic" */
-+  if (rs6000_cpu == PROCESSOR_PPC601 || rs6000_cpu == PROCESSOR_PPC603
-+      || rs6000_cpu == PROCESSOR_PPC604 || rs6000_cpu == PROCESSOR_PPC604e
-+      || rs6000_cpu == PROCESSOR_PPC750 || rs6000_cpu == PROCESSOR_POWERPC)
-+    return "ppc";
-+
-+  /* Classic with AltiVec, "G4" */
-+  if (rs6000_cpu == PROCESSOR_PPC7400 || rs6000_cpu == PROCESSOR_PPC7450)
-+    return "\"7450\"";
-+
-+  /* The older 64-bit CPUs */
-+  if (rs6000_cpu == PROCESSOR_PPC620 || rs6000_cpu == PROCESSOR_PPC630
-+      || rs6000_cpu == PROCESSOR_RS64A || rs6000_cpu == PROCESSOR_POWERPC64)
-+    return "ppc64";
- 
-   HOST_WIDE_INT flags = rs6000_isa_flags;
- 
-- 
-2.34.3
-
@@ -1,68 +0,0 @@
-From 6de33ed642f119f1e2543095dd56e4a94f97c27f Mon Sep 17 00:00:00 2001
-From: Segher Boessenkool <segher@kernel.crashing.org>
-Date: Fri, 11 Mar 2022 21:15:18 +0000
-Subject: [PATCH] rs6000: Do not use rs6000_cpu for .machine ppc and ppc64
- (PR104829)
-
-Fixes: 77eccbf39ed5
-
-rs6000.h has
-  #define PROCESSOR_POWERPC   PROCESSOR_PPC604
-  #define PROCESSOR_POWERPC64 PROCESSOR_RS64A
-which means that if you use things like  -mcpu=powerpc -mvsx  it will no
-longer work after my latest .machine patch.  This causes GCC build errors
-in some cases, not a good idea (even if the errors are actually
-pre-existing: using -mvsx with a machine that does not have VSX cannot
-work properly).
-
-2022-03-11  Segher Boessenkool  <segher@kernel.crashing.org>
-
-	PR target/104829
-	* config/rs6000/rs6000.c (rs6000_machine_from_flags): Don't output
-	"ppc" and "ppc64" based on rs6000_cpu.
-
-(cherry picked from commit 80fcc4b6afee72443bef551064826b3b4b6785e6)
-(cherry picked from commit d87e0e297b1cba73a0c055d2a3e9267d288f435a)
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
- gcc/config/rs6000/rs6000.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
-index 0a55c979c36..7e5cdd34840 100644
--- a/gcc/config/rs6000/rs6000.c
-+++ b/gcc/config/rs6000/rs6000.c
-@@ -5782,20 +5782,28 @@ rs6000_machine_from_flags (void)
-   if (rs6000_cpu == PROCESSOR_MPCCORE)
-     return "\"821\"";
- 
-+#if 0
-+  /* This (and ppc64 below) are disabled here (for now at least) because
-+     PROCESSOR_POWERPC, PROCESSOR_POWERPC64, and PROCESSOR_COMMON
-+     are #define'd as some of these.  Untangling that is a job for later.  */
-+
-   /* 600 series and 700 series, "classic" */
-   if (rs6000_cpu == PROCESSOR_PPC601 || rs6000_cpu == PROCESSOR_PPC603
-       || rs6000_cpu == PROCESSOR_PPC604 || rs6000_cpu == PROCESSOR_PPC604e
-      || rs6000_cpu == PROCESSOR_PPC750 || rs6000_cpu == PROCESSOR_POWERPC)
-+      || rs6000_cpu == PROCESSOR_PPC750)
-     return "ppc";
-+#endif
- 
-   /* Classic with AltiVec, "G4" */
-   if (rs6000_cpu == PROCESSOR_PPC7400 || rs6000_cpu == PROCESSOR_PPC7450)
-     return "\"7450\"";
- 
-+#if 0
-   /* The older 64-bit CPUs */
-   if (rs6000_cpu == PROCESSOR_PPC620 || rs6000_cpu == PROCESSOR_PPC630
-      || rs6000_cpu == PROCESSOR_RS64A || rs6000_cpu == PROCESSOR_POWERPC64)
-+      || rs6000_cpu == PROCESSOR_RS64A)
-     return "ppc64";
-+#endif
- 
-   HOST_WIDE_INT flags = rs6000_isa_flags;
- 
-- 
-2.34.3
-
@@ -1,4 +1,4 @@
-From 7a20b4574f06472086c786bd1b078ee962cdb02c Mon Sep 17 00:00:00 2001
+From 35c0801efa26bf248d278b5711b77a19e95b2f57 Mon Sep 17 00:00:00 2001
 From: Stafford Horne <shorne@gmail.com>
 Date: Tue, 6 Apr 2021 05:47:17 +0900
 Subject: [PATCH] or1k: Add mcmodel option to handle large GOTs
@@ -28,7 +28,11 @@ gcc/ChangeLog:
 	* config/or1k/or1k.opt (mcmodel=): New option.
 	* doc/invoke.texi (OpenRISC Options): Document mcmodel.

+Uptream: eff8110674ef193481d3657456a262beeb9951ff
+
 Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+[Romain: add Upstream tag]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
 ---
 gcc/config/or1k/or1k-opts.h | 30 ++++++++++++++++++++++++++++++
 gcc/config/or1k/or1k.c      | 11 +++++++++--
@@ -166,7 +170,7 @@ index 6bd0f3eee6d..cc23e3b8856 100644
 Target RejectNegative Mask(CMOV)
 Enable generation of conditional move (l.cmov) instructions.  By default the
 diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index 35508efb4ef..a1b7608a3aa 100644
+index f1217812280..90c6186fc14 100644
 --- a/gcc/doc/invoke.texi
 +++ b/gcc/doc/invoke.texi
@@ -1136,7 +1136,8 @@ Objective-C and Objective-C++ Dialects}.
@@ -179,7 +183,7 @@ index 35508efb4ef..a1b7608a3aa 100644
 
 @emph{PDP-11 Options}
 @gccoptlist{-mfpu  -msoft-float  -mac0  -mno-ac0  -m40  -m45  -m10 @gol
-@@ -26443,6 +26444,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli},
+@@ -26444,6 +26445,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli},
 @code{l.slli}) instructions.  By default extra instructions will be generated
 to store the immediate to a register first.
 
@@ -196,5 +200,5 @@ index 35508efb4ef..a1b7608a3aa 100644
 @end table
 
 -- 
-2.35.1
+2.34.3

@@ -1,4 +1,4 @@
-From c544a63928406b706b8493fd9b8ca2136b433cf0 Mon Sep 17 00:00:00 2001
+From f75178ccd2f5e4d73e27cccffffada859b87be7d Mon Sep 17 00:00:00 2001
 From: Stafford Horne <shorne@gmail.com>
 Date: Wed, 21 Apr 2021 05:33:15 +0900
 Subject: [PATCH] or1k: Use cmodel=large when building crtstuff
@@ -21,7 +21,11 @@ libgcc/ChangeLog:
 	* config.host (or1k-*, tmake_file): Add or1k/t-crtstuff.
 	* config/or1k/t-crtstuff: New file.

+Upstream: da8a9d695b3c4b9397b5d9a27660bfa48af8d707
+
 Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+[Romain: add Upstream tag]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
 ---
 libgcc/config.host            | 4 ++--
 libgcc/config/or1k/t-crtstuff | 2 ++
@@ -29,10 +33,10 @@ Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
 create mode 100644 libgcc/config/or1k/t-crtstuff

 diff --git a/libgcc/config.host b/libgcc/config.host
-index f2dc7e266f4..6f193c32fbd 100644
+index 45f8e19ada4..5523345abb0 100644
 --- a/libgcc/config.host
 +++ b/libgcc/config.host
-@@ -1132,12 +1132,12 @@ nios2-*-*)
+@@ -1150,12 +1150,12 @@ nios2-*-*)
 	extra_parts="$extra_parts crti.o crtn.o"
 	;;
 or1k-*-linux*)
@@ -56,5 +60,5 @@ index 00000000000..dcae7f3498e
 +# Compile crtbeginS.o and crtendS.o with -mcmodel=large
 +CRTSTUFF_T_CFLAGS_S += -mcmodel=large
 -- 
-2.35.1
+2.34.3

@@ -1,4 +1,4 @@
-From 8ef5787701f4d7cf46a27771d38ab54af2499e25 Mon Sep 17 00:00:00 2001
+From 48ced46a5f81f49737ea13d11a099e03062cf141 Mon Sep 17 00:00:00 2001
 From: Bernd Kuhls <bernd.kuhls@t-online.de>
 Date: Fri, 27 Mar 2020 21:23:53 +0100
 Subject: [PATCH] gcc: define _REENTRANT for OpenRISC when -pthread is passed
@@ -8,7 +8,11 @@ is defined. Added the CPP_SPEC definition to correct this.

 Patch sent upstream: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94372

+Upstream: cac2f69cdad434ad5cb60f5fe931d45cd82ef476
+
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+[Romain: add Upstream tag]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
 ---
 gcc/config/or1k/linux.h | 2 ++
 1 file changed, 2 insertions(+)
@@ -27,5 +31,5 @@ index 196f3f3c8f0..0cbdc934af1 100644
 #define LINK_SPEC "%{h*}			\
    %{static:-Bstatic}				\
 -- 
-2.35.1
+2.34.3

@@ -1,4 +1,4 @@
-From 3b9d7d397fa6dc290eb05bffca80968efb6ec2e5 Mon Sep 17 00:00:00 2001
+From 590ef1956786bfd49dae7a5e2fed67509d06f36b Mon Sep 17 00:00:00 2001
 From: Waldemar Brodkorb <wbx@openadk.org>
 Date: Mon, 25 Jul 2022 00:29:55 +0200
 Subject: [PATCH] disable split-stack for non-thread builds
@@ -1,4 +1,4 @@
-From de3f4ee9a5bd2adcb5ff2e1690db2567fda1473c Mon Sep 17 00:00:00 2001
+From 3e878f9d1c473f91a1377193d4d8d2616357bed1 Mon Sep 17 00:00:00 2001
 From: Xi Ruoyao <xry111@mengyan1223.wang>
 Date: Mon, 28 Jun 2021 13:54:58 +0800
 Subject: [PATCH] fixinc: don't "fix" machine names in __has_include(...)
@@ -93,10 +93,10 @@ index 5b23a8b640d..404b420f302 100644
              with the appropriate underscores, then leave it alone.
              We want exactly two leading and trailing underscores.  */
 diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
-index 066bef99162..b7ad6982e96 100644
+index c2f54d1189a..b2841d384f3 100644
 --- a/fixincludes/inclhack.def
 +++ b/fixincludes/inclhack.def
-@@ -3154,7 +3154,8 @@ fix = {
+@@ -3201,7 +3201,8 @@ fix = {
     c_fix     = machine_name;
 
     test_text = "/* MACH_DIFF: */\n"
@@ -120,5 +120,5 @@ index cf95321fb86..8b3accaf04e 100644
 #endif  /* MACHINE_NAME_CHECK */
 
 -- 
-2.37.3
+2.34.3

@@ -1,82 +0,0 @@
-From ee4af2ed0b7322884ec4ff537564683c3749b813 Mon Sep 17 00:00:00 2001
-From: Jonathan Wakely <jwakely@redhat.com>
-Date: Thu, 22 Dec 2022 09:56:47 +0000
-Subject: [PATCH] libstdc++: Avoid recursion in __nothrow_wait_cv::wait
- [PR105730]
-
-The commit r12-5877-g9e18a25331fa25 removed the incorrect
-noexcept-specifier from std::condition_variable::wait and gave the new
-symbol version @@GLIBCXX_3.4.30. It also redefined the original symbol
-std::condition_variable::wait(unique_lock<mutex>&)@GLIBCXX_3.4.11 as an
-alias for a new symbol, __gnu_cxx::__nothrow_wait_cv::wait, which still
-has the incorrect noexcept guarantee. That __nothrow_wait_cv::wait is
-just a wrapper around the real condition_variable::wait which adds
-noexcept and so terminates on a __forced_unwind exception.
-
-This doesn't work on uclibc, possibly due to a dynamic linker bug. When
-__nothrow_wait_cv::wait calls the condition_variable::wait function it
-binds to the alias symbol, which means it just calls itself recursively
-until the stack overflows.
-
-This change avoids the possibility of a recursive call by changing the
-__nothrow_wait_cv::wait function so that instead of calling
-condition_variable::wait it re-implements it. This requires accessing
-the private _M_cond member of condition_variable, so we need to use the
-trick of instantiating a template with the member-pointer of the private
-member.
-
-libstdc++-v3/ChangeLog:
-
-	PR libstdc++/105730
-	* src/c++11/compatibility-condvar.cc (__nothrow_wait_cv::wait):
-	Access private data member of base class and call its wait
-	member.
-
-Signed-off-by: Gleb Mazovetskiy <glex.spb@gmail.com>
---
- .../src/c++11/compatibility-condvar.cc        | 22 ++++++++++++++++++-
- 1 file changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/libstdc++-v3/src/c++11/compatibility-condvar.cc b/libstdc++-v3/src/c++11/compatibility-condvar.cc
-index e3a8b8403ca..3cef3bc0714 100644
--- a/libstdc++-v3/src/c++11/compatibility-condvar.cc
-+++ b/libstdc++-v3/src/c++11/compatibility-condvar.cc
-@@ -67,6 +67,24 @@ _GLIBCXX_END_NAMESPACE_VERSION
-     && defined(_GLIBCXX_HAVE_SYMVER_SYMBOL_RENAMING_RUNTIME_SUPPORT)
- namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
- {
-+namespace
-+{
-+  // Pointer-to-member for private std::condition_variable::_M_cond member.
-+  std::__condvar std::condition_variable::* __base_member;
-+
-+  template<std::__condvar std::condition_variable::*X>
-+    struct cracker
-+    { static std::__condvar std::condition_variable::* value; };
-+
-+  // Initializer for this static member also initializes __base_member.
-+  template<std::__condvar std::condition_variable::*X>
-+    std::__condvar std::condition_variable::*
-+      cracker<X>::value = __base_member = X;
-+
-+  // Explicit instantiation is allowed to access the private member.
-+  template class cracker<&std::condition_variable::_M_cond>;
-+}
-+
- struct __nothrow_wait_cv : std::condition_variable
- {
-   void wait(std::unique_lock<std::mutex>&) noexcept;
-@@ -76,7 +94,9 @@ __attribute__((used))
- void
- __nothrow_wait_cv::wait(std::unique_lock<std::mutex>& lock) noexcept
- {
-  this->condition_variable::wait(lock);
-+  // In theory this could be simply this->std::condition_variable::wait(lock)
-+  // but with uclibc that binds to the @GLIBCXX_3.4.11 symbol, see PR 105730.
-+  (this->*__base_member).wait(*lock.mutex());
- }
- } // namespace __gnu_cxx
- 
-- 
-2.31.1
-
@@ -87,8 +87,8 @@ config BR2_GCC_VERSION
 	string
 	default "8.4.0"     if BR2_GCC_VERSION_POWERPC_SPE
 	default "10.4.0"    if BR2_GCC_VERSION_10_X
-	default "11.3.0"    if BR2_GCC_VERSION_11_X
-	default "12.2.0"    if BR2_GCC_VERSION_12_X
+	default "11.4.0"    if BR2_GCC_VERSION_11_X
+	default "12.3.0"    if BR2_GCC_VERSION_12_X
 	default "arc-2020.09-release" if BR2_GCC_VERSION_ARC

 config BR2_EXTRA_GCC_CONFIG_OPTIONS
@@ -2,10 +2,10 @@
 sha512  6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b4804bc7fe78df335cb53bc83f1ac055baed40979ce4c2c3e46b70280  gcc-8.4.0.tar.xz
 # From https://gcc.gnu.org/pub/gcc/releases/gcc-10.4.0/sha512.sum
 sha512  440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648  gcc-10.4.0.tar.xz
-# From https://gcc.gnu.org/pub/gcc/releases/gcc-11.3.0/sha512.sum
-sha512  f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7  gcc-11.3.0.tar.xz
-# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.2.0/sha512.sum
-sha512  e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173  gcc-12.2.0.tar.xz
+# From https://gcc.gnu.org/pub/gcc/releases/gcc-11.4.0/sha512.sum
+sha512  a5018bf1f1fa25ddf33f46e720675d261987763db48e7a5fdf4c26d3150a8abcb82fdc413402df1c32f2e6b057d9bae6bdfa026defc4030e10144a8532e60f14  gcc-11.4.0.tar.xz
+# From https://gcc.gnu.org/pub/gcc/releases/gcc-12.3.0/sha512.sum
+sha512  8fb799dfa2e5de5284edf8f821e3d40c2781e4c570f5adfdb1ca0671fcae3fb7f794ea783e80f01ec7bfbf912ca508e478bd749b2755c2c14e4055648146c204  gcc-12.3.0.tar.xz

 # Locally calculated (fetched from Github)
 sha512  b0853e2b1c5998044392023fa653e399e74118c46e616504ac59e1a2cf27620f94434767ce06b6cf4ca3dfb57f81d6eda92752befaf095ea5e564a9181b4659c  gcc-arc-2020.09-release.tar.gz
@@ -3,6 +3,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER
 	depends on BR2_x86_64
 	depends on !BR2_STATIC_LIBS # mesa3d, libva
 	depends on BR2_INSTALL_LIBSTDCPP # intel-gmmlib, mesa3d
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # mesa3d
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d
 	depends on BR2_TOOLCHAIN_HAS_THREADS # intel-gmmlib, libva
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mesa3d
@@ -28,7 +29,7 @@ config BR2_PACKAGE_INTEL_MEDIADRIVER_GEN8

 endif # BR2_PACKAGE_INTEL_MEDIADRIVER

-comment "intel-mediadriver needs a toolchain w/ dynamic library, C++, NPTL"
+comment "intel-mediadriver needs a toolchain w/ dynamic library, gcc >= 8, C++, NPTL"
 	depends on BR2_x86_64 && BR2_TOOLCHAIN_HAS_SYNC_1
 	depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_HAS_THREADS_NPTL
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_GCC_AT_LEAST_8
@@ -0,0 +1,36 @@
+From 491439a5c55b18dce96b522f3a603faaf1908ede Mon Sep 17 00:00:00 2001
+From: Laurent Vivier <laurent@vivier.eu>
+Date: Fri, 21 Apr 2023 18:22:07 +0200
+Subject: [PATCH] m68k: fix getrandom() use with uclibc
+
+With uclibc, getrandom() is only defined with _GNU_SOURCE, fix that:
+
+kexec/arch/m68k/bootinfo.c: In function 'bootinfo_add_rng_seed':
+kexec/arch/m68k/bootinfo.c:231:13: warning: implicit declaration of function 'getrandom'; did you mean 'srandom'? [-Wimplicit-function-declaration]
+  231 |         if (getrandom(bi->rng_seed.data, RNG_SEED_LEN, GRND_NONBLOCK) != RNG_SEED_LEN) {
+      |             ^~~~~~~~~
+      |             srandom
+kexec/arch/m68k/bootinfo.c:231:56: error: 'GRND_NONBLOCK' undeclared (first use in this function)
+  231 |         if (getrandom(bi->rng_seed.data, RNG_SEED_LEN, GRND_NONBLOCK) != RNG_SEED_LEN) {
+      |                                                        ^~~~~~~~~~~~~
+
+Fixes:  b9de05184816 ("m68k: pass rng seed via BI_RNG_SEED")
+Upstream: https://lore.kernel.org/kexec/20230422095904.1303434-1-laurent@vivier.eu/
+Cc: Jason@zx2c4.com
+Signed-off-by: Laurent Vivier <laurent@vivier.eu>
+---
+ kexec/arch/m68k/bootinfo.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kexec/arch/m68k/bootinfo.c b/kexec/arch/m68k/bootinfo.c
+index 086a34bdfdeb..5afd212d9d34 100644
+--- a/kexec/arch/m68k/bootinfo.c
+++ b/kexec/arch/m68k/bootinfo.c
+@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
+-- 
+2.40.0
+
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KODI_PVR_VBOX
 	bool "kodi-pvr-vbox"
+	select BR2_PACKAGE_TINYXML2
 	help
 	  Kodi PVR addon for interfacing with VBox Communications XTi TV
 	  Gateway
@@ -8,6 +8,6 @@ KODI_PVR_VBOX_VERSION = 20.4.2-Nexus
 KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION))
 KODI_PVR_VBOX_LICENSE = GPL-2.0+
 KODI_PVR_VBOX_LICENSE_FILES = LICENSE.md
-KODI_PVR_VBOX_DEPENDENCIES = kodi
+KODI_PVR_VBOX_DEPENDENCIES = kodi tinyxml2

 $(eval $(cmake-package))
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  c57b9a303ad1ebf14ad487901e5da15eba7b3a40304046974fad1d64fb7b8b57  kodi-skin-confluence-e6d31bc84eea73a04b2a23358929d5276be832b8.tar.gz
+sha256  1d55079d2b021b16ae8494497684abab184a86302426af588655577a641074ac  kodi-skin-confluence-a155597cb6bb0f9d46b26ad881be1148929a03af.tar.gz
 sha256  89931c1fb1f3716694175763cf3221cfcd63d6935031cf6b4512d17ffe5d9860  LICENSE.txt
@@ -4,7 +4,7 @@
 #
 ################################################################################

-KODI_SKIN_CONFLUENCE_VERSION = e6d31bc84eea73a04b2a23358929d5276be832b8
+KODI_SKIN_CONFLUENCE_VERSION = a155597cb6bb0f9d46b26ad881be1148929a03af
 KODI_SKIN_CONFLUENCE_SITE = $(call github,xbmc,skin.confluence,$(KODI_SKIN_CONFLUENCE_VERSION))
 KODI_SKIN_CONFLUENCE_LICENSE = GPL-2.0
 KODI_SKIN_CONFLUENCE_LICENSE_FILES = LICENSE.txt
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-# https://curl.se/download/curl-8.0.1.tar.xz.asc
+# https://curl.se/download/curl-8.1.2.tar.xz.asc
 # signed with key 27EDEAF22F3ABCEB50DB9A125CC908FDB71E12C2
-sha256  0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0  curl-8.0.1.tar.xz
+sha256  31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6  curl-8.1.2.tar.xz
 sha256  b1d7feb949ea5023552029fbe0bf5db4f23c2f85e9b8e51e18536f0ecbf9c524  COPYING
@@ -4,7 +4,7 @@
 #
 ################################################################################

-LIBCURL_VERSION = 8.0.1
+LIBCURL_VERSION = 8.1.2
 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.xz
 LIBCURL_SITE = https://curl.se/download
 LIBCURL_DEPENDENCIES = host-pkgconf \
@@ -10,7 +10,11 @@ if BR2_PACKAGE_LIBMNL

 config BR2_PACKAGE_LIBMNL_EXAMPLES
 	bool "install examples"
+	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
 	help
 	  Install binary examples.

+comment "examples needs a toolchain w/ headers >= 4.11"
+	depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_11
+
 endif
@@ -13,7 +13,7 @@ diff --git a/crypto/mem_sec.c b/crypto/mem_sec.c
 index 9e0f670..32c7282 100644
 --- a/crypto/mem_sec.c
 +++ b/crypto/mem_sec.c
-@@ -485,7 +485,7 @@ static int sh_init(size_t size, int minsize)
+@@ -491,7 +491,7 @@ static int sh_init(size_t size, int minsize)
     if (mlock(sh.arena, sh.arena_size) < 0)
         ret = 2;
 #endif
@@ -21,7 +21,7 @@ diff --git a/Configure b/Configure
 index 5a699836f3..f9152b1702 100755
 --- a/Configure
 +++ b/Configure
-@@ -1417,6 +1417,10 @@ my %predefined_CXX = $config{CXX}
+@@ -1424,6 +1424,10 @@ my %predefined_CXX = $config{CXX}
     ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
     : ();
 
@@ -23,7 +23,7 @@ diff --git a/engines/e_afalg.c b/engines/e_afalg.c
 index 9480d7c24b..4e9d67db2d 100644
 --- a/engines/e_afalg.c
 +++ b/engines/e_afalg.c
-@@ -124,27 +124,56 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb)
+@@ -121,27 +121,56 @@ static ossl_inline int io_read(aio_context_t ctx, long n, struct iocb **iocb)
     return syscall(__NR_io_submit, ctx, n, iocb);
 }
 
@@ -1,5 +1,5 @@
-# From https://www.openssl.org/source/openssl-1.1.1t.tar.gz.sha256
-sha256  8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b  openssl-1.1.1t.tar.gz
+# From https://www.openssl.org/source/openssl-1.1.1u.tar.gz.sha256
+sha256  e2f8d84b523eecd06c7be7626830370300fbcc15386bf5142d72758f6963ebc6  openssl-1.1.1u.tar.gz

 # License files
 sha256  c32913b33252e71190af2066f08115c69bc9fddadf3bf29296e20c835389841c  LICENSE
@@ -4,7 +4,7 @@
 #
 ################################################################################

-LIBOPENSSL_VERSION = 1.1.1t
+LIBOPENSSL_VERSION = 1.1.1u
 LIBOPENSSL_SITE = https://www.openssl.org/source
 LIBOPENSSL_SOURCE = openssl-$(LIBOPENSSL_VERSION).tar.gz
 LIBOPENSSL_LICENSE = OpenSSL or SSLeay
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBPQXX
 	bool "libpqxx"
 	depends on BR2_PACKAGE_POSTGRESQL
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  libpqxx is the official C++ client API for PostgreSQL, the
@@ -10,8 +10,8 @@ config BR2_PACKAGE_LIBPQXX

 	  http://pqxx.org/development/libpqxx/

-comment "libpqxx needs toolchain w/ C++, gcc >= 4.9, threads"
+comment "libpqxx needs toolchain w/ C++, gcc >= 7, threads"
 	depends on BR2_PACKAGE_POSTGRESQL
 	depends on !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
 		!BR2_TOOLCHAIN_HAS_THREADS
@@ -11,6 +11,8 @@ LIBPQXX_DEPENDENCIES = postgresql
 LIBPQXX_LICENSE = BSD-3-Clause
 LIBPQXX_LICENSE_FILES = COPYING

-LIBPQXX_CONF_ENV += ac_cv_path_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config
+LIBPQXX_CONF_ENV = \
+	ac_cv_path_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config \
+	CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++17"

 $(eval $(autotools-package))
@@ -1,4 +1,4 @@
 # From https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/SHA256
-sha256  b06aa538fefc9c6b33c4db4931a09a5f52d9d2357219afcbff7d93fe12ebf6f7  libressl-3.7.2.tar.gz
+sha256  7948c856a90c825bd7268b6f85674a8dcd254bae42e221781b24e3f8dc335db3  libressl-3.7.3.tar.gz
 # Locally computed
 sha256  5c63613f008f16a9c0025c096bbd736cecf720494d121b5c5203e0ec6e5955b1  COPYING
@@ -4,7 +4,7 @@
 #
 ################################################################################

-LIBRESSL_VERSION = 3.7.2
+LIBRESSL_VERSION = 3.7.3
 LIBRESSL_SITE = https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
 LIBRESSL_LICENSE = ISC (new additions), OpenSSL or SSLeay (original OpenSSL code)
 LIBRESSL_LICENSE_FILES = COPYING
@@ -1,5 +1,5 @@
 # Locally calculated after checking pgp signature
-# https://www.libssh.org/files/0.10/libssh-0.10.4.tar.xz.asc
+# https://www.libssh.org/files/0.10/libssh-0.10.5.tar.xz.asc
 # with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D
-sha256  07392c54ab61476288d1c1f0a7c557b50211797ad00c34c3af2bbc4dbc4bd97d  libssh-0.10.4.tar.xz
+sha256  b60e2ff7f367b9eee2b5634d3a63303ddfede0e6a18dfca88c44a8770e7e4234  libssh-0.10.5.tar.xz
 sha256  1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a  COPYING
@@ -5,7 +5,7 @@
 ################################################################################

 LIBSSH_VERSION_MAJOR = 0.10
-LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).4
+LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).5
 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
 LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR)
 LIBSSH_LICENSE = LGPL-2.1
@@ -49,10 +49,6 @@ config BR2_KERNEL_HEADERS_6_1
 	bool "Linux 6.1.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_1

-config BR2_KERNEL_HEADERS_6_2
-	bool "Linux 6.2.x kernel headers"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_2
-
 config BR2_KERNEL_HEADERS_6_3
 	bool "Linux 6.3.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_6_3
@@ -400,14 +396,13 @@ endchoice

 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "4.14.314"	if BR2_KERNEL_HEADERS_4_14
-	default "4.19.282"	if BR2_KERNEL_HEADERS_4_19
-	default "5.4.242"	if BR2_KERNEL_HEADERS_5_4
-	default "5.10.179"	if BR2_KERNEL_HEADERS_5_10
-	default "5.15.111"	if BR2_KERNEL_HEADERS_5_15
-	default "6.1.28"	if BR2_KERNEL_HEADERS_6_1
-	default "6.2.15"	if BR2_KERNEL_HEADERS_6_2
-	default "6.3.2"		if BR2_KERNEL_HEADERS_6_3
+	default "4.14.316"	if BR2_KERNEL_HEADERS_4_14
+	default "4.19.284"	if BR2_KERNEL_HEADERS_4_19
+	default "5.4.244"	if BR2_KERNEL_HEADERS_5_4
+	default "5.10.181"	if BR2_KERNEL_HEADERS_5_10
+	default "5.15.114"	if BR2_KERNEL_HEADERS_5_15
+	default "6.1.31"	if BR2_KERNEL_HEADERS_6_1
+	default "6.3.5"		if BR2_KERNEL_HEADERS_6_3
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
 	default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
@@ -0,0 +1,34 @@
+From c6c71ab47d658ab8f84e6a6066d476fd9632bbca Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyich@gmail.com>
+Date: Mon, 23 May 2022 08:03:23 +0100
+Subject: [PATCH] Add missing <cstdint> header to Signals.h
+
+Without the change llvm build fails on this week's gcc-13 snapshot as:
+
+    [  0%] Building CXX object lib/Support/CMakeFiles/LLVMSupport.dir/Signals.cpp.o
+    In file included from llvm/lib/Support/Signals.cpp:14:
+    llvm/include/llvm/Support/Signals.h:119:8: error: variable or field 'CleanupOnSignal' declared void
+      119 |   void CleanupOnSignal(uintptr_t Context);
+          |        ^~~~~~~~~~~~~~~
+
+Upstream: https://github.com/llvm/llvm-project/commit/ff1681ddb303223973653f7f5f3f3435b48a1983.patch
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ include/llvm/Support/Signals.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/llvm/Support/Signals.h b/include/llvm/Support/Signals.h
+index e0a18e72..148216b8 100644
+--- a/include/llvm/Support/Signals.h
+++ b/include/llvm/Support/Signals.h
+@@ -14,6 +14,7 @@
+ #ifndef LLVM_SUPPORT_SIGNALS_H
+ #define LLVM_SUPPORT_SIGNALS_H
+ 
+#include <cstdint>
+ #include <string>
+ 
+ namespace llvm {
+-- 
+2.40.1
+
@@ -1,5 +0,0 @@
-# Hashes from: https://www.lua.org/ftp/
-sha256  59df426a3d50ea535a460a452315c4c0d4e1121ba72ff0bdde58c2ef31d6f444  lua-5.4.5.tar.gz
-
-# Locally computed
-sha256  0d4ee721cf740f9cd878ef82ef75f4f2724dcf0403e56cd0b5643ad88f9de337  doc/readme.html
@@ -0,0 +1,5 @@
+# Hashes from: https://www.lua.org/ftp/
+sha256  7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88  lua-5.4.6.tar.gz
+
+# Locally computed
+sha256  8f1bff27c5b0585ab679dbe4e37e75a1014af0f79732f42a79f86728321a0c6d  doc/readme.html
@@ -5,7 +5,7 @@
 ################################################################################

 ifeq ($(BR2_PACKAGE_LUA_5_4),y)
-LUA_VERSION = 5.4.5
+LUA_VERSION = 5.4.6
 else ifeq ($(BR2_PACKAGE_LUA_5_3),y)
 LUA_VERSION = 5.3.6
 else
@@ -0,0 +1,50 @@
+From 2a6908ff4c94284b39c3cd4c97e1069876720eb7 Mon Sep 17 00:00:00 2001
+From: Jordan Justen <jordan.l.justen@intel.com>
+Date: Tue, 16 May 2023 18:46:50 -0700
+Subject: [PATCH] mesa/main: Exit early when trying to create an unsupported
+ context API
+
+Fixes: adbe8b6c17a ("mesa: optimize out _mesa_is_desktop_gl*() and _mesa_is_gles*() calls when not built")
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9038
+Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
+Reviewed-by: Eric Engestrom <eric@engestrom.ch>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23068>
+Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/8bb1ecaa02177720758255bdd7ec34a5d15feca4
+[Romain: backport to 23.1]
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ src/mesa/main/context.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
+index d8eea2ea867..2b810b0d863 100644
+--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
+@@ -996,6 +996,24 @@ _mesa_initialize_context(struct gl_context *ctx,
+    struct gl_shared_state *shared;
+    int i;
+ 
+   switch (api) {
+   case API_OPENGL_COMPAT:
+   case API_OPENGL_CORE:
+      if (!HAVE_OPENGL)
+         return GL_FALSE;
+      break;
+   case API_OPENGLES2:
+      if (!HAVE_OPENGL_ES_2)
+         return GL_FALSE;
+      break;
+   case API_OPENGLES:
+      if (!HAVE_OPENGL_ES_1)
+         return GL_FALSE;
+      break;
+   default:
+      return GL_FALSE;
+   }
+
+    ctx->API = api;
+    ctx->DrawBuffer = NULL;
+    ctx->ReadBuffer = NULL;
+-- 
+2.40.1
+
@@ -0,0 +1,46 @@
+From cd861b7f38e448822ce765aee61304d1e0a3a8b5 Mon Sep 17 00:00:00 2001
+From: James Knight <james.d.knight@live.com>
+Date: Thu, 13 Apr 2023 16:38:51 -0400
+Subject: meson: ensure i915 Gallium driver includes Intel sources
+
+Ensure builds flag the use of Intel sources when the i915 Gallium driver
+is configured (`-Dgallium-drivers=i915`). Otherwise, a build may fail if
+other Intel-based configuration options are not enabled:
+
+    ./src/gallium/winsys/i915/drm/meson.build:21:0: ERROR: Unknown variable "libintel_common".
+
+Signed-off-by: James Knight <james.d.knight@live.com>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22490>
+
+Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/cd861b7f38e448822ce765aee61304d1e0a3a8b5
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ meson.build | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+(limited to 'meson.build')
+
+diff --git a/meson.build b/meson.build
+index 23d2d965b37..a3e3c5478a8 100644
+--- a/meson.build
+++ b/meson.build
+@@ -245,7 +245,14 @@ with_microsoft_vk = _vulkan_drivers.contains('microsoft-experimental')
+ with_any_vk = _vulkan_drivers.length() != 0
+ 
+ with_any_broadcom = with_gallium_vc4 or with_gallium_v3d or with_broadcom_vk
+-with_any_intel = with_intel_vk or with_intel_hasvk or with_gallium_iris or with_gallium_crocus or with_intel_tools
+with_any_intel = [
+  with_gallium_crocus,
+  with_gallium_i915,
+  with_gallium_iris,
+  with_intel_hasvk,
+  with_intel_tools,
+  with_intel_vk,
+].contains(true)
+ 
+ if with_swrast_vk and not with_gallium_softpipe
+   error('swrast vulkan requires gallium swrast')
+-- 
+cgit v1.2.1
+
@@ -4,7 +4,7 @@ menuconfig BR2_PACKAGE_MESA3D
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
-	depends on !BR2_m68k || BR2_TOOLCHAIN_GCC_AT_LEAST_7 # m68k needs gcc >= 7.x
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
@@ -24,7 +24,6 @@ config BR2_PACKAGE_MESA3D_NEEDS_ELFUTILS
 config BR2_PACKAGE_MESA3D_LLVM
 	bool "llvm support"
 	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # std::shared_future
@@ -33,10 +32,9 @@ config BR2_PACKAGE_MESA3D_LLVM
 	depends on BR2_HOST_GCC_AT_LEAST_5 # host-llvm
 	select BR2_PACKAGE_LLVM

-comment "llvm support needs a toolchain w/ wchar, threads, C++, gcc >= 5, dynamic library, host gcc >= 5"
+comment "llvm support needs a toolchain w/ wchar, threads, C++, dynamic library, host gcc >= 5"
 	depends on BR2_PACKAGE_LLVM_ARCH_SUPPORTS
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_5 \
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \
 		|| BR2_STATIC_LIBS || !BR2_USE_WCHAR \
 		|| !BR2_HOST_GCC_AT_LEAST_5

@@ -391,11 +389,7 @@ config BR2_PACKAGE_PROVIDES_LIBOPENCL

 endif # BR2_PACKAGE_MESA3D

-comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library"
+comment "mesa3d needs a toolchain w/ gcc >=8, C++, NPTL, dynamic library"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
-		BR2_STATIC_LIBS
+		BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_8
 	depends on BR2_TOOLCHAIN_HAS_SYNC_1
-
-comment "mesa3d needs a toolchain w/ gcc >= 7"
-	depends on BR2_m68k
-	depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_7
@@ -1,6 +1,6 @@
-# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.2/
-sha1  71750adadc34490d52f0b9a930c2731a47f9772d  minidlna-1.3.2.tar.gz
+# From https://sourceforge.net/projects/minidlna/files/minidlna/1.3.3/
+sha1  2d42028d2ca5ae04affdb96cb414314867e179ea  minidlna-1.3.3.tar.gz
 # Locally computed
-sha256  222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0  minidlna-1.3.2.tar.gz
+sha256  39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4  minidlna-1.3.3.tar.gz
 sha256  79146b7f558e56510b9a714ff75318c05ab93aeccfd6597497b9bce212cf92ea  COPYING
 sha256  94876d7886116e176e702b4902bd9f19731a6883db5f229ac2a7058a22aa6529  LICENCE.miniupnpd
@@ -4,7 +4,7 @@
 #
 ################################################################################

-MINIDLNA_VERSION = 1.3.2
+MINIDLNA_VERSION = 1.3.3
 MINIDLNA_SITE = https://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION)
 MINIDLNA_LICENSE = GPL-2.0, BSD-3-Clause
 MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd
@@ -1,3 +1,3 @@
 # Locally calculated after checking pgp signature
-sha256  b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7  mpd-0.23.12.tar.xz
+sha256  a96b01e6fbbb7e8ab25eb7c15d5c811c62eb19b76d143a802f51674791f1d519  mpd-0.23.13.tar.xz
 sha256  ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6  COPYING
@@ -5,7 +5,7 @@
 ################################################################################

 MPD_VERSION_MAJOR = 0.23
-MPD_VERSION = $(MPD_VERSION_MAJOR).12
+MPD_VERSION = $(MPD_VERSION_MAJOR).13
 MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz
 MPD_SITE = https://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR)
 MPD_DEPENDENCIES = host-pkgconf boost fmt
@@ -1,10 +1,10 @@
 # https://github.com/adoptium/temurin17-binaries/releases
-sha256  a0b1b9dd809d51a438f5fa08918f9aca7b2135721097f0858cf29f77a35d4289  OpenJDK17U-jdk_x64_linux_hotspot_17.0.6_10.tar.gz
-sha256  9e0e88bbd9fa662567d0c1e22d469268c68ac078e9e5fe5a7244f56fec71f55f  OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.6_10.tar.gz
+sha256  e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b  OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz
+sha256  0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade  OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz

 # From https://github.com/adoptium/temurin11-binaries/releases
-sha256  4a29efda1d702b8ff38e554cf932051f40ec70006caed5c4857a8cbc7a0b7db7  OpenJDK11U-jdk_x64_linux_hotspot_11.0.18_10.tar.gz
-sha256  04d5eeff6a6449bcdca0f52cd97bafd43ce09d40ef1e73fa0e1add63bea4a9c8  OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.18_10.tar.gz
+sha256  5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581  OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz
+sha256  0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254  OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz

 # Locally calculated
 sha256  4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726  legal/java.prefs/LICENSE
@@ -6,10 +6,10 @@

 ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y)
 HOST_OPENJDK_BIN_VERSION_MAJOR = 17
-HOST_OPENJDK_BIN_VERSION_MINOR = 0.6_10
+HOST_OPENJDK_BIN_VERSION_MINOR = 0.7_7
 else
 HOST_OPENJDK_BIN_VERSION_MAJOR = 11
-HOST_OPENJDK_BIN_VERSION_MINOR = 0.18_10
+HOST_OPENJDK_BIN_VERSION_MINOR = 0.19_7
 endif

 ifeq ($(HOSTARCH),x86_64)
@@ -68,7 +68,7 @@ diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.c
 index b08caf4d5d3..2bf084895ba 100644
 --- a/src/hotspot/os/linux/os_linux.cpp
 +++ b/src/hotspot/os/linux/os_linux.cpp
-@@ -1674,6 +1674,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
+@@ -1676,6 +1676,9 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
 #ifndef EM_AARCH64
   #define EM_AARCH64    183               /* ARM AARCH64 */
 #endif
@@ -78,7 +78,7 @@ index b08caf4d5d3..2bf084895ba 100644
 #ifndef EM_RISCV
   #define EM_RISCV      243               /* RISC-V */
 #endif
-@@ -1698,6 +1701,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
+@@ -1700,6 +1703,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
     {EM_SH,          EM_SH,      ELFCLASS32, ELFDATA2MSB, (char*)"SuperH BE"},
 #endif
     {EM_ARM,         EM_ARM,     ELFCLASS32, ELFDATA2LSB, (char*)"ARM"},
@@ -86,7 +86,7 @@ index b08caf4d5d3..2bf084895ba 100644
     // we only support 64 bit z architecture
     {EM_S390,        EM_S390,    ELFCLASS64, ELFDATA2MSB, (char*)"IBM System/390"},
     {EM_ALPHA,       EM_ALPHA,   ELFCLASS64, ELFDATA2LSB, (char*)"Alpha"},
-@@ -1726,6 +1730,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
+@@ -1728,6 +1732,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
   static  Elf32_Half running_arch_code=EM_PPC;
 #elif  (defined AARCH64)
   static  Elf32_Half running_arch_code=EM_AARCH64;
@@ -95,7 +95,7 @@ index b08caf4d5d3..2bf084895ba 100644
 #elif  (defined ARM)
   static  Elf32_Half running_arch_code=EM_ARM;
 #elif  (defined S390)
-@@ -1748,7 +1754,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
+@@ -1750,7 +1756,7 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen) {
   static  Elf32_Half running_arch_code=EM_LOONGARCH;
 #else
     #error Method os::dll_load requires that one of following is defined:\
@@ -1,4 +1,4 @@
 # Locally computed
-sha256  331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472  openjdk-17.0.6+10.tar.gz
-sha256  04af71fc7adda41a49861870f9ec0ac0f059c2cf9393ce32995ea8ef4279a1b1  openjdk-11.0.18+10.tar.gz
+sha256  43b80a5aec5fce908e80858e9b34efdf1b49255a12ce303650325af65141d3e8  openjdk-17.0.7+7.tar.gz
+sha256  25fd9ab3042a284aa4e6348969403016404bc2706a4a02c149a0054fbe477337  openjdk-11.0.19+7.tar.gz
 sha256  4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726  LICENSE
@@ -6,10 +6,10 @@

 ifeq ($(BR2_PACKAGE_OPENJDK_VERSION_17),y)
 OPENJDK_VERSION_MAJOR = 17
-OPENJDK_VERSION_MINOR = 0.6+10
+OPENJDK_VERSION_MINOR = 0.7+7
 else
 OPENJDK_VERSION_MAJOR = 11
-OPENJDK_VERSION_MINOR = 0.18+10
+OPENJDK_VERSION_MINOR = 0.19+7
 endif
 OPENJDK_VERSION = $(OPENJDK_VERSION_MAJOR).$(OPENJDK_VERSION_MINOR)
 OPENJDK_SITE = $(call github,openjdk,jdk$(OPENJDK_VERSION_MAJOR)u,jdk-$(OPENJDK_VERSION))
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PERL_CLONE
+	bool "perl-clone"
+	depends on !BR2_STATIC_LIBS
+	help
+	  recursively copy Perl datatypes.
+
+	  https://metacpan.org/release/Clone
+
+comment "perl-clone needs a toolchain w/ dynamic library"
+	depends on BR2_STATIC_LIBS
@@ -0,0 +1,6 @@
+# retrieved by scancpan from https://cpan.metacpan.org/
+md5  cafa8984a2c2e005e54b27dd1e3f0afe  Clone-0.46.tar.gz
+sha256  aadeed5e4c8bd6bbdf68c0dd0066cb513e16ab9e5b4382dc4a0aafd55890697b  Clone-0.46.tar.gz
+
+# computed by scancpan
+sha256  40aa7eb133e97b075024380640528760a54aefc344781741ed02539a375db5ac  README.md
@@ -0,0 +1,14 @@
+################################################################################
+#
+# perl-clone
+#
+################################################################################
+
+PERL_CLONE_VERSION = 0.46
+PERL_CLONE_SOURCE = Clone-$(PERL_CLONE_VERSION).tar.gz
+PERL_CLONE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GARU
+PERL_CLONE_LICENSE = Artistic or GPL-1.0+
+PERL_CLONE_LICENSE_FILES = README.md
+PERL_CLONE_DISTNAME = Clone
+
+$(eval $(perl-package))
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PERL_HTTP_MESSAGE
 	bool "perl-http-message"
+	select BR2_PACKAGE_PERL_CLONE # runtime
 	select BR2_PACKAGE_PERL_ENCODE_LOCALE # runtime
 	select BR2_PACKAGE_PERL_HTTP_DATE # runtime
 	select BR2_PACKAGE_PERL_IO_HTML # runtime
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_ASTTOKENS
+	bool "python-asttokens"
+	select BR2_PACKAGE_PYTHON_SIX # runtime
+	help
+	  Annotate AST trees with source code positions.
+
+	  https://github.com/gristlabs/asttokens
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/asttokens/json
+md5  a9ae6ae0f85398e511bcb9ec87695eed  asttokens-2.2.1.tar.gz
+sha256  4622110b2a6f30b77e1473affaa97e711bc2f07d3f10848420ff1898edbe94f3  asttokens-2.2.1.tar.gz
+# Locally computed sha256 checksums
+sha256  b40930bbcf80744c86c46a12bc9da056641d722716c378f5659b9e555ef833e1  LICENSE
@@ -0,0 +1,16 @@
+################################################################################
+#
+# python-asttokens
+#
+################################################################################
+
+PYTHON_ASTTOKENS_VERSION = 2.2.1
+PYTHON_ASTTOKENS_SOURCE = asttokens-$(PYTHON_ASTTOKENS_VERSION).tar.gz
+PYTHON_ASTTOKENS_SITE = https://files.pythonhosted.org/packages/c8/e3/b0b4f32162621126fbdaba636c152c6b6baec486c99f48686e66343d638f
+PYTHON_ASTTOKENS_SETUP_TYPE = setuptools
+PYTHON_ASTTOKENS_LICENSE = Apache-2.0
+PYTHON_ASTTOKENS_LICENSE_FILES = LICENSE
+
+PYTHON_ASTTOKENS_DEPENDENCIES = host-python-setuptools-scm
+
+$(eval $(python-package))
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_CAN
 	bool "python-can"
+	select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime
 	select BR2_PACKAGE_PYTHON3_SQLITE # runtime
 	select BR2_PACKAGE_PYTHON_AENUM # runtime
 	select BR2_PACKAGE_PYTHON_MSGPACK # runtime
@@ -2,6 +2,7 @@ config BR2_PACKAGE_PYTHON_DJANGO
 	bool "python-django"
 	select BR2_PACKAGE_PYTHON3_UNICODEDATA
 	select BR2_PACKAGE_PYTHON3_PYEXPAT
+	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	select BR2_PACKAGE_PYTHON_ASGIREF # runtime
 	select BR2_PACKAGE_PYTHON_SQLPARSE # runtime
 	help
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_PYTHON_EXECUTING
+	bool "python-executing"
+	help
+	  Get the currently executing AST node of a frame, and other
+	  information.
+
+	  https://github.com/alexmojaki/executing
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/executing/json
+md5  e6fa9a6abf00555ccc8a6b3524729238  executing-1.2.0.tar.gz
+sha256  19da64c18d2d851112f09c287f8d3dbbdf725ab0e569077efb6cdcbd3497c107  executing-1.2.0.tar.gz
+# Locally computed sha256 checksums
+sha256  a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181  LICENSE.txt
@@ -0,0 +1,16 @@
+################################################################################
+#
+# python-executing
+#
+################################################################################
+
+PYTHON_EXECUTING_VERSION = 1.2.0
+PYTHON_EXECUTING_SOURCE = executing-$(PYTHON_EXECUTING_VERSION).tar.gz
+PYTHON_EXECUTING_SITE = https://files.pythonhosted.org/packages/8f/ac/89ff37d8594b0eef176b7cec742ac868fef853b8e18df0309e3def9f480b
+PYTHON_EXECUTING_SETUP_TYPE = setuptools
+PYTHON_EXECUTING_LICENSE = MIT
+PYTHON_EXECUTING_LICENSE_FILES = LICENSE.txt
+
+PYTHON_EXECUTING_DEPENDENCIES = host-python-setuptools-scm
+
+$(eval $(python-package))
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_PYTHON_IPYTHON
 	bool "python-ipython"
+	select BR2_PACKAGE_PYTHON3_SQLITE # runtime
 	select BR2_PACKAGE_PYTHON_BACKCALL # runtime
 	select BR2_PACKAGE_PYTHON_DECORATOR # runtime
 	select BR2_PACKAGE_PYTHON_JEDI # runtime
@@ -7,6 +8,7 @@ config BR2_PACKAGE_PYTHON_IPYTHON
 	select BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT # runtime
 	select BR2_PACKAGE_PYTHON_PYGMENTS  # runtime
 	select BR2_PACKAGE_PYTHON_PEXPECT # runtime
+	select BR2_PACKAGE_PYTHON_STACK_DATA # runtime
 	select BR2_PACKAGE_PYTHON_TRAITLETS  # runtime
 	help
 	  IPython is a command shell for interactive computing in
@@ -11,6 +11,7 @@ config BR2_PACKAGE_PYTHON_MATPLOTLIB
 	select BR2_PACKAGE_PYTHON_DATEUTIL # runtime
 	select BR2_PACKAGE_PYTHON_KIWISOLVER # runtime
 	select BR2_PACKAGE_PYTHON_NUMPY # runtime
+	select BR2_PACKAGE_PYTHON_PILLOW # runtime
 	select BR2_PACKAGE_PYTHON_PYPARSING # runtime
 	select BR2_PACKAGE_PYTHON3_ZLIB # runtime
 	select BR2_PACKAGE_QHULL
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_PYTHON_PURE_EVAL
+	bool "python-pure-eval"
+	help
+	  Safely evaluate AST nodes without side effects.
+
+	  http://github.com/alexmojaki/pure_eval
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/pure_eval/json
+md5  212fd27ca2c58d9effddec69748d738a  pure_eval-0.2.2.tar.gz
+sha256  2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3  pure_eval-0.2.2.tar.gz
+# Locally computed sha256 checksums
+sha256  a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181  LICENSE.txt
@@ -0,0 +1,16 @@
+################################################################################
+#
+# python-pure-eval
+#
+################################################################################
+
+PYTHON_PURE_EVAL_VERSION = 0.2.2
+PYTHON_PURE_EVAL_SOURCE = pure_eval-$(PYTHON_PURE_EVAL_VERSION).tar.gz
+PYTHON_PURE_EVAL_SITE = https://files.pythonhosted.org/packages/97/5a/0bc937c25d3ce4e0a74335222aee05455d6afa2888032185f8ab50cdf6fd
+PYTHON_PURE_EVAL_SETUP_TYPE = setuptools
+PYTHON_PURE_EVAL_LICENSE = MIT
+PYTHON_PURE_EVAL_LICENSE_FILES = LICENSE.txt
+
+PYTHON_PURE_EVAL_DEPENDENCIES = host-python-setuptools-scm
+
+$(eval $(python-package))
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_PYTHON_STACK_DATA
+	bool "python-stack-data"
+	select BR2_PACKAGE_PYTHON_ASTTOKENS # runtime
+	select BR2_PACKAGE_PYTHON_EXECUTING # runtime
+	select BR2_PACKAGE_PYTHON_PURE_EVAL # runtime
+	help
+	  Extract data from python stack frames and tracebacks
+	  for informative displays.
+
+	  http://github.com/alexmojaki/stack_data
@@ -0,0 +1,5 @@
+# md5, sha256 from https://pypi.org/pypi/stack_data/json
+md5  bf86c3c81a0158e1e7f3979da5a0033b  stack_data-0.6.2.tar.gz
+sha256  32d2dd0376772d01b6cb9fc996f3c8b57a357089dec328ed4b6553d037eaf815  stack_data-0.6.2.tar.gz
+# Locally computed sha256 checksums
+sha256  a476a2cb0ef4c41450340a577a28b91ac4c7f669136b2ee148047fabd5fc4181  LICENSE.txt
@@ -0,0 +1,14 @@
+################################################################################
+#
+# python-stack-data
+#
+################################################################################
+
+PYTHON_STACK_DATA_VERSION = 0.6.2
+PYTHON_STACK_DATA_SOURCE = stack_data-$(PYTHON_STACK_DATA_VERSION).tar.gz
+PYTHON_STACK_DATA_SITE = https://files.pythonhosted.org/packages/db/18/aa7f2b111aeba2cd83503254d9133a912d7f61f459a0c8561858f0d72a56
+PYTHON_STACK_DATA_SETUP_TYPE = setuptools
+PYTHON_STACK_DATA_LICENSE = MIT
+PYTHON_STACK_DATA_LICENSE_FILES = LICENSE.txt
+
+$(eval $(python-package))
@@ -1,3 +1,3 @@
 # Locally calculated
 sha256  7a6ba86a478648ce617e3a5e9277181bc67f7ce9876605eea6affd4a0d6eea8f  SDL2_mixer-2.6.3.tar.gz
-sha256  113727180e7956cb9718b03b41da85b63ea54743a33047071a623bf672895a10  COPYING.txt
+sha256  1852c8549e3d154687197d46abababd3e8faae035f19991b2ca850fa3a43ad57  LICENSE.txt
@@ -8,7 +8,7 @@ SDL2_MIXER_VERSION = 2.6.3
 SDL2_MIXER_SOURCE = SDL2_mixer-$(SDL2_MIXER_VERSION).tar.gz
 SDL2_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release
 SDL2_MIXER_LICENSE = Zlib
-SDL2_MIXER_LICENSE_FILES = COPYING.txt
+SDL2_MIXER_LICENSE_FILES = LICENSE.txt
 SDL2_MIXER_INSTALL_STAGING = YES
 SDL2_MIXER_DEPENDENCIES = sdl2 host-pkgconf

@@ -1,3 +1,3 @@
 # Locally calculated
 sha256  4e4a891988316271974ff4e9585ed1ef729a123d22c08bd473129179dc857feb  SDL2_net-2.2.0.tar.gz
-sha256  f09845a238245402a8b8388db6634d8a5b2c3e1dc098f16f9d8c74a276ef4594  COPYING.txt
+sha256  fcb07e07ac6bc8b2fcf047b50431ef4ebe5b619d7ca7c82212018309a9067426  LICENSE.txt
@@ -8,7 +8,7 @@ SDL2_NET_VERSION = 2.2.0
 SDL2_NET_SOURCE = SDL2_net-$(SDL2_NET_VERSION).tar.gz
 SDL2_NET_SITE = http://www.libsdl.org/projects/SDL_net/release
 SDL2_NET_LICENSE = Zlib
-SDL2_NET_LICENSE_FILES = COPYING.txt
+SDL2_NET_LICENSE_FILES = LICENSE.txt
 SDL2_NET_INSTALL_STAGING = YES
 SDL2_NET_DEPENDENCIES = sdl2 host-pkgconf

@@ -14,7 +14,7 @@ diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c
 
 +/* uclibc and dietlibc do not have this junk -ReneR */
 +#if defined (__UCLIBC__) || defined (__dietlibc__)
-+static int getloadavg (double loadavg[], int nelem)
+int getloadavg (double loadavg[], int nelem)
 +{
 +  int fd;
 +
@@ -1,12 +1,28 @@
-Fix musl build
+From fb44386acc2497ac250364bc08cebc26ded816cf Mon Sep 17 00:00:00 2001
+From: Carlo Landmeter <clandmeter@gmail.com>
+Date: Tue, 16 May 2023 19:57:39 +0200
+Subject: [PATCH] Fix musl build

 Downloaded from
 https://git.alpinelinux.org/aports/tree/community/vdr/musl-compat.patch

+Initial commit:
+https://git.alpinelinux.org/aports/commit/?id=140248605cee4a0160f80b47ce77a823be2f740a
+
+Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029744.html
+
 Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ i18n.h   |  2 +-
+ osd.c    |  2 +-
+ thread.c |  4 +++-
+ tools.c  |  4 ++--
+ tools.h  | 14 ++++++++++++--
+ vdr.c    |  6 ++++++
+ 6 files changed, 25 insertions(+), 7 deletions(-)

 diff --git a/i18n.h b/i18n.h
-index f8ad9de..b002bbf 100644
+index 03deb6f2..85ce4077 100644
 --- a/i18n.h
 +++ b/i18n.h
@@ -46,7 +46,7 @@ const cStringList *I18nLanguages(void);
@@ -19,7 +35,7 @@ index f8ad9de..b002bbf 100644
    ///< the current language. If no translation is available, the original
    ///< string will be returned.
 diff --git a/osd.c b/osd.c
-index 524700a..ef975f5 100644
+index 47bda686..0d360c81 100644
 --- a/osd.c
 +++ b/osd.c
@@ -12,7 +12,7 @@
@@ -32,10 +48,10 @@ index 524700a..ef975f5 100644
 #include "tools.h"
 
 diff --git a/thread.c b/thread.c
-index 47eb977..58dba43 100644
+index 93eb8c0d..6e854541 100644
 --- a/thread.c
 +++ b/thread.c
-@@ -155,7 +155,9 @@ cRwLock::cRwLock(bool PreferWriter)
+@@ -160,7 +160,9 @@ cRwLock::cRwLock(bool PreferWriter)
   writeLockThreadId = 0;
   pthread_rwlockattr_t attr;
   pthread_rwlockattr_init(&attr);
@@ -45,7 +61,7 @@ index 47eb977..58dba43 100644
   pthread_rwlock_init(&rwlock, &attr);
 }
 
-@@ -205,7 +207,7 @@ cMutex::cMutex(void)
+@@ -210,7 +212,7 @@ cMutex::cMutex(void)
   locked = 0;
   pthread_mutexattr_t attr;
   pthread_mutexattr_init(&attr);
@@ -55,10 +71,10 @@ index 47eb977..58dba43 100644
 }
 
 diff --git a/tools.c b/tools.c
-index 754673d..fef9d2d 100644
+index d04033b1..8b161eec 100644
 --- a/tools.c
 +++ b/tools.c
-@@ -640,7 +640,7 @@ char *ReadLink(const char *FileName)
+@@ -672,7 +672,7 @@ char *ReadLink(const char *FileName)
 {
   if (!FileName)
      return NULL;
@@ -67,7 +83,7 @@ index 754673d..fef9d2d 100644
   if (!TargetName) {
      if (errno == ENOENT) // file doesn't exist
         TargetName = strdup(FileName);
-@@ -1528,7 +1528,7 @@
+@@ -1562,7 +1562,7 @@ cReadDir::~cReadDir()
 struct dirent *cReadDir::Next(void)
 {
   if (directory) {
@@ -77,7 +93,7 @@ index 754673d..fef9d2d 100644
 #else
      while ((result = readdir(directory)) != NULL) {
 diff --git a/tools.h b/tools.h
-index 73cca5a..03f5fd1 100644
+index ff6169ee..60eda179 100644
 --- a/tools.h
 +++ b/tools.h
@@ -28,6 +28,16 @@
@@ -97,7 +113,7 @@ index 73cca5a..03f5fd1 100644
 typedef unsigned char uchar;
 
 extern int SysLogLevel;
-@@ -400,7 +410,7 @@
+@@ -444,7 +454,7 @@ class cReadDir {
 private:
   DIR *directory;
   struct dirent *result;
@@ -106,7 +122,7 @@ index 73cca5a..03f5fd1 100644
   union { // according to "The GNU C Library Reference Manual"
     struct dirent d;
     char b[offsetof(struct dirent, d_name) + NAME_MAX + 1];
-@@ -738,7 +748,7 @@ public:
+@@ -818,7 +828,7 @@ public:
         data[i] = T(0);
     size = 0;
   }
@@ -116,10 +132,10 @@ index 73cca5a..03f5fd1 100644
     qsort(data, size, sizeof(T), Compare);
   }
 diff --git a/vdr.c b/vdr.c
-index 8a49471..c2a82aa 100644
+index 1bdc51ab..0f426e61 100644
 --- a/vdr.c
 +++ b/vdr.c
-@@ -670,12 +670,18 @@ int main(int argc, char *argv[])
+@@ -661,12 +661,18 @@ int main(int argc, char *argv[])
         }
      }
   else if (Terminal) {
@@ -137,4 +153,7 @@ index 8a49471..c2a82aa 100644
 +#endif
      }
 
-   isyslog("VDR version %s started", VDRVERSION);
+   // Set user id in case we were started as root:
+-- 
+2.39.2
+
@@ -0,0 +1,51 @@
+From a4a3d9b012c12cd8aaa2526f0eacdcffcdd9f8f1 Mon Sep 17 00:00:00 2001
+From: Roberto Oliveira <robertoguimaraes8@gmail.com>
+Date: Tue, 16 May 2023 20:01:18 +0200
+Subject: [PATCH] Include limits.h
+
+vdr package uses some macros like HOST_NAME_MAX, NAME_MAX, which are defined
+in limits.h.
+Needs to be explicitly included on ppc64le and for all archs for debug build.
+
+Downloaded from
+https://git.alpinelinux.org/aports/tree/community/vdr/include-missing-limits.patch
+
+Initial commits:
+https://git.alpinelinux.org/aports/commit/?id=c9d8942ccf4825fd734b5f37157a49fc4f0b4339
+https://git.alpinelinux.org/aports/commit/?id=47965644c390b1be1117769b1e08b31858267e9a
+
+Upstream: https://www.linuxtv.org/pipermail/vdr/2023-May/029743.html
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ config.h | 1 +
+ tools.c  | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/config.h b/config.h
+index 72dd3d2a..b9ea769f 100644
+--- a/config.h
+++ b/config.h
+@@ -19,6 +19,7 @@
+ #include "i18n.h"
+ #include "font.h"
+ #include "tools.h"
+#include <limits.h>
+ 
+ // VDR's own version number:
+ 
+diff --git a/tools.c b/tools.c
+index 8b161eec..56a2e0dd 100644
+--- a/tools.c
+++ b/tools.c
+@@ -27,6 +27,7 @@ extern "C" {
+ #include <utime.h>
+ #include "i18n.h"
+ #include "thread.h"
+#include <limits.h>
+ 
+ int SysLogLevel = 3;
+ 
+-- 
+2.39.2
+
--- a/Show More
+++ b/Show More