From d408af3c94f414e98b66da708dc23fad4b8c5d4b Mon Sep 17 00:00:00 2001
From: Peter Steenbergen <info@j1nx.nl>
Date: Sun, 19 Sep 2021 11:36:10 +0200
Subject: [PATCH] Bump buildroot to 2021.02.05 latest LTS release

---
 buildroot                                     |   2 +-
 ...-Switch-Python3.9.7-to-Python3.8.12.patch} | 259 ++++++++++--------
 ...002-Downgrade-python-pillow-to-7.1.2.patch |  52 ----
 ...002-Downgrade-python-pillow-to-8.2.0.patch |  39 +++
 ...h => 0015-Bump-python-pip-to-21.2.4.patch} |  35 +--
 .../0106-Bump-RPI-Firmware-version.patch      |   4 +-
 .../0107-Python-optimizations.patch           |  52 ----
 .../0108-Bump-RPI-Wifi-Firmware-version.patch |  35 +--
 .../0110-Bump-and-patch-KF5.patch             |  44 +--
 ...ate-htop-3.0.5-with-upstream-changes.patch |  44 ---
 10 files changed, 238 insertions(+), 328 deletions(-)
 rename buildroot-patches/{0000-Switch-Python3.9.4-to-Python3.8.9.patch => 0000-Switch-Python3.9.7-to-Python3.8.12.patch} (90%)
 delete mode 100644 buildroot-patches/0002-Downgrade-python-pillow-to-7.1.2.patch
 create mode 100644 buildroot-patches/0002-Downgrade-python-pillow-to-8.2.0.patch
 rename buildroot-patches/{0015-Bump-python-pip-to-20.2.2.patch => 0015-Bump-python-pip-to-21.2.4.patch} (50%)
 delete mode 100644 buildroot-patches/0107-Python-optimizations.patch
 delete mode 100644 buildroot-patches/0116-update-htop-3.0.5-with-upstream-changes.patch

diff --git a/buildroot b/buildroot
index 9c6c73a2..767a2da7 160000
--- a/buildroot
+++ b/buildroot
@@ -1 +1 @@
-Subproject commit 9c6c73a22d9208eb924803aaafeb17bc03a90e35
+Subproject commit 767a2da72fc1690fde33b665851f20492ba5cd75
diff --git a/buildroot-patches/0000-Switch-Python3.9.4-to-Python3.8.9.patch b/buildroot-patches/0000-Switch-Python3.9.7-to-Python3.8.12.patch
similarity index 90%
rename from buildroot-patches/0000-Switch-Python3.9.4-to-Python3.8.9.patch
rename to buildroot-patches/0000-Switch-Python3.9.7-to-Python3.8.12.patch
index cfc320a1..15d7bcd9 100644
--- a/buildroot-patches/0000-Switch-Python3.9.4-to-Python3.8.9.patch
+++ b/buildroot-patches/0000-Switch-Python3.9.7-to-Python3.8.12.patch
@@ -1,7 +1,7 @@
-From 048dd3f7be74a2155d6742731efe46ee076f7b5d Mon Sep 17 00:00:00 2001
-From: j1nx <p.steenbergen@j1nx.nl>
-Date: Wed, 7 Apr 2021 17:01:51 +0200
-Subject: [PATCH 1/1] Switch Python3.9.4 to Python3.8.9
+From 6a994bf9f58563e9f4c920037532c9590ccb78ed Mon Sep 17 00:00:00 2001
+From: Peter Steenbergen <info@j1nx.nl>
+Date: Mon, 13 Sep 2021 08:24:10 +0200
+Subject: [PATCH 1/1] Switch Python3.9.7 to Python3.8.12
 
 ---
  ...e-the-build-of-pyc-files-conditional.patch | 14 +++----
@@ -38,13 +38,15 @@ Subject: [PATCH 1/1] Switch Python3.9.4 to Python3.8.9
  ...-fix-building-on-older-distributions.patch |  4 +-
  ...up-CC-print-multiarch-output-for-mus.patch |  8 ++--
  ...-ng-doesn-t-set-errno-when-encryptio.patch | 40 -------------------
+ ...teration-error-in-_ExecutorManagerTh.patch | 29 --------------
  package/python3/python3.hash                  |  5 +--
- package/python3/python3.mk                    |  7 +++-
- 36 files changed, 205 insertions(+), 252 deletions(-)
+ package/python3/python3.mk                    |  4 +-
+ 37 files changed, 202 insertions(+), 281 deletions(-)
  delete mode 100644 package/python3/0034-lib-crypt-uClibc-ng-doesn-t-set-errno-when-encryptio.patch
+ delete mode 100644 package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch
 
 diff --git a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
-index 5eb296c6d8..1010d08d53 100644
+index 44902725d7..1010d08d53 100644
 --- a/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
 +++ b/package/python3/0001-Make-the-build-of-pyc-files-conditional.patch
 @@ -1,4 +1,4 @@
@@ -61,7 +63,7 @@ index 5eb296c6d8..1010d08d53 100644
 +index 502317aa0c..f9011c132a 100644
  --- a/Makefile.pre.in
  +++ b/Makefile.pre.in
--@@ -1528,6 +1528,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+-@@ -1550,6 +1550,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
 +@@ -1455,6 +1455,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
   		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
   			$(DESTDIR)$(LIBDEST)/distutils/tests ; \
@@ -70,7 +72,7 @@ index 5eb296c6d8..1010d08d53 100644
   	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
   		$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
   		-j0 -d $(LIBDEST) -f \
--@@ -1555,6 +1556,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
+-@@ -1577,6 +1578,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
 +@@ -1482,6 +1483,7 @@ libinstall:	build_all $(srcdir)/Modules/xxmodule.c
   		$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
   		-j0 -d $(LIBDEST)/site-packages -f \
@@ -83,7 +85,7 @@ index 5eb296c6d8..1010d08d53 100644
 +index a189d42c2c..4690cdba9f 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -1112,6 +1112,12 @@ fi
+-@@ -1121,6 +1121,12 @@ fi
 +@@ -1091,6 +1091,12 @@ fi
   
   AC_MSG_CHECKING(LDLIBRARY)
@@ -96,7 +98,7 @@ index 5eb296c6d8..1010d08d53 100644
 +2.20.1
  
 diff --git a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
-index c291d14460..e9e5b32ca2 100644
+index 00177814cc..e9e5b32ca2 100644
 --- a/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
 +++ b/package/python3/0002-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch
 @@ -1,4 +1,4 @@
@@ -113,7 +115,7 @@ index c291d14460..e9e5b32ca2 100644
 +index 4690cdba9f..ffeec102b7 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -4175,7 +4175,7 @@ fi
+-@@ -4210,7 +4210,7 @@ fi
 +@@ -4080,7 +4080,7 @@ fi
   
   AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)
@@ -126,7 +128,7 @@ index c291d14460..e9e5b32ca2 100644
 +2.20.1
  
 diff --git a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
-index b0dcce7d77..c4620949bd 100644
+index 7cccc588e9..c4620949bd 100644
 --- a/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
 +++ b/package/python3/0003-Add-infrastructure-to-disable-the-build-of-certain-e.patch
 @@ -1,4 +1,4 @@
@@ -143,7 +145,7 @@ index b0dcce7d77..c4620949bd 100644
 +index f9011c132a..e8a6bd5c03 100644
  --- a/Makefile.pre.in
  +++ b/Makefile.pre.in
--@@ -213,6 +213,8 @@ FILEMODE=	644
+-@@ -216,6 +216,8 @@ FILEMODE=	644
 +@@ -205,6 +205,8 @@ FILEMODE=	644
   # configure script arguments
   CONFIG_ARGS=	@CONFIG_ARGS@
@@ -152,7 +154,7 @@ index b0dcce7d77..c4620949bd 100644
   
   # Subdirectories with code
   SRCDIRS= 	@SRCDIRS@
--@@ -629,6 +631,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
+-@@ -632,6 +634,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
 +@@ -605,6 +607,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt Modules/_math.o
   	esac; \
   	echo "$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
@@ -161,7 +163,7 @@ index b0dcce7d77..c4620949bd 100644
   		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build"; \
   	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
   		_TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \
--@@ -1674,7 +1677,8 @@ libainstall:	@DEF_MAKE_RULE@ python-config
+-@@ -1696,7 +1699,8 @@ libainstall:	@DEF_MAKE_RULE@ python-config
 +@@ -1601,7 +1604,8 @@ libainstall:	@DEF_MAKE_RULE@ python-config
   # Install the dynamically loadable modules
   # This goes into $(exec_prefix)
@@ -174,7 +176,7 @@ index b0dcce7d77..c4620949bd 100644
 +index ffeec102b7..7872b4dfee 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3052,6 +3052,8 @@ LIBS="$withval $LIBS"
+-@@ -3081,6 +3081,8 @@ LIBS="$withval $LIBS"
 +@@ -2958,6 +2958,8 @@ LIBS="$withval $LIBS"
   
   PKG_PROG_PKG_CONFIG
@@ -187,7 +189,7 @@ index b0dcce7d77..c4620949bd 100644
 +index 20d7f35652..d3f2cc1b37 100644
  --- a/setup.py
  +++ b/setup.py
--@@ -43,7 +43,10 @@ from distutils.spawn import find_executable
+-@@ -44,7 +44,10 @@ from distutils.spawn import find_executable
 +@@ -24,7 +24,10 @@ from distutils.spawn import find_executable
   TEST_EXTENSIONS = True
   
@@ -241,7 +243,7 @@ index 24f369f87f..0ac5116213 100644
 +2.20.1
  
 diff --git a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
-index 83c88ff399..935e0c3b55 100644
+index c5abcfd786..935e0c3b55 100644
 --- a/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
 +++ b/package/python3/0005-Don-t-look-in-usr-lib-termcap-for-libraries.patch
 @@ -1,4 +1,4 @@
@@ -258,7 +260,7 @@ index 83c88ff399..935e0c3b55 100644
 +index d3f2cc1b37..5d504d7638 100644
  --- a/setup.py
  +++ b/setup.py
--@@ -1056,12 +1056,9 @@ class PyBuildExt(build_ext):
+-@@ -1041,12 +1041,9 @@ class PyBuildExt(build_ext):
 +@@ -955,12 +955,9 @@ class PyBuildExt(build_ext):
                   pass # Issue 7384: Already linked against curses or tinfo.
               elif curses_library:
@@ -271,7 +273,7 @@ index 83c88ff399..935e0c3b55 100644
 +2.20.1
  
 diff --git a/package/python3/0006-Don-t-add-multiarch-paths.patch b/package/python3/0006-Don-t-add-multiarch-paths.patch
-index f55238d0c4..ab1e295e70 100644
+index bb861612b1..ab1e295e70 100644
 --- a/package/python3/0006-Don-t-add-multiarch-paths.patch
 +++ b/package/python3/0006-Don-t-add-multiarch-paths.patch
 @@ -1,4 +1,4 @@
@@ -288,7 +290,7 @@ index f55238d0c4..ab1e295e70 100644
 +index 5d504d7638..282a592dc6 100644
  --- a/setup.py
  +++ b/setup.py
--@@ -749,10 +749,10 @@ class PyBuildExt(build_ext):
+-@@ -734,10 +734,10 @@ class PyBuildExt(build_ext):
 +@@ -654,10 +654,10 @@ class PyBuildExt(build_ext):
           if not CROSS_COMPILING:
               add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
@@ -301,7 +303,7 @@ index f55238d0c4..ab1e295e70 100644
 +2.20.1
  
 diff --git a/package/python3/0007-Abort-on-failed-module-build.patch b/package/python3/0007-Abort-on-failed-module-build.patch
-index 0e96e7522a..1dcf8a017d 100644
+index 856fcaac21..1dcf8a017d 100644
 --- a/package/python3/0007-Abort-on-failed-module-build.patch
 +++ b/package/python3/0007-Abort-on-failed-module-build.patch
 @@ -1,4 +1,4 @@
@@ -318,7 +320,7 @@ index 0e96e7522a..1dcf8a017d 100644
 +index 282a592dc6..8fda3b4d47 100644
  --- a/setup.py
  +++ b/setup.py
--@@ -539,6 +539,7 @@ class PyBuildExt(build_ext):
+-@@ -524,6 +524,7 @@ class PyBuildExt(build_ext):
 +@@ -444,6 +444,7 @@ class PyBuildExt(build_ext):
               print("Failed to build these modules:")
               print_three_column(failed)
@@ -391,7 +393,7 @@ index a1f9ab6cd9..a8ccba7784 100644
 +2.20.1
  
 diff --git a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
-index 57f1bb5a2f..1a40b74d21 100644
+index 8b0d4f4c4d..1a40b74d21 100644
 --- a/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
 +++ b/package/python3/0011-Override-system-locale-and-set-to-default-when-addin.patch
 @@ -1,4 +1,4 @@
@@ -415,7 +417,7 @@ index 57f1bb5a2f..1a40b74d21 100644
 +index 8fda3b4d47..bb7eb44213 100644
  --- a/setup.py
  +++ b/setup.py
--@@ -695,7 +695,7 @@ class PyBuildExt(build_ext):
+-@@ -680,7 +680,7 @@ class PyBuildExt(build_ext):
 +@@ -600,7 +600,7 @@ class PyBuildExt(build_ext):
           tmpfile = os.path.join(self.build_temp, 'ccpaths')
           if not os.path.exists(self.build_temp):
@@ -432,7 +434,7 @@ index 57f1bb5a2f..1a40b74d21 100644
 +2.20.1
  
 diff --git a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch
-index 42dfa0d693..aacb6dca6c 100644
+index 7a885303cb..aacb6dca6c 100644
 --- a/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch
 +++ b/package/python3/0012-Add-importlib-fix-for-PEP-3147-issue.patch
 @@ -1,4 +1,4 @@
@@ -449,7 +451,7 @@ index 42dfa0d693..aacb6dca6c 100644
 +index b8ac482994..db034f605a 100644
  --- a/Lib/importlib/_bootstrap_external.py
  +++ b/Lib/importlib/_bootstrap_external.py
--@@ -313,8 +313,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+-@@ -373,8 +373,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
 +@@ -306,8 +306,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
       a True value is the same as setting 'optimization' to the empty string
       while a False value is equivalent to setting 'optimization' to '1'.
@@ -458,7 +460,7 @@ index 42dfa0d693..aacb6dca6c 100644
       """
       if debug_override is not None:
           _warnings.warn('the debug_override parameter is deprecated; use '
--@@ -326,10 +324,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+-@@ -386,10 +384,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
 +@@ -319,10 +317,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
       path = _os.fspath(path)
       head, tail = _path_split(path)
@@ -467,7 +469,7 @@ index 42dfa0d693..aacb6dca6c 100644
       if optimization is None:
           if sys.flags.optimize == 0:
               optimization = ''
--@@ -366,46 +361,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
+-@@ -426,46 +421,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
 +@@ -359,46 +354,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None):
               head.lstrip(path_separators),
               filename,
@@ -480,7 +482,7 @@ index 42dfa0d693..aacb6dca6c 100644
 +2.20.1
  
 diff --git a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
-index b3380fd53f..675c2c1abf 100644
+index 8c1b989361..675c2c1abf 100644
 --- a/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
 +++ b/package/python3/0013-Add-an-option-to-disable-installation-of-test-module.patch
 @@ -1,4 +1,4 @@
@@ -507,7 +509,7 @@ index b3380fd53f..675c2c1abf 100644
 +index e8a6bd5c03..3abee36f49 100644
  --- a/Makefile.pre.in
  +++ b/Makefile.pre.in
--@@ -1385,8 +1385,29 @@ maninstall:	altmaninstall
+-@@ -1406,8 +1406,29 @@ maninstall:	altmaninstall
 +@@ -1317,8 +1317,28 @@ maninstall:	altmaninstall
   
   # Install the library
@@ -525,7 +527,7 @@ index b3380fd53f..675c2c1abf 100644
   		test/audiodata \
   		test/capath test/data \
   		test/cjkencodings test/decimaltestdata \
--@@ -1446,28 +1467,25 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
+-@@ -1468,28 +1489,25 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
 +@@ -1376,26 +1396,24 @@ LIBSUBDIRS=	tkinter tkinter/test tkinter/test/test_tkinter \
 + 		test/test_importlib/zipdata01 \
   		test/test_importlib/zipdata02 \
@@ -558,7 +560,7 @@ index b3380fd53f..675c2c1abf 100644
 +index 7872b4dfee..b820d18c7c 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3329,6 +3329,11 @@ if test "$posix_threads" = "yes"; then
+-@@ -3358,6 +3358,11 @@ if test "$posix_threads" = "yes"; then
 +@@ -3234,6 +3234,11 @@ if test "$posix_threads" = "yes"; then
         AC_CHECK_FUNCS(pthread_getcpuclockid)
   fi
@@ -571,7 +573,7 @@ index b3380fd53f..675c2c1abf 100644
 +2.20.1
  
 diff --git a/package/python3/0014-Add-an-option-to-disable-pydoc.patch b/package/python3/0014-Add-an-option-to-disable-pydoc.patch
-index abb86ea07b..a3436e31bf 100644
+index 0c928a0bb2..a3436e31bf 100644
 --- a/package/python3/0014-Add-an-option-to-disable-pydoc.patch
 +++ b/package/python3/0014-Add-an-option-to-disable-pydoc.patch
 @@ -1,4 +1,4 @@
@@ -588,7 +590,7 @@ index abb86ea07b..a3436e31bf 100644
 +index 3abee36f49..6fa0549a56 100644
  --- a/Makefile.pre.in
  +++ b/Makefile.pre.in
--@@ -1357,7 +1357,9 @@ bininstall: altbininstall
+-@@ -1374,7 +1374,9 @@ bininstall: altbininstall
 +@@ -1289,7 +1289,9 @@ bininstall: altbininstall
   	-rm -f $(DESTDIR)$(BINDIR)/idle3
   	(cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3)
@@ -597,7 +599,7 @@ index abb86ea07b..a3436e31bf 100644
   	-rm -f $(DESTDIR)$(BINDIR)/2to3
   	(cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3)
   	if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
--@@ -1403,7 +1405,7 @@ LIBSUBDIRS=	tkinter site-packages \
+-@@ -1424,7 +1426,7 @@ LIBSUBDIRS=	tkinter site-packages \
 +@@ -1335,7 +1337,7 @@ LIBSUBDIRS=	tkinter site-packages \
   		multiprocessing multiprocessing/dummy \
   		unittest \
@@ -609,7 +611,7 @@ index abb86ea07b..a3436e31bf 100644
 ++		curses
   
   TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
--@@ -1486,6 +1488,10 @@ ifeq (@TEST_MODULES@,yes)
+-@@ -1508,6 +1510,10 @@ ifeq (@TEST_MODULES@,yes)
 + 		tkinter/test/test_ttk test \
 +@@ -1414,6 +1416,10 @@ ifeq (@TEST_MODULES@,yes)
   LIBSUBDIRS += $(TESTSUBDIRS)
@@ -623,7 +625,7 @@ index abb86ea07b..a3436e31bf 100644
 +index b820d18c7c..f53cc86d89 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3329,6 +3329,12 @@ if test "$posix_threads" = "yes"; then
+-@@ -3358,6 +3358,12 @@ if test "$posix_threads" = "yes"; then
 +@@ -3234,6 +3234,12 @@ if test "$posix_threads" = "yes"; then
         AC_CHECK_FUNCS(pthread_getcpuclockid)
   fi
@@ -636,7 +638,7 @@ index abb86ea07b..a3436e31bf 100644
 +index bb7eb44213..748c269960 100644
  --- a/setup.py
  +++ b/setup.py
--@@ -2586,6 +2586,12 @@ def main():
+-@@ -2565,6 +2565,12 @@ def main():
 +@@ -2401,6 +2401,12 @@ def main():
       # turn off warnings when deprecated modules are imported
       import warnings
@@ -645,7 +647,7 @@ index abb86ea07b..a3436e31bf 100644
       setup(# PyPI Metadata (PEP 301)
             name = "Python",
             version = sys.version.split()[0],
--@@ -2610,8 +2616,7 @@ def main():
+-@@ -2589,8 +2595,7 @@ def main():
 +@@ -2425,8 +2431,7 @@ def main():
             # If you change the scripts installed here, you also need to
             # check the PyBuildScripts command above, and change the links
@@ -658,7 +660,7 @@ index abb86ea07b..a3436e31bf 100644
 +2.20.1
  
 diff --git a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
-index 5cec11a00a..1bd1ae511f 100644
+index fe94cdfded..1bd1ae511f 100644
 --- a/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
 +++ b/package/python3/0015-Add-an-option-to-disable-lib2to3.patch
 @@ -1,4 +1,4 @@
@@ -675,7 +677,7 @@ index 5cec11a00a..1bd1ae511f 100644
 +index 6fa0549a56..3e1f130532 100644
  --- a/Makefile.pre.in
  +++ b/Makefile.pre.in
--@@ -1361,7 +1361,9 @@ ifeq (@PYDOC@,yes)
+-@@ -1378,7 +1378,9 @@ ifeq (@PYDOC@,yes)
 +@@ -1293,7 +1293,9 @@ ifeq (@PYDOC@,yes)
   	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
   endif
@@ -684,7 +686,7 @@ index 5cec11a00a..1bd1ae511f 100644
   	if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \
   		rm -f $(DESTDIR)$(BINDIR)/python3-32$(EXE); \
   		(cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-32$(EXE) python3-32$(EXE)) \
--@@ -1396,7 +1398,6 @@ LIBSUBDIRS=	tkinter site-packages \
+-@@ -1417,7 +1419,6 @@ LIBSUBDIRS=	tkinter site-packages \
 +@@ -1328,7 +1330,6 @@ LIBSUBDIRS=	tkinter site-packages \
   		html json http dbm xmlrpc \
   		sqlite3 \
@@ -693,7 +695,7 @@ index 5cec11a00a..1bd1ae511f 100644
   		ctypes ctypes/macholib \
   		idlelib idlelib/Icons \
   		distutils distutils/command $(XMLLIBSUBDIRS) \
--@@ -1473,9 +1474,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+-@@ -1495,9 +1496,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
 +@@ -1402,9 +1403,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
   		test/test_email test/test_email/data \
   		test/test_json \
@@ -702,7 +704,7 @@ index 5cec11a00a..1bd1ae511f 100644
   		ctypes/test \
   		idlelib/idle_test \
   		distutils/tests \
--@@ -1484,6 +1482,14 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+-@@ -1506,6 +1504,14 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
 +@@ -1412,6 +1410,14 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
   		test/test_tools test/test_warnings test/test_warnings/data \
   		unittest/test unittest/test/testmock
@@ -711,7 +713,7 @@ index 5cec11a00a..1bd1ae511f 100644
   ifeq (@TEST_MODULES@,yes)
   LIBSUBDIRS += $(TESTSUBDIRS)
   endif
--@@ -1584,10 +1590,12 @@ ifeq (@PYC_BUILD@,yes)
+-@@ -1606,10 +1612,12 @@ ifeq (@PYC_BUILD@,yes)
 +@@ -1511,10 +1517,12 @@ ifeq (@PYC_BUILD@,yes)
   		-j0 -d $(LIBDEST)/site-packages -f \
   		-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
@@ -724,7 +726,7 @@ index 5cec11a00a..1bd1ae511f 100644
 +index f53cc86d89..caa8eaf88a 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3341,6 +3341,12 @@ AC_ARG_ENABLE(test-modules,
+-@@ -3370,6 +3370,12 @@ AC_ARG_ENABLE(test-modules,
 +@@ -3246,6 +3246,12 @@ AC_ARG_ENABLE(test-modules,
   	AS_HELP_STRING([--disable-test-modules], [disable test modules]),
   	[ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ])
@@ -737,7 +739,7 @@ index 5cec11a00a..1bd1ae511f 100644
 +index 748c269960..1669797cad 100644
  --- a/setup.py
  +++ b/setup.py
--@@ -2587,10 +2587,11 @@ def main():
+-@@ -2566,10 +2566,11 @@ def main():
 +@@ -2402,10 +2402,11 @@ def main():
       import warnings
       warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -750,7 +752,7 @@ index 5cec11a00a..1bd1ae511f 100644
 +2.20.1
  
 diff --git a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
-index 47ee112e27..364d1b1ec8 100644
+index d6c9bccd45..364d1b1ec8 100644
 --- a/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
 +++ b/package/python3/0016-Add-option-to-disable-the-sqlite3-module.patch
 @@ -1,4 +1,4 @@
@@ -767,7 +769,7 @@ index 47ee112e27..364d1b1ec8 100644
 +index 3e1f130532..cf9add0bc7 100644
  --- a/Makefile.pre.in
  +++ b/Makefile.pre.in
--@@ -1396,7 +1396,6 @@ LIBSUBDIRS=	tkinter site-packages \
+-@@ -1417,7 +1417,6 @@ LIBSUBDIRS=	tkinter site-packages \
 +@@ -1328,7 +1328,6 @@ LIBSUBDIRS=	tkinter site-packages \
   		email email/mime \
   		ensurepip ensurepip/_bundled \
@@ -776,7 +778,7 @@ index 47ee112e27..364d1b1ec8 100644
   		logging csv wsgiref urllib \
   		ctypes ctypes/macholib \
   		idlelib idlelib/Icons \
--@@ -1473,7 +1472,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+-@@ -1495,7 +1494,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
 +@@ -1402,7 +1401,6 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
   		test/test_asyncio \
   		test/test_email test/test_email/data \
@@ -785,7 +787,7 @@ index 47ee112e27..364d1b1ec8 100644
   		ctypes/test \
   		idlelib/idle_test \
   		distutils/tests \
--@@ -1490,6 +1488,11 @@ TESTSUBDIRS += lib2to3/tests			\
+-@@ -1512,6 +1510,11 @@ TESTSUBDIRS += lib2to3/tests			\
 +@@ -1418,6 +1416,11 @@ TESTSUBDIRS += lib2to3/tests			\
   	lib2to3/tests/data/fixers/myfixes
   endif
@@ -798,7 +800,7 @@ index 47ee112e27..364d1b1ec8 100644
 +index caa8eaf88a..79a8255f44 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3329,6 +3329,15 @@ if test "$posix_threads" = "yes"; then
+-@@ -3358,6 +3358,15 @@ if test "$posix_threads" = "yes"; then
 +@@ -3234,6 +3234,15 @@ if test "$posix_threads" = "yes"; then
         AC_CHECK_FUNCS(pthread_getcpuclockid)
   fi
@@ -811,7 +813,7 @@ index 47ee112e27..364d1b1ec8 100644
 +2.20.1
  
 diff --git a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
-index 132fd17386..eb0ad26daa 100644
+index b798eb56a5..eb0ad26daa 100644
 --- a/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
 +++ b/package/python3/0017-Add-an-option-to-disable-the-tk-module.patch
 @@ -1,4 +1,4 @@
@@ -828,7 +830,7 @@ index 132fd17386..eb0ad26daa 100644
 +index cf9add0bc7..5d78419fd4 100644
  --- a/Makefile.pre.in
  +++ b/Makefile.pre.in
--@@ -1390,7 +1390,7 @@ maninstall:	altmaninstall
+-@@ -1411,7 +1411,7 @@ maninstall:	altmaninstall
 +@@ -1322,7 +1322,7 @@ maninstall:	altmaninstall
   # Install the library
   XMLLIBSUBDIRS=  xml xml/dom xml/etree xml/parsers xml/sax
@@ -837,7 +839,7 @@ index 132fd17386..eb0ad26daa 100644
   		asyncio \
   		collections concurrent concurrent/futures encodings \
   		email email/mime \
--@@ -1408,8 +1408,7 @@ LIBSUBDIRS=	tkinter site-packages \
+-@@ -1429,8 +1429,7 @@ LIBSUBDIRS=	tkinter site-packages \
 - 		curses \
 - 		zoneinfo
 +@@ -1339,8 +1339,7 @@ LIBSUBDIRS=	tkinter site-packages \
@@ -850,7 +852,7 @@ index 132fd17386..eb0ad26daa 100644
   		test/audiodata \
   		test/capath test/data \
   		test/cjkencodings test/decimaltestdata \
--@@ -1480,6 +1479,12 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
+-@@ -1502,6 +1501,12 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
 +@@ -1408,6 +1407,12 @@ TESTSUBDIRS=	tkinter/test tkinter/test/test_tkinter \
   		test/test_tools test/test_warnings test/test_warnings/data \
   		unittest/test unittest/test/testmock
@@ -863,7 +865,7 @@ index 132fd17386..eb0ad26daa 100644
 +index 79a8255f44..b5922451cc 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3338,6 +3338,15 @@ if test "$SQLITE3" = "no" ; then
+-@@ -3367,6 +3367,15 @@ if test "$SQLITE3" = "no" ; then
 +@@ -3243,6 +3243,15 @@ if test "$SQLITE3" = "no" ; then
      DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
   fi
@@ -876,7 +878,7 @@ index 132fd17386..eb0ad26daa 100644
 +2.20.1
  
 diff --git a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
-index d51267bbf0..0628669b93 100644
+index 93dfac26ec..0628669b93 100644
 --- a/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
 +++ b/package/python3/0018-Add-an-option-to-disable-the-curses-module.patch
 @@ -1,4 +1,4 @@
@@ -900,7 +902,7 @@ index d51267bbf0..0628669b93 100644
 +index 5d78419fd4..660c292765 100644
  --- a/Makefile.pre.in
  +++ b/Makefile.pre.in
--@@ -1405,7 +1405,6 @@ LIBSUBDIRS=	site-packages \
+-@@ -1426,7 +1426,6 @@ LIBSUBDIRS=	site-packages \
 +@@ -1336,8 +1336,7 @@ LIBSUBDIRS=	site-packages \
 + 		turtledemo \
   		multiprocessing multiprocessing/dummy \
@@ -913,7 +915,7 @@ index d51267bbf0..0628669b93 100644
 ++		venv venv/scripts venv/scripts/common venv/scripts/posix
   
   TESTSUBDIRS=	test \
--@@ -1485,6 +1484,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
+-@@ -1507,6 +1506,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
 + 		test/audiodata \
 +@@ -1413,6 +1412,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \
   	tkinter/test/test_ttk
@@ -927,7 +929,7 @@ index d51267bbf0..0628669b93 100644
 +index b5922451cc..ea422a86a9 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3347,6 +3347,15 @@ if test "$TK" = "no"; then
+-@@ -3376,6 +3376,15 @@ if test "$TK" = "no"; then
 +@@ -3252,6 +3252,15 @@ if test "$TK" = "no"; then
      DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter"
   fi
@@ -940,7 +942,7 @@ index d51267bbf0..0628669b93 100644
 +2.20.1
  
 diff --git a/package/python3/0019-Add-an-option-to-disable-expat.patch b/package/python3/0019-Add-an-option-to-disable-expat.patch
-index af6e1ebcc1..e31f3e105e 100644
+index e7349058c8..e31f3e105e 100644
 --- a/package/python3/0019-Add-an-option-to-disable-expat.patch
 +++ b/package/python3/0019-Add-an-option-to-disable-expat.patch
 @@ -1,4 +1,4 @@
@@ -957,7 +959,7 @@ index af6e1ebcc1..e31f3e105e 100644
 +index 660c292765..f49abf8395 100644
  --- a/Makefile.pre.in
  +++ b/Makefile.pre.in
--@@ -1399,7 +1399,7 @@ LIBSUBDIRS=	site-packages \
+-@@ -1420,7 +1420,7 @@ LIBSUBDIRS=	site-packages \
 +@@ -1331,7 +1331,7 @@ LIBSUBDIRS=	site-packages \
   		logging csv wsgiref urllib \
   		ctypes ctypes/macholib \
@@ -966,7 +968,7 @@ index af6e1ebcc1..e31f3e105e 100644
   		importlib \
   		turtledemo \
   		multiprocessing multiprocessing/dummy \
--@@ -1488,6 +1488,10 @@ ifeq (@CURSES@,yes)
+-@@ -1510,6 +1510,10 @@ ifeq (@CURSES@,yes)
 +@@ -1416,6 +1416,10 @@ ifeq (@CURSES@,yes)
   LIBSUBDIRS += curses
   endif
@@ -979,7 +981,7 @@ index af6e1ebcc1..e31f3e105e 100644
 +index ea422a86a9..3c1e2c088d 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3055,13 +3055,21 @@ PKG_PROG_PKG_CONFIG
+-@@ -3084,13 +3084,21 @@ PKG_PROG_PKG_CONFIG
 +@@ -2961,13 +2961,21 @@ PKG_PROG_PKG_CONFIG
   AC_SUBST(DISABLED_EXTENSIONS)
   
@@ -999,7 +1001,7 @@ index af6e1ebcc1..e31f3e105e 100644
 +index 1669797cad..d2727c0da5 100644
  --- a/setup.py
  +++ b/setup.py
--@@ -1681,7 +1681,7 @@ class PyBuildExt(build_ext):
+-@@ -1666,7 +1666,7 @@ class PyBuildExt(build_ext):
 +@@ -1576,7 +1576,7 @@ class PyBuildExt(build_ext):
           #
           # More information on Expat can be found at www.libexpat.org.
@@ -1012,7 +1014,7 @@ index af6e1ebcc1..e31f3e105e 100644
 +2.20.1
  
 diff --git a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
-index ede78c9b1e..1b18c54591 100644
+index 4e22543096..1b18c54591 100644
 --- a/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
 +++ b/package/python3/0020-Add-an-option-to-disable-CJK-codecs.patch
 @@ -1,4 +1,4 @@
@@ -1029,7 +1031,7 @@ index ede78c9b1e..1b18c54591 100644
 +index 3c1e2c088d..30a92f9c2e 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3346,6 +3346,12 @@ if test "$SQLITE3" = "no" ; then
+-@@ -3375,6 +3375,12 @@ if test "$SQLITE3" = "no" ; then
 +@@ -3251,6 +3251,12 @@ if test "$SQLITE3" = "no" ; then
      DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3"
   fi
@@ -1042,7 +1044,7 @@ index ede78c9b1e..1b18c54591 100644
 +2.20.1
  
 diff --git a/package/python3/0021-Add-an-option-to-disable-NIS.patch b/package/python3/0021-Add-an-option-to-disable-NIS.patch
-index b2668c6eb2..71645be9f4 100644
+index 9cd54df180..71645be9f4 100644
 --- a/package/python3/0021-Add-an-option-to-disable-NIS.patch
 +++ b/package/python3/0021-Add-an-option-to-disable-NIS.patch
 @@ -1,4 +1,4 @@
@@ -1059,7 +1061,7 @@ index b2668c6eb2..71645be9f4 100644
 +index 30a92f9c2e..20f326db46 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3352,6 +3352,12 @@ AC_ARG_ENABLE(codecs-cjk,
+-@@ -3381,6 +3381,12 @@ AC_ARG_ENABLE(codecs-cjk,
 +@@ -3257,6 +3257,12 @@ AC_ARG_ENABLE(codecs-cjk,
   		DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022"
   	fi])
@@ -1072,7 +1074,7 @@ index b2668c6eb2..71645be9f4 100644
 +2.20.1
  
 diff --git a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
-index 7a0157fd71..3805e1aad9 100644
+index 2ddf606a70..3805e1aad9 100644
 --- a/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
 +++ b/package/python3/0022-Add-an-option-to-disable-unicodedata.patch
 @@ -1,4 +1,4 @@
@@ -1089,7 +1091,7 @@ index 7a0157fd71..3805e1aad9 100644
 +index 20f326db46..99bbc37b07 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3358,6 +3358,12 @@ AC_ARG_ENABLE(nis,
+-@@ -3387,6 +3387,12 @@ AC_ARG_ENABLE(nis,
 +@@ -3263,6 +3263,12 @@ AC_ARG_ENABLE(nis,
       	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis"
     	  fi])
@@ -1102,7 +1104,7 @@ index 7a0157fd71..3805e1aad9 100644
 +2.20.1
  
 diff --git a/package/python3/0023-Add-an-option-to-disable-IDLE.patch b/package/python3/0023-Add-an-option-to-disable-IDLE.patch
-index 0611e3a347..3a138f966f 100644
+index 0e35eea699..3a138f966f 100644
 --- a/package/python3/0023-Add-an-option-to-disable-IDLE.patch
 +++ b/package/python3/0023-Add-an-option-to-disable-IDLE.patch
 @@ -1,4 +1,4 @@
@@ -1119,7 +1121,7 @@ index 0611e3a347..3a138f966f 100644
 +index f49abf8395..bc777e6504 100644
  --- a/Makefile.pre.in
  +++ b/Makefile.pre.in
--@@ -1355,7 +1355,9 @@ bininstall: altbininstall
+-@@ -1372,7 +1372,9 @@ bininstall: altbininstall
 +@@ -1287,7 +1287,9 @@ bininstall: altbininstall
   	-rm -f $(DESTDIR)$(LIBPC)/python3-embed.pc
   	(cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION)-embed.pc python3-embed.pc)
@@ -1128,7 +1130,7 @@ index 0611e3a347..3a138f966f 100644
   	-rm -f $(DESTDIR)$(BINDIR)/pydoc3
   ifeq (@PYDOC@,yes)
   	(cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3)
--@@ -1398,7 +1400,6 @@ LIBSUBDIRS=	site-packages \
+-@@ -1419,7 +1421,6 @@ LIBSUBDIRS=	site-packages \
 +@@ -1330,7 +1332,6 @@ LIBSUBDIRS=	site-packages \
   		html json http dbm xmlrpc \
   		logging csv wsgiref urllib \
@@ -1137,7 +1139,7 @@ index 0611e3a347..3a138f966f 100644
   		distutils distutils/command \
   		importlib \
   		turtledemo \
--@@ -1492,6 +1493,10 @@ ifeq (@EXPAT@,yes)
+-@@ -1514,6 +1515,10 @@ ifeq (@EXPAT@,yes)
 +@@ -1420,6 +1421,10 @@ ifeq (@EXPAT@,yes)
   LIBSUBDIRS += $(XMLLIBSUBDIRS)
   endif
@@ -1150,7 +1152,7 @@ index 0611e3a347..3a138f966f 100644
 +index 99bbc37b07..8c9706582e 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3400,6 +3400,12 @@ AC_ARG_ENABLE(lib2to3,
+-@@ -3429,6 +3429,12 @@ AC_ARG_ENABLE(lib2to3,
 +@@ -3305,6 +3305,12 @@ AC_ARG_ENABLE(lib2to3,
   	AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]),
   	[ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ])
@@ -1163,7 +1165,7 @@ index 0611e3a347..3a138f966f 100644
 +index d2727c0da5..9f09b3d985 100644
  --- a/setup.py
  +++ b/setup.py
--@@ -2587,11 +2587,13 @@ def main():
+-@@ -2566,11 +2566,13 @@ def main():
 +@@ -2402,11 +2402,13 @@ def main():
       import warnings
       warnings.filterwarnings("ignore",category=DeprecationWarning)
@@ -1176,7 +1178,7 @@ index 0611e3a347..3a138f966f 100644
 +2.20.1
  
 diff --git a/package/python3/0024-Add-an-option-to-disable-decimal.patch b/package/python3/0024-Add-an-option-to-disable-decimal.patch
-index 438b76b91f..5906f9d385 100644
+index b5a12f7f38..5906f9d385 100644
 --- a/package/python3/0024-Add-an-option-to-disable-decimal.patch
 +++ b/package/python3/0024-Add-an-option-to-disable-decimal.patch
 @@ -1,4 +1,4 @@
@@ -1201,7 +1203,7 @@ index 438b76b91f..5906f9d385 100644
 +index 8c9706582e..e6255babb6 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3106,13 +3106,20 @@ fi
+-@@ -3135,13 +3135,20 @@ fi
 +@@ -3012,13 +3012,20 @@ fi
   AC_SUBST(LIBFFI_INCLUDEDIR)
   
@@ -1221,7 +1223,7 @@ index 438b76b91f..5906f9d385 100644
 +index 9f09b3d985..a7f2e23d87 100644
  --- a/setup.py
  +++ b/setup.py
--@@ -2221,7 +2221,7 @@ class PyBuildExt(build_ext):
+-@@ -2195,7 +2195,7 @@ class PyBuildExt(build_ext):
 +@@ -2076,7 +2076,7 @@ class PyBuildExt(build_ext):
           # Stefan Krah's _decimal module
           extra_compile_args = []
@@ -1234,7 +1236,7 @@ index 438b76b91f..5906f9d385 100644
 +2.20.1
  
 diff --git a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
-index 8a792c1fac..55ba22a0e5 100644
+index 0f68a08356..55ba22a0e5 100644
 --- a/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
 +++ b/package/python3/0025-Add-an-option-to-disable-the-ossaudiodev-module.patch
 @@ -1,4 +1,4 @@
@@ -1251,7 +1253,7 @@ index 8a792c1fac..55ba22a0e5 100644
 +index e6255babb6..5809233aac 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3136,6 +3136,12 @@ fi
+-@@ -3165,6 +3165,12 @@ fi
 +@@ -3042,6 +3042,12 @@ fi
   
   AC_MSG_RESULT($with_decimal_contextvar)
@@ -1264,7 +1266,7 @@ index 8a792c1fac..55ba22a0e5 100644
 +2.20.1
  
 diff --git a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
-index d9e9d13f31..814ffdb561 100644
+index 44d1d3d6b3..814ffdb561 100644
 --- a/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
 +++ b/package/python3/0026-Add-an-option-to-disable-openssl-support.patch
 @@ -1,4 +1,4 @@
@@ -1281,7 +1283,7 @@ index d9e9d13f31..814ffdb561 100644
 +index 5809233aac..6b09bafda4 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3377,6 +3377,12 @@ AC_ARG_ENABLE(unicodedata,
+-@@ -3406,6 +3406,12 @@ AC_ARG_ENABLE(unicodedata,
 +@@ -3282,6 +3282,12 @@ AC_ARG_ENABLE(unicodedata,
       	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata"
     	  fi])
@@ -1294,7 +1296,7 @@ index d9e9d13f31..814ffdb561 100644
 +2.20.1
  
 diff --git a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
-index 2324ffdcf2..30651244f4 100644
+index 1597a2a560..30651244f4 100644
 --- a/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
 +++ b/package/python3/0027-Add-an-option-to-disable-the-readline-module.patch
 @@ -1,4 +1,4 @@
@@ -1311,7 +1313,7 @@ index 2324ffdcf2..30651244f4 100644
 +index 6b09bafda4..b64518eed5 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3383,6 +3383,12 @@ AC_ARG_ENABLE(openssl,
+-@@ -3412,6 +3412,12 @@ AC_ARG_ENABLE(openssl,
 +@@ -3288,6 +3288,12 @@ AC_ARG_ENABLE(openssl,
   	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib"
   	  fi])
@@ -1324,7 +1326,7 @@ index 2324ffdcf2..30651244f4 100644
 +2.20.1
  
 diff --git a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
-index 04d0ab31bf..330b549c01 100644
+index a1d2ef3255..330b549c01 100644
 --- a/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
 +++ b/package/python3/0028-Add-options-to-disable-zlib-bzip2-and-xz-modules.patch
 @@ -1,4 +1,4 @@
@@ -1341,7 +1343,7 @@ index 04d0ab31bf..330b549c01 100644
 +index b64518eed5..d07e371c57 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3389,6 +3389,24 @@ AC_ARG_ENABLE(readline,
+-@@ -3418,6 +3418,24 @@ AC_ARG_ENABLE(readline,
 +@@ -3294,6 +3294,24 @@ AC_ARG_ENABLE(readline,
   	     DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} readline"
   	  fi])
@@ -1371,7 +1373,7 @@ index 4478b40162..f69b887c9b 100644
 +2.20.1
  
 diff --git a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch
-index 806801b2b9..d39befaf1c 100644
+index 1bf5fc6db4..d39befaf1c 100644
 --- a/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch
 +++ b/package/python3/0030-Fix-cross-compiling-the-uuid-module.patch
 @@ -1,4 +1,4 @@
@@ -1388,7 +1390,7 @@ index 806801b2b9..d39befaf1c 100644
 +index a7f2e23d87..b0274a3f67 100644
  --- a/setup.py
  +++ b/setup.py
--@@ -1779,7 +1779,8 @@ class PyBuildExt(build_ext):
+-@@ -1764,7 +1764,8 @@ class PyBuildExt(build_ext):
 +@@ -1674,7 +1674,8 @@ class PyBuildExt(build_ext):
   
       def detect_uuid(self):
@@ -1401,7 +1403,7 @@ index 806801b2b9..d39befaf1c 100644
 +2.20.1
  
 diff --git a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch b/package/python3/0031-Add-an-option-to-disable-uuid-module.patch
-index 6ea57d2cde..6ea5f68590 100644
+index 92b24b211d..6ea5f68590 100644
 --- a/package/python3/0031-Add-an-option-to-disable-uuid-module.patch
 +++ b/package/python3/0031-Add-an-option-to-disable-uuid-module.patch
 @@ -1,4 +1,4 @@
@@ -1418,7 +1420,7 @@ index 6ea57d2cde..6ea5f68590 100644
 +index d07e371c57..55ab6c3c26 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -3425,6 +3425,15 @@ if test "$CURSES" = "no"; then
+-@@ -3454,6 +3454,15 @@ if test "$CURSES" = "no"; then
 +@@ -3330,6 +3330,15 @@ if test "$CURSES" = "no"; then
      DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel"
   fi
@@ -1448,7 +1450,7 @@ index fb59e593f4..69998a36dd 100644
 +2.20.1
  
 diff --git a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch b/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch
-index 304a595fce..2f5f7a8bf0 100644
+index f70990b254..2f5f7a8bf0 100644
 --- a/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch
 +++ b/package/python3/0033-configure.ac-fixup-CC-print-multiarch-output-for-mus.patch
 @@ -1,4 +1,4 @@
@@ -1465,7 +1467,7 @@ index 304a595fce..2f5f7a8bf0 100644
 +index 55ab6c3c26..4a6d0662ac 100644
  --- a/configure.ac
  +++ b/configure.ac
--@@ -718,7 +718,9 @@ then
+-@@ -727,7 +727,9 @@ then
 +@@ -706,7 +706,9 @@ then
   fi
   
@@ -1523,19 +1525,54 @@ index 880277eb1d..0000000000
 --- 
 -2.25.4
 -
+diff --git a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch b/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch
+deleted file mode 100644
+index fbe44c7753..0000000000
+--- a/package/python3/0036-Fix-dictionary-iteration-error-in-_ExecutorManagerTh.patch
++++ /dev/null
+@@ -1,29 +0,0 @@
+-From 331966be70c371b268a4fcce9e97280cd869f137 Mon Sep 17 00:00:00 2001
+-From: Jakub Kulik <kulikjak@gmail.com>
+-Date: Mon, 15 Mar 2021 08:49:28 +0100
+-Subject: [PATCH] Fix dictionary iteration error in _ExecutorManagerThread
+-
+-[Thomas: Taken from upstream pull request
+-https://github.com/python/cpython/pull/24868, which is aimed at fixing
+-https://bugs.python.org/issue43498]
+-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+----
+- Lib/concurrent/futures/process.py | 2 +-
+- 1 file changed, 1 insertion(+), 1 deletion(-)
+-
+-diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py
+-index 90bc98bf2ec..e3b36dff572 100644
+---- a/Lib/concurrent/futures/process.py
+-+++ b/Lib/concurrent/futures/process.py
+-@@ -373,7 +373,7 @@ class _ExecutorManagerThread(threading.Thread):
+-         assert not self.thread_wakeup._closed
+-         wakeup_reader = self.thread_wakeup._reader
+-         readers = [result_reader, wakeup_reader]
+--        worker_sentinels = [p.sentinel for p in self.processes.values()]
+-+        worker_sentinels = [p.sentinel for p in self.processes.copy().values()]
+-         ready = mp.connection.wait(readers + worker_sentinels)
+- 
+-         cause = None
+--- 
+-2.31.1
+-
 diff --git a/package/python3/python3.hash b/package/python3/python3.hash
-index 2a0ba6ab4f..b7c3963fa6 100644
+index 444dbd982a..2925f9d97d 100644
 --- a/package/python3/python3.hash
 +++ b/package/python3/python3.hash
 @@ -1,5 +1,2 @@
--# From https://www.python.org/downloads/release/python-394/
--md5  2a3dba5fc75b695c45cf1806156e1a97  Python-3.9.4.tar.xz
+-# From https://www.python.org/downloads/release/python-397/
+-md5  fddb060b483bc01850a3f412eea1d954  Python-3.9.7.tar.xz
  # Locally computed
--sha256  4b0e6644a76f8df864ae24ac500a51bbf68bd098f6a173e27d3b61cdca9aa134  Python-3.9.4.tar.xz
+-sha256  f8145616e68c00041d1a6399b76387390388f8359581abc24432bb969b5e3c57  Python-3.9.7.tar.xz
 -sha256  599826df92bfdcd2702eac691072498bb096c55af04ee984cf90f70ed77b5a70  LICENSE
-+sha256  5e391f3ec45da2954419cab0beaefd8be38895ea5ce33577c3ec14940c4b9572  Python-3.8.9.tar.xz
++sha256  b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea  Python-3.8.12.tar.xz
 diff --git a/package/python3/python3.mk b/package/python3/python3.mk
-index 345c6a8699..0153a8e90f 100644
+index 0fab0dd9ba..43202cfc20 100644
 --- a/package/python3/python3.mk
 +++ b/package/python3/python3.mk
 @@ -4,8 +4,8 @@
@@ -1543,22 +1580,12 @@ index 345c6a8699..0153a8e90f 100644
  ################################################################################
  
 -PYTHON3_VERSION_MAJOR = 3.9
--PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).4
+-PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).7
 +PYTHON3_VERSION_MAJOR = 3.8
-+PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).9
++PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).12
  PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz
  PYTHON3_SITE = https://python.org/ftp/python/$(PYTHON3_VERSION)
  PYTHON3_LICENSE = Python-2.0, others
-@@ -13,6 +13,9 @@ PYTHON3_LICENSE_FILES = LICENSE
- PYTHON3_CPE_ID_VENDOR = python
- PYTHON3_CPE_ID_PRODUCT = python
- 
-+# 0035-closes-bpo-42938-Replace-snprintf-with-Python-unicod.patch
-+PYTHON3_IGNORE_CVES += CVE-2021-3177
-+
- # This host Python is installed in $(HOST_DIR), as it is needed when
- # cross-compiling third-party Python modules.
- 
 -- 
-2.20.1
+2.33.0
 
diff --git a/buildroot-patches/0002-Downgrade-python-pillow-to-7.1.2.patch b/buildroot-patches/0002-Downgrade-python-pillow-to-7.1.2.patch
deleted file mode 100644
index d852dc01..00000000
--- a/buildroot-patches/0002-Downgrade-python-pillow-to-7.1.2.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 9869a77fbda84c96968708e1c32116a6b742c6f8 Mon Sep 17 00:00:00 2001
-From: j1nx <p.steenbergen@j1nx.nl>
-Date: Thu, 18 Mar 2021 09:57:31 +0100
-Subject: [PATCH 1/1] Downgrade python-pillow to 7.1.2
-
----
- package/python-pillow/Config.in          | 2 --
- package/python-pillow/python-pillow.hash | 2 +-
- package/python-pillow/python-pillow.mk   | 4 ++--
- 3 files changed, 3 insertions(+), 5 deletions(-)
-
-diff --git a/package/python-pillow/Config.in b/package/python-pillow/Config.in
-index ae6d8c8346..f824d1371e 100644
---- a/package/python-pillow/Config.in
-+++ b/package/python-pillow/Config.in
-@@ -1,8 +1,6 @@
- config BR2_PACKAGE_PYTHON_PILLOW
- 	bool "python-pillow"
- 	depends on BR2_PACKAGE_PYTHON3
--	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
--	select BR2_PACKAGE_PYTHON3_ZLIB
- 	help
- 	  Pillow is the "friendly" PIL fork by Alex Clark and
- 	  Contributors. PIL is the Python Imaging Library by Fredrik
-diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
-index 0849577f66..0354269e0e 100644
---- a/package/python-pillow/python-pillow.hash
-+++ b/package/python-pillow/python-pillow.hash
-@@ -1,4 +1,4 @@
- # md5, sha256 from https://pypi.org/project/Pillow/
--sha256	11c5c6e9b02c9dac08af04f093eb5a2f84857df70a7d4a6a6ad461aca803fb9e  Pillow-8.0.1.tar.gz
-+sha256	a0b49960110bc6ff5fead46013bcb8825d101026d466f3a4de3476defe0fb0dd  Pillow-7.1.2.tar.gz
- # Locally computed sha256 checksums
- sha256	37de42abe33a247e8f03d2313657a0f174a239a198f526add6544ff3e2643b81  LICENSE
-diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
-index 60a0bb3e1b..a091ebe64f 100644
---- a/package/python-pillow/python-pillow.mk
-+++ b/package/python-pillow/python-pillow.mk
-@@ -4,8 +4,8 @@
- #
- ################################################################################
- 
--PYTHON_PILLOW_VERSION = 8.0.1
--PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/2b/06/93bf1626ef36815010e971a5ce90f49919d84ab5d2fa310329f843a74bc1
-+PYTHON_PILLOW_VERSION = 7.1.2
-+PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/ce/ef/e793f6ffe245c960c42492d0bb50f8d14e2ba223f1922a5c3c81569cec44
- PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
- PYTHON_PILLOW_LICENSE = PIL Software License
- PYTHON_PILLOW_LICENSE_FILES = LICENSE
--- 
-2.20.1
-
diff --git a/buildroot-patches/0002-Downgrade-python-pillow-to-8.2.0.patch b/buildroot-patches/0002-Downgrade-python-pillow-to-8.2.0.patch
new file mode 100644
index 00000000..aa8e943e
--- /dev/null
+++ b/buildroot-patches/0002-Downgrade-python-pillow-to-8.2.0.patch
@@ -0,0 +1,39 @@
+From 82ced2ca075eb1c2eff5574d6ef7f38f4f52aacd Mon Sep 17 00:00:00 2001
+From: Peter Steenbergen <info@j1nx.nl>
+Date: Sat, 18 Sep 2021 22:41:09 +0200
+Subject: [PATCH 1/1] Downgrade python-pillow to 8.2.0
+
+---
+ package/python-pillow/python-pillow.hash | 5 ++---
+ package/python-pillow/python-pillow.mk   | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/package/python-pillow/python-pillow.hash b/package/python-pillow/python-pillow.hash
+index 3b5bdf2535..8beaf555e7 100644
+--- a/package/python-pillow/python-pillow.hash
++++ b/package/python-pillow/python-pillow.hash
+@@ -1,6 +1,5 @@
+-# md5, sha256 from https://pypi.org/pypi/pillow/json
+-md5  a7fc550b80819eab11e01cc097913700  Pillow-8.3.2.tar.gz
+-sha256  dde3f3ed8d00c72631bc19cbfff8ad3b6215062a5eed402381ad365f82f0c18c  Pillow-8.3.2.tar.gz
++# sha256 from https://pypi.org/pypi/pillow/json
++sha256  a787ab10d7bb5494e5f76536ac460741788f1fbce851068d73a87ca7c35fc3e1  Pillow-8.2.0.tar.gz
+ 
+ # Locally computed sha256 checksums
+ sha256  5bb11d96b393a698df70018069a986248021f286344c437a13f299c3daf1dfd4  LICENSE
+diff --git a/package/python-pillow/python-pillow.mk b/package/python-pillow/python-pillow.mk
+index 168c9d632c..da9c2b1885 100644
+--- a/package/python-pillow/python-pillow.mk
++++ b/package/python-pillow/python-pillow.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-PYTHON_PILLOW_VERSION = 8.3.2
++PYTHON_PILLOW_VERSION = 8.2.0
+ PYTHON_PILLOW_SITE = https://files.pythonhosted.org/packages/90/d4/a7c9b6c5d176654aa3dbccbfd0be4fd3a263355dc24122a5f1937bdc2689
+ PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz
+ PYTHON_PILLOW_LICENSE = HPND
+-- 
+2.33.0
+
diff --git a/buildroot-patches/0015-Bump-python-pip-to-20.2.2.patch b/buildroot-patches/0015-Bump-python-pip-to-21.2.4.patch
similarity index 50%
rename from buildroot-patches/0015-Bump-python-pip-to-20.2.2.patch
rename to buildroot-patches/0015-Bump-python-pip-to-21.2.4.patch
index 7fd87e64..1245f6f4 100644
--- a/buildroot-patches/0015-Bump-python-pip-to-20.2.2.patch
+++ b/buildroot-patches/0015-Bump-python-pip-to-21.2.4.patch
@@ -1,26 +1,27 @@
-From be12f06ce0920419b0e75f94d4f839078cd41b8b Mon Sep 17 00:00:00 2001
-From: j1nx <p.steenbergen@j1nx.nl>
-Date: Thu, 29 Oct 2020 20:53:35 +0100
-Subject: [PATCH 1/1] Bump python-pip to 20.2.2
+From bb2f5b4eadd153adfad5a1fbffcf3d1e484f6700 Mon Sep 17 00:00:00 2001
+From: Peter Steenbergen <info@j1nx.nl>
+Date: Wed, 8 Sep 2021 12:10:19 +0200
+Subject: [PATCH 1/1] Bump python-pip to 21.2.4
 
 ---
- package/python-pip/python-pip.hash | 2 +-
+ package/python-pip/python-pip.hash | 7 ++-----
  package/python-pip/python-pip.mk   | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
+ 2 files changed, 4 insertions(+), 7 deletions(-)
 
 diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash
-index 58bc239154..39f04e606e 100644
+index 58bc239154..6d53ceb9bb 100644
 --- a/package/python-pip/python-pip.hash
 +++ b/package/python-pip/python-pip.hash
-@@ -1,5 +1,5 @@
- # md5, sha256 from https://pypi.org/pypi/pip/json
- md5	7d42ba49b809604f0df3d55df1c3fd86  pip-20.0.2.tar.gz
+@@ -1,5 +1,2 @@
+-# md5, sha256 from https://pypi.org/pypi/pip/json
+-md5	7d42ba49b809604f0df3d55df1c3fd86  pip-20.0.2.tar.gz
 -sha256	7db0c8ea4c7ea51c8049640e8e6e7fde949de672bfa4949920675563a5a6967f  pip-20.0.2.tar.gz
-+sha256	58a3b0b55ee2278104165c7ee7bc8e2db6f635067f3c66cf637113ec5aa71584  pip-20.2.2.tar.gz
- # Locally computed sha256 checksums
- sha256	5ba21fbb0964f936ad7d15362d1ed6d4931cc8c8f9ff2d4d91190e109be74431  LICENSE.txt
+-# Locally computed sha256 checksums
+-sha256	5ba21fbb0964f936ad7d15362d1ed6d4931cc8c8f9ff2d4d91190e109be74431  LICENSE.txt
++# sha256 from https://pypi.org/pypi/pip/json
++sha256	0eb8a1516c3d138ae8689c0c1a60fde7143310832f9dc77e11d8a4bc62de193b  pip-21.2.4.tar.gz
 diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk
-index cc40eecdfe..e48f923616 100644
+index f881a3ce55..81fc87d5f0 100644
 --- a/package/python-pip/python-pip.mk
 +++ b/package/python-pip/python-pip.mk
 @@ -4,9 +4,9 @@
@@ -28,13 +29,13 @@ index cc40eecdfe..e48f923616 100644
  ################################################################################
  
 -PYTHON_PIP_VERSION = 20.0.2
-+PYTHON_PIP_VERSION = 20.2.2
++PYTHON_PIP_VERSION = 21.2.4
  PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz
 -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/8e/76/66066b7bc71817238924c7e4b448abdb17eb0c92d645769c223f9ace478f
-+PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/73/8e/7774190ac616c69194688ffce7c1b2a097749792fea42e390e7ddfdef8bc
++PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/52/e1/06c018197d8151383f66ebf6979d951995cf495629fc54149491f5d157d0
  PYTHON_PIP_SETUP_TYPE = setuptools
  PYTHON_PIP_LICENSE = MIT
  PYTHON_PIP_LICENSE_FILES = LICENSE.txt
 -- 
-2.20.1
+2.31.0
 
diff --git a/buildroot-patches/0106-Bump-RPI-Firmware-version.patch b/buildroot-patches/0106-Bump-RPI-Firmware-version.patch
index 8bb1ebb2..83fe2f58 100644
--- a/buildroot-patches/0106-Bump-RPI-Firmware-version.patch
+++ b/buildroot-patches/0106-Bump-RPI-Firmware-version.patch
@@ -15,7 +15,7 @@ index 8730ec959b..d10a8b1db9 100644
 @@ -1,3 +1,3 @@
  # Locally computed
 -sha256  ae4e317681995e0f7becd7900ae667cba394e3a0b7ca93a267f3303df7284697  rpi-firmware-d016a6eb01c8c7326a89cb42809fed2a21525de5.tar.gz
-+sha256  3dd57730399b0bc12d99a0bcaca9fcbd54514486bf554597221316e3552d0e6e  rpi-firmware-d9c382e0f3a546e9da153673dce5dd4ba1200994.tar.gz
++sha256  8847b9a62cec9f4e709b2634964a2b6d04d74f410426774785c46d685cd6d39d  rpi-firmware-46f356dcecc5204ca9a8cef7e6894e083b231bc7.tar.gz
  sha256  c7283ff51f863d93a275c66e3b4cb08021a5dd4d8c1e7acc47d872fbe52d3d6b  boot/LICENCE.broadcom
 diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
 index 8b2b2c7154..6099e1f170 100644
@@ -26,7 +26,7 @@ index 8b2b2c7154..6099e1f170 100644
  ################################################################################
  
 -RPI_FIRMWARE_VERSION = d016a6eb01c8c7326a89cb42809fed2a21525de5
-+RPI_FIRMWARE_VERSION = d9c382e0f3a546e9da153673dce5dd4ba1200994
++RPI_FIRMWARE_VERSION = 46f356dcecc5204ca9a8cef7e6894e083b231bc7
  RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
  RPI_FIRMWARE_LICENSE = BSD-3-Clause
  RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom
diff --git a/buildroot-patches/0107-Python-optimizations.patch b/buildroot-patches/0107-Python-optimizations.patch
deleted file mode 100644
index 5ed939ed..00000000
--- a/buildroot-patches/0107-Python-optimizations.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 974685cdd66de4ad7b84d58c8759544db8fc9df7 Mon Sep 17 00:00:00 2001
-From: j1nx <p.steenbergen@j1nx.nl>
-Date: Wed, 17 Feb 2021 11:47:20 +0100
-Subject: [PATCH 1/1] Python optimizations
-
----
- package/python3/python3.mk | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/package/python3/python3.mk b/package/python3/python3.mk
-index af1e5e50d9..7327bb91ba 100644
---- a/package/python3/python3.mk
-+++ b/package/python3/python3.mk
-@@ -26,6 +26,8 @@ HOST_PYTHON3_CONF_OPTS += \
- 	--enable-unicodedata \
- 	--disable-test-modules \
- 	--disable-idle3 \
-+	--with-lto \
-+	--enable-optimizations \
- 	--disable-ossaudiodev
- 
- # Make sure that LD_LIBRARY_PATH overrides -rpath.
-@@ -37,6 +39,8 @@ HOST_PYTHON3_CONF_ENV += \
- 	LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \
- 	ac_cv_prog_HAS_HG=/bin/false
- 
-+HOST_PYTHON3_CONF_ENV += CFLAGS="$(HOST_CFLAGS) -fno-semantic-interposition"
-+
- PYTHON3_DEPENDENCIES = host-python3 libffi
- 
- HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib host-libffi
-@@ -150,6 +154,8 @@ ifeq ($(BR2_PACKAGE_GETTEXT_PROVIDES_LIBINTL),y)
- PYTHON3_DEPENDENCIES += gettext
- endif
- 
-+PYTHON3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fno-semantic-interposition"
-+
- PYTHON3_CONF_OPTS += \
- 	--without-ensurepip \
- 	--without-cxx-main \
-@@ -160,6 +166,8 @@ PYTHON3_CONF_OPTS += \
- 	--disable-tk \
- 	--disable-nis \
- 	--disable-idle3 \
-+	--enable-optimizations \
-+	--with-lto \
- 	--disable-pyc-build
- 
- #
--- 
-2.20.1
-
diff --git a/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch b/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch
index 243e8b7b..c1a3dd1a 100644
--- a/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch
+++ b/buildroot-patches/0108-Bump-RPI-Wifi-Firmware-version.patch
@@ -1,44 +1,35 @@
-From d42b83d821604f3a922389c0f4e2ab2260def7d7 Mon Sep 17 00:00:00 2001
-From: j1nx <p.steenbergen@j1nx.nl>
-Date: Thu, 29 Oct 2020 21:12:53 +0100
+From 38af7d5488f929672c7ec7d62a0523a51b565eda Mon Sep 17 00:00:00 2001
+From: Peter Steenbergen <info@j1nx.nl>
+Date: Wed, 8 Sep 2021 12:25:11 +0200
 Subject: [PATCH 1/1] Bump RPI Wifi Firmware version
 
 ---
  package/rpi-wifi-firmware/rpi-wifi-firmware.hash | 2 +-
- package/rpi-wifi-firmware/rpi-wifi-firmware.mk   | 6 +++---
- 2 files changed, 4 insertions(+), 4 deletions(-)
+ package/rpi-wifi-firmware/rpi-wifi-firmware.mk   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
-index b8931d2c45..9afc5a96b0 100644
+index 71e323e806..3bd62306eb 100644
 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
 +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.hash
 @@ -1,3 +1,3 @@
  # Locally calculated
 -sha256  cf806f6bdba0f803b90bc210f524a6ac37bac7ad19306c61474bb2dc59875e87  rpi-wifi-firmware-9c0ffe9a7f0753b36ed88f7981905a989d940ea9.tar.gz
-+sha256  f8b3af1f394d7a820871d03ac0e7c58ebc1bd556812f4a27cd48eef330c57b00  rpi-wifi-firmware-83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5.tar.gz
- sha256  b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d   LICENCE.broadcom_bcm43xx
++sha256  0e7fcfe75a8990815a184dc55f8fdf5d0644d351a15a7aef865ff90ff4ca8eb4  rpi-wifi-firmware-883b72628de1d7efa45b421da0cbf175ac2374f8.tar.gz
+ sha256  b16056fc91b82a0e3e8de8f86c2dac98201aa9dc3cbd33e8d38f1b087fcec30d  LICENCE.broadcom_bcm43xx
 diff --git a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
-index 6be02509fe..3277a6e4a0 100644
+index 24ba5941b0..28926ff4f0 100644
 --- a/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
 +++ b/package/rpi-wifi-firmware/rpi-wifi-firmware.mk
-@@ -4,14 +4,14 @@
+@@ -4,7 +4,7 @@
  #
  ################################################################################
  
 -RPI_WIFI_FIRMWARE_VERSION = 9c0ffe9a7f0753b36ed88f7981905a989d940ea9
--RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
-+RPI_WIFI_FIRMWARE_VERSION = 83938f78ca2d5a0ffe0c223bb96d72ccc7b71ca5
-+RPI_WIFI_FIRMWARE_SITE = $(call github,RPi-Distro,firmware-nonfree,$(RPI_WIFI_FIRMWARE_VERSION))
++RPI_WIFI_FIRMWARE_VERSION = 883b72628de1d7efa45b421da0cbf175ac2374f8
+ RPI_WIFI_FIRMWARE_SITE = $(call github,LibreELEC,brcmfmac_sdio-firmware-rpi,$(RPI_WIFI_FIRMWARE_VERSION))
  RPI_WIFI_FIRMWARE_LICENSE = PROPRIETARY
  RPI_WIFI_FIRMWARE_LICENSE_FILES = LICENCE.broadcom_bcm43xx
- 
- define RPI_WIFI_FIRMWARE_INSTALL_TARGET_CMDS
- 	$(INSTALL) -d $(TARGET_DIR)/lib/firmware/brcm
--	$(INSTALL) -m 0644 $(@D)/firmware/brcm/brcmfmac* $(TARGET_DIR)/lib/firmware/brcm
-+	$(INSTALL) -m 0644 $(@D)/brcm/brcmfmac434* $(TARGET_DIR)/lib/firmware/brcm
- endef
- 
- $(eval $(generic-package))
 -- 
-2.20.1
+2.31.0
 
diff --git a/buildroot-patches/0110-Bump-and-patch-KF5.patch b/buildroot-patches/0110-Bump-and-patch-KF5.patch
index 6b48b927..c914f057 100644
--- a/buildroot-patches/0110-Bump-and-patch-KF5.patch
+++ b/buildroot-patches/0110-Bump-and-patch-KF5.patch
@@ -1,25 +1,25 @@
-From 4fc823103b3c7401a30bb3461276c076b446ecdf Mon Sep 17 00:00:00 2001
-From: j1nx <p.steenbergen@j1nx.nl>
-Date: Mon, 19 Oct 2020 20:18:18 +0200
+From e1136f863032a8c35fc80a86687b4e4b901b052c Mon Sep 17 00:00:00 2001
+From: Peter Steenbergen <info@j1nx.nl>
+Date: Wed, 8 Sep 2021 12:33:06 +0200
 Subject: [PATCH 1/1] Bump and patch KF5
 
 ---
- .../kf5-extra-cmake-modules.hash                    |  1 +
+ .../kf5-extra-cmake-modules.hash                    |  2 +-
  .../kf5-extra-cmake-modules.mk                      |  1 +
- package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash    |  1 +
+ package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash    |  2 +-
  package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk      | 13 ++++++++++++-
- .../kf5-networkmanager-qt.hash                      |  1 +
+ .../kf5-networkmanager-qt.hash                      |  2 +-
  package/kf5/kf5.mk                                  |  2 +-
- 6 files changed, 17 insertions(+), 2 deletions(-)
+ 6 files changed, 17 insertions(+), 5 deletions(-)
 
 diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
-index 733e267fdb..bf017ed377 100644
+index 733e267fdb..7d742a2e04 100644
 --- a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
 +++ b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.hash
-@@ -1,3 +1,4 @@
+@@ -1,3 +1,3 @@
  # Locally calculated
- sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz
-+sha256 878d47a901056d5303bf37414d787046e1d38fac2bd9f2f5ddd00a9dd6b9f4eb extra-cmake-modules-5.75.0.tar.xz
+-sha256 976d8bd15a0b929376bfaef34602a0fb9614229851c46fac3c4b28938f682195 extra-cmake-modules-5.47.0.tar.xz
++sha256 5972ec6d78c3e95ab9cbecdb0661c158570e868466357c5cec2b63a4251ecce4 extra-cmake-modules-5.82.0.tar.xz
  sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS
 diff --git a/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk b/package/kf5/kf5-extra-cmake-modules/kf5-extra-cmake-modules.mk
 index 3c4281b960..d3aad89264 100644
@@ -31,13 +31,13 @@ index 3c4281b960..d3aad89264 100644
  $(eval $(cmake-package))
 +$(eval $(host-cmake-package))
 diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
-index 0cd8dcfc15..415c084cad 100644
+index 0cd8dcfc15..1a476915c4 100644
 --- a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
 +++ b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.hash
-@@ -1,3 +1,4 @@
+@@ -1,3 +1,3 @@
  # Locally calculated
- sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz
-+sha256 9ca2cf82ddc12e27ff73aaefdf616c3eb6552a3a5531f014b5bf52a34a4c73f9 kcoreaddons-5.75.0.tar.xz
+-sha256 40ff04757e4ac19bc8448940fe18886c894a2069865966cc865fc55ff67b0b46 kcoreaddons-5.47.0.tar.xz
++sha256 12077aac579065ca5ca877aee3bbdce65c52b6d0e9ef8b1fc0e127dd2e7f6843 kcoreaddons-5.82.0.tar.xz
  sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB
 diff --git a/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk b/package/kf5/kf5-kcoreaddons/kf5-kcoreaddons.mk
 index 76be8876cc..dbde5d3285 100644
@@ -69,16 +69,16 @@ index 76be8876cc..dbde5d3285 100644
 +
 +$(eval $(host-cmake-package))
 diff --git a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
-index 8ccada455e..a57d848e07 100644
+index 8ccada455e..72b67dff96 100644
 --- a/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
 +++ b/package/kf5/kf5-networkmanager-qt/kf5-networkmanager-qt.hash
-@@ -1,3 +1,4 @@
+@@ -1,3 +1,3 @@
  # Locally calculated
- sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz
-+sha256 ba9d15eb5e0e624ffaac591cdaad43dc62e60ccfa25b98be686b58800b41018b networkmanager-qt-5.75.0.tar.xz
+-sha256 d0b377500ee4cf4f029f4d04d6844bcf3d2d6734982b511a5fffab5165688209 networkmanager-qt-5.47.0.tar.xz
++sha256 14f9fe4a6caa3f1cb97927f525ebe10816203b8a7e7f8ec7016bc895f378c7f1 networkmanager-qt-5.82.0.tar.xz
  sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551	COPYING.LIB
 diff --git a/package/kf5/kf5.mk b/package/kf5/kf5.mk
-index 8360fc9b63..f744939ecf 100644
+index 8360fc9b63..49451cb907 100644
 --- a/package/kf5/kf5.mk
 +++ b/package/kf5/kf5.mk
 @@ -4,7 +4,7 @@
@@ -86,10 +86,10 @@ index 8360fc9b63..f744939ecf 100644
  ################################################################################
  
 -KF5_VERSION_MAJOR = 5.47
-+KF5_VERSION_MAJOR = 5.75
++KF5_VERSION_MAJOR = 5.82
  KF5_VERSION = $(KF5_VERSION_MAJOR).0
  KF5_SITE = https://download.kde.org/stable/frameworks/$(KF5_VERSION_MAJOR)
  
 -- 
-2.20.1
+2.31.0
 
diff --git a/buildroot-patches/0116-update-htop-3.0.5-with-upstream-changes.patch b/buildroot-patches/0116-update-htop-3.0.5-with-upstream-changes.patch
deleted file mode 100644
index deb89c11..00000000
--- a/buildroot-patches/0116-update-htop-3.0.5-with-upstream-changes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From af86c67b797775c20c41c6c6aae4596231c1cd08 Mon Sep 17 00:00:00 2001
-From: Ciaran O'Reilly <ciaran@oreilly.cat>
-Date: Tue, 27 Jul 2021 08:18:56 +0200
-Subject: [PATCH] Patch htop with upstream changes
-
----
- package/htop/htop.hash |  2 +-
- package/htop/htop.mk   | 10 ++++++++--
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/package/htop/htop.hash b/package/htop/htop.hash
-index 647feabb8e..34d95eb7a1 100644
---- a/package/htop/htop.hash
-+++ b/package/htop/htop.hash
-@@ -1,3 +1,3 @@
- # Locally calculated
--sha256  19535f8f01ac08be2df880c93c9cedfc50fa92320d48e3ef92a30b6edc4d1917  htop-3.0.5.tar.gz
-+sha256  123476d56a5e6a219654eebb6b2ec747dfa364f39c01a6475bf8030a25c81bff  htop-ce6d60e7def146c13d0b8bca4642e7401a0a8995.tar.gz
- sha256  c228cc14df980a23ea0c3c9ac957b904dd6a8514f6283db403de22e9179471be  COPYING
-diff --git a/package/htop/htop.mk b/package/htop/htop.mk
-index aa2ff24750..bb2bcb29ae 100644
---- a/package/htop/htop.mk
-+++ b/package/htop/htop.mk
-@@ -4,9 +4,15 @@
- #
- ################################################################################
- 
--HTOP_VERSION = 3.0.5
--HTOP_SITE = https://dl.bintray.com/htop/source
-+# This commit hash corresponds to version 3.0.5.
-+# htop sources were moved from bintray to github and the sources tar archive
-+# was also changed (the build process requires `HTOP_AUTORECONF = YES` now). We
-+# use commit hash instead of git tag here to avoid breaking existing source
-+# caches
-+HTOP_VERSION = ce6d60e7def146c13d0b8bca4642e7401a0a8995
-+HTOP_SITE = $(call github,htop-dev,htop,$(HTOP_VERSION))
- HTOP_DEPENDENCIES = ncurses
-+HTOP_AUTORECONF = YES
- # Prevent htop build system from searching the host paths
- HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)
- HTOP_LICENSE = GPL-2.0
--- 
-2.23.0
-