From 293a33acdaed7c04563f12bce8d3098405dfdb70 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sat, 2 Sep 2023 17:13:45 +0000
Subject: [PATCH 01/27] py311-310: Update to latest version

---
 cross/pip/Makefile                          |  2 +-
 cross/pip/digests                           |  6 +++---
 cross/python310/Makefile                    | 18 +++++++++---------
 cross/python310/digests                     |  6 +++---
 cross/python311/Makefile                    | 20 ++++++++++----------
 cross/python311/digests                     |  6 +++---
 native/python310/Makefile                   |  6 +++---
 native/python310/digests                    |  6 +++---
 native/python311/Makefile                   |  6 +++---
 native/python311/digests                    |  6 +++---
 spk/python310/Makefile                      |  6 +++---
 spk/python310/src/requirements-crossenv.txt | 14 +++++++-------
 spk/python310/src/requirements-pure.txt     | 16 ++++++++--------
 spk/python311/Makefile                      |  6 +++---
 spk/python311/src/requirements-crossenv.txt | 16 ++++++++--------
 spk/python311/src/requirements-pure.txt     | 16 ++++++++--------
 16 files changed, 78 insertions(+), 78 deletions(-)

diff --git a/cross/pip/Makefile b/cross/pip/Makefile
index f27791cb3b6..f5600891540 100644
--- a/cross/pip/Makefile
+++ b/cross/pip/Makefile
@@ -1,6 +1,6 @@
 PKG_NAME = pip
 # use the same version in native/python310|311/Makefile (python310|311_native_post_install)
-PKG_VERS = 23.1.2
+PKG_VERS = 23.2.1
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/p/$(PKG_NAME)
diff --git a/cross/pip/digests b/cross/pip/digests
index 61048dcf02e..81690c88b4a 100644
--- a/cross/pip/digests
+++ b/cross/pip/digests
@@ -1,3 +1,3 @@
-pip-23.1.2.tar.gz SHA1 ac4e7527d0d9093cadc46e6d2008f202cbef04e2
-pip-23.1.2.tar.gz SHA256 0e7c86f486935893c708287b30bd050a36ac827ec7fe5e43fe7cb198dd835fba
-pip-23.1.2.tar.gz MD5 dd899cacab913941c48f728ef596dafe
+pip-23.2.1.tar.gz SHA1 4bdfd8e976b5122cf55f4f4740f7305f1ffa4310
+pip-23.2.1.tar.gz SHA256 fb0bd5435b3200c602b5bf61d2d43c2f13c02e29c1707567ae7fbc514eb9faf2
+pip-23.2.1.tar.gz MD5 e9b1226701a56ee3fcc81aba60d25d75
diff --git a/cross/python310/Makefile b/cross/python310/Makefile
index 0a9d8ee8487..24bcf83b2af 100644
--- a/cross/python310/Makefile
+++ b/cross/python310/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = python310
-PKG_VERS = 3.10.12
+PKG_VERS = 3.10.13
 PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
 PKG_EXT = tar.xz
 PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
@@ -133,17 +133,17 @@ python310_install:
 
 
 # wheels to install in crossenv
-CROSSENV_WHEELS  = setuptools-rust==1.6.0
+CROSSENV_WHEELS  = setuptools-rust==1.7.0
 CROSSENV_WHEELS += setuptools-scm==7.1.0
 CROSSENV_WHEELS += cffi==1.15.1
-CROSSENV_WHEELS += Cython==0.29.35
+CROSSENV_WHEELS += Cython==3.0.2
 CROSSENV_WHEELS += flit==3.9.0
 ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
 CROSSENV_WHEELS += cryptography==41.0.3
-CROSSENV_WHEELS += poetry==1.5.1
+CROSSENV_WHEELS += poetry==1.6.1
 endif
 ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
-CROSSENV_WHEELS += maturin==1.1.0
+CROSSENV_WHEELS += maturin==1.2.3
 endif
 
 # Create the crossenv in preparation for
@@ -154,10 +154,10 @@ python310_post_install: $(WORK_DIR)/python-cc.mk
 	cp -R $(HOSTPYTHON_LIB_NATIVE) $(PYTHON_LIB_CROSS)/../
 	@$(RUN) $(PYTHON_NATIVE) -m crossenv $(STAGING_INSTALL_PREFIX)/bin/python$(PKG_VERS_MAJOR_MINOR) --cc $(TC_PATH)$(TC_PREFIX)gcc --cxx $(TC_PATH)$(TC_PREFIX)c++ --ar $(TC_PATH)$(TC_PREFIX)ar --sysroot $(TC_SYSROOT) --env LIBRARY_PATH= --manylinux manylinux2014 $(WORK_DIR)/crossenv/
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==23.1.2" --no-setuptools --no-wheel --disable-pip-version-check
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==23.1.2" --no-setuptools --no-wheel --disable-pip-version-check
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==63.4.3" "wheel==0.40.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==63.4.3" "wheel==0.40.0"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==23.2.1" --no-setuptools --no-wheel --disable-pip-version-check
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==23.2.1" --no-setuptools --no-wheel --disable-pip-version-check
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==68.1.2" "wheel==0.41.2"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==68.1.2" "wheel==0.41.2"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install $(CROSSENV_WHEELS)
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install $(CROSSENV_WHEELS)
 ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS))
diff --git a/cross/python310/digests b/cross/python310/digests
index a9e61d174c9..9908929c0d8 100644
--- a/cross/python310/digests
+++ b/cross/python310/digests
@@ -1,3 +1,3 @@
-Python-3.10.12.tar.xz SHA1 85e043a6cd30835bdf95e3db2d1b4b15e142d067
-Python-3.10.12.tar.xz SHA256 afb74bf19130e7a47d10312c8f5e784f24e0527981eab68e20546cfb865830b8
-Python-3.10.12.tar.xz MD5 49b0342476b984e106d308c25d657f12
+Python-3.10.13.tar.xz SHA1 fa66c061cba1acee5e9fe69b7d22cca744a6ecda
+Python-3.10.13.tar.xz SHA256 5c88848668640d3e152b35b4536ef1c23b2ca4bd2c957ef1ecbb053f571dd3f6
+Python-3.10.13.tar.xz MD5 8847dc6458d1431d0ae0f55942deeb89
diff --git a/cross/python311/Makefile b/cross/python311/Makefile
index b94b0c03656..0a8d4105310 100644
--- a/cross/python311/Makefile
+++ b/cross/python311/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = python311
-PKG_VERS = 3.11.4
+PKG_VERS = 3.11.5
 PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
 PKG_EXT = tar.xz
 PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
@@ -131,11 +131,11 @@ python311_install:
 # default wheels to install in crossenv
 CROSSENV_WHEELS  = cffi==1.15.1
 CROSSENV_WHEELS += cryptography==41.0.3
-CROSSENV_WHEELS += Cython==0.29.35
+CROSSENV_WHEELS += Cython==3.0.2
 CROSSENV_WHEELS += flit==3.9.0
-CROSSENV_WHEELS += poetry==1.5.1
+CROSSENV_WHEELS += poetry==1.6.1
 CROSSENV_WHEELS += scikit-build==0.17.6
-CROSSENV_WHEELS += setuptools-rust==1.6.0
+CROSSENV_WHEELS += setuptools-rust==1.7.0
 CROSSENV_WHEELS += setuptools-scm==7.1.0
 
 # [numpy] <= 1.21.6 (armv5)  - gcc-4.6.4 - unsupported
@@ -146,13 +146,13 @@ ifeq ($(call version_le, $(TC_GCC), 5.0),1)
 CROSSENV_WHEELS += numpy==1.24.4
 # [numpy] >= 1.25.0 requires c++17
 else ifeq ($(call version_gt, $(TC_GCC), 5.0),1)
-CROSSENV_WHEELS += numpy==1.25.1
+CROSSENV_WHEELS += numpy==1.25.2
 endif
 endif
 
 # [maturin]
 ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
-CROSSENV_WHEELS += maturin==1.1.0
+CROSSENV_WHEELS += maturin==1.2.3
 endif
 
 # Create the crossenv in preparation for
@@ -163,10 +163,10 @@ python311_post_install: $(WORK_DIR)/python-cc.mk
 	cp -R $(HOSTPYTHON_LIB_NATIVE) $(PYTHON_LIB_CROSS)/../
 	@$(RUN) $(PYTHON_NATIVE) -m crossenv $(STAGING_INSTALL_PREFIX)/bin/python$(PKG_VERS_MAJOR_MINOR) --cc $(TC_PATH)$(TC_PREFIX)gcc --cxx $(TC_PATH)$(TC_PREFIX)c++ --ar $(TC_PATH)$(TC_PREFIX)ar --sysroot $(TC_SYSROOT) --env LIBRARY_PATH= --manylinux manylinux2014 $(WORK_DIR)/crossenv/
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==23.1.2" --no-setuptools --no-wheel --disable-pip-version-check
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==23.1.2" --no-setuptools --no-wheel --disable-pip-version-check
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==63.4.3" "wheel==0.40.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==63.4.3" "wheel==0.40.0"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==23.2.1" --no-setuptools --no-wheel --disable-pip-version-check
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==23.2.1" --no-setuptools --no-wheel --disable-pip-version-check
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==68.1.2" "wheel==0.41.2"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==68.1.2" "wheel==0.41.2"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install $(CROSSENV_WHEELS)
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install $(CROSSENV_WHEELS)
 ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS))
diff --git a/cross/python311/digests b/cross/python311/digests
index a151f69be58..646c54d3e9f 100644
--- a/cross/python311/digests
+++ b/cross/python311/digests
@@ -1,3 +1,3 @@
-Python-3.11.4.tar.xz SHA1 413b3715d919a7b473281529ab91eeea5c82e632
-Python-3.11.4.tar.xz SHA256 2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6
-Python-3.11.4.tar.xz MD5 fb7f7eae520285788449d569e45b6718
+Python-3.11.5.tar.xz SHA1 b13ec58fa6ebf5b0f7178555c5506e135cb7d785
+Python-3.11.5.tar.xz SHA256 85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f
+Python-3.11.5.tar.xz MD5 393856f1b7713aa8bba4b642ab9985d3
diff --git a/native/python310/Makefile b/native/python310/Makefile
index f964b305537..1f75f14a489 100644
--- a/native/python310/Makefile
+++ b/native/python310/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = python310
-PKG_VERS = 3.10.12
+PKG_VERS = 3.10.13
 PKG_EXT = tar.xz
 PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
@@ -35,9 +35,9 @@ PIP_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/loc
 python310_native_post_install: $(WORK_DIR)/python-native.mk
 	@$(MSG) Installing pip
 	@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
-	@$(RUN) $(PYTHON) get-pip.py "pip==23.1.2" --no-setuptools --no-wheel --disable-pip-version-check
+	@$(RUN) $(PYTHON) get-pip.py "pip==23.2.1" --no-setuptools --no-wheel --disable-pip-version-check
 	@$(MSG) Installing setuptools, wheel, cffi and cross env
-	@$(PIP) --disable-pip-version-check install "setuptools==63.4.3" "setuptools-rust==1.6.0" "maturin==1.1.0" "wheel==0.40.0" "cffi==1.15.1" "crossenv==1.4.0"
+	@$(PIP) --disable-pip-version-check install "setuptools==68.1.2" "setuptools-rust==1.7.0" "maturin==1.2.3" "wheel==0.41.2" "cffi==1.15.1" "crossenv==1.4.0"
 
 $(WORK_DIR)/python-native.mk:
 	@echo PIP=$(PIP_NATIVE) >> $@
diff --git a/native/python310/digests b/native/python310/digests
index a9e61d174c9..9908929c0d8 100644
--- a/native/python310/digests
+++ b/native/python310/digests
@@ -1,3 +1,3 @@
-Python-3.10.12.tar.xz SHA1 85e043a6cd30835bdf95e3db2d1b4b15e142d067
-Python-3.10.12.tar.xz SHA256 afb74bf19130e7a47d10312c8f5e784f24e0527981eab68e20546cfb865830b8
-Python-3.10.12.tar.xz MD5 49b0342476b984e106d308c25d657f12
+Python-3.10.13.tar.xz SHA1 fa66c061cba1acee5e9fe69b7d22cca744a6ecda
+Python-3.10.13.tar.xz SHA256 5c88848668640d3e152b35b4536ef1c23b2ca4bd2c957ef1ecbb053f571dd3f6
+Python-3.10.13.tar.xz MD5 8847dc6458d1431d0ae0f55942deeb89
diff --git a/native/python311/Makefile b/native/python311/Makefile
index ab2e5c88c92..9125b82b8fb 100644
--- a/native/python311/Makefile
+++ b/native/python311/Makefile
@@ -1,5 +1,5 @@
 PKG_NAME = python311
-PKG_VERS = 3.11.4
+PKG_VERS = 3.11.5
 PKG_EXT = tar.xz
 PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
@@ -35,9 +35,9 @@ PIP_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/loc
 python311_native_post_install: $(WORK_DIR)/python-native.mk
 	@$(MSG) Installing pip
 	@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
-	@$(RUN) $(PYTHON) get-pip.py "pip==23.1.2" --no-setuptools --no-wheel --disable-pip-version-check
+	@$(RUN) $(PYTHON) get-pip.py "pip==23.2.1" --no-setuptools --no-wheel --disable-pip-version-check
 	@$(MSG) Installing setuptools, wheel, cffi and cross env
-	@$(PIP) --disable-pip-version-check install "setuptools==63.4.3" "setuptools-rust==1.6.0" "maturin==1.1.0" "wheel==0.40.0" "cffi==1.15.1" "crossenv==1.4.0"
+	@$(PIP) --disable-pip-version-check install "setuptools==68.1.2" "setuptools-rust==1.7.0" "maturin==1.2.3" "wheel==0.41.2" "cffi==1.15.1" "crossenv==1.4.0"
 
 $(WORK_DIR)/python-native.mk:
 	@echo PIP=$(PIP_NATIVE) >> $@
diff --git a/native/python311/digests b/native/python311/digests
index a151f69be58..646c54d3e9f 100644
--- a/native/python311/digests
+++ b/native/python311/digests
@@ -1,3 +1,3 @@
-Python-3.11.4.tar.xz SHA1 413b3715d919a7b473281529ab91eeea5c82e632
-Python-3.11.4.tar.xz SHA256 2f0e409df2ab57aa9fc4cbddfb976af44e4e55bf6f619eee6bc5c2297264a7f6
-Python-3.11.4.tar.xz MD5 fb7f7eae520285788449d569e45b6718
+Python-3.11.5.tar.xz SHA1 b13ec58fa6ebf5b0f7178555c5506e135cb7d785
+Python-3.11.5.tar.xz SHA256 85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f
+Python-3.11.5.tar.xz MD5 393856f1b7713aa8bba4b642ab9985d3
diff --git a/spk/python310/Makefile b/spk/python310/Makefile
index d368e85c301..01052d218e7 100644
--- a/spk/python310/Makefile
+++ b/spk/python310/Makefile
@@ -1,7 +1,7 @@
 SPK_NAME = python310
-SPK_VERS = 3.10.12
+SPK_VERS = 3.10.13
 SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
-SPK_REV = 18
+SPK_REV = 19
 SPK_ICON = src/python3.png
 
 DEPENDS  = cross/$(SPK_NAME)
@@ -13,7 +13,7 @@ DESCRIPTION_FRE = Language de programmation Python.
 DESCRIPTION_SPN = Lenguaje de programación Python.
 STARTABLE = no
 DISPLAY_NAME = Python 3.10
-CHANGELOG = "1. Update to Python 3.10.12<br/>2. Update all packages to OpenSSL 3.1.2"
+CHANGELOG = "1. Update to Python 3.10.13"
 
 HOMEPAGE = https://www.python.org
 LICENSE  = PSF
diff --git a/spk/python310/src/requirements-crossenv.txt b/spk/python310/src/requirements-crossenv.txt
index 6fc6c06dcc9..e5b47ea8eb7 100644
--- a/spk/python310/src/requirements-crossenv.txt
+++ b/spk/python310/src/requirements-crossenv.txt
@@ -15,7 +15,7 @@ bcrypt==4.0.1
 # https://docs.rs/openssl/latest/openssl/#automatic
 #  ENV += OPENSSL_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/
 #  ENV += OPENSSL_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/
-cryptography==41.0.1
+cryptography==41.0.3
 
 # Requirement for cryptography
 cffi==1.15.1
@@ -24,13 +24,13 @@ cffi==1.15.1
 # All tested and can be enabled but may conflict
 # with local python apps requirements
 
-immutables==0.19
+immutables==0.20
 MarkupSafe==2.1.3
 msgpack-python==0.5.6
 netifaces==0.11.0
 psutil==5.9.5
-regex==2023.6.3
-SQLAlchemy==2.0.17
+regex==2023.8.8
+SQLAlchemy==2.0.20
 zope.interface==6.0
 
 # [gevent]
@@ -38,11 +38,11 @@ zope.interface==6.0
 # Require environment variables
 #  GEVENTSETUP_EMBED_CARES=FALSE
 #  GEVENTSETUP_EMBED_LIBEV=FALSE
-gevent==22.10.2
+gevent==23.9.0
 
 # [lxml]
 # Depends: libxml2, libxslt
-lxml==4.9.2
+lxml==4.9.3
 
 # [mysqlclient]
 # Depends: mysql-connector-c, mariadb-connector-c
@@ -76,7 +76,7 @@ PyNaCl==1.5.0
 
 # [PyYAML]
 # Depends: libyaml
-PyYAML==6.0
+PyYAML==6.0.1
 
 # [rencode]
 # Updated fork of the project
diff --git a/spk/python310/src/requirements-pure.txt b/spk/python310/src/requirements-pure.txt
index 7313f26e3bf..acae8820607 100644
--- a/spk/python310/src/requirements-pure.txt
+++ b/spk/python310/src/requirements-pure.txt
@@ -1,26 +1,26 @@
 # basic default wheels
-#pip==23.1.2             ==> Always install latest version (service-setup.sh:install_python_virtualenv)
+#pip==23.2.1             ==> Always install latest version (service-setup.sh:install_python_virtualenv)
 
 # Always match what's in cross/python310/Makefile
-setuptools==68.0.0
-wheel==0.40.0
+setuptools==68.1.2
+wheel==0.41.2
 
 # Always use latest version available
-# certifi==2022.12.7
+# certifi==2023.7.22
 certifi
 
 # Mandatory for python application
 # to create their local virtualenv
 # in order to install wheels within
 # their running environment
-virtualenv==20.23.1
+virtualenv==20.24.4
 
 # Other mandatory wheels that
 # gets install by default as
 # basic dependencies of above
-distlib==0.3.6
-filelock==3.12.2
-platformdirs==3.8.0
+distlib==0.3.7
+filelock==3.12.3
+platformdirs==3.10.0
 six==1.16.0
 
 ##
diff --git a/spk/python311/Makefile b/spk/python311/Makefile
index 20d840a4a0a..691c1059519 100644
--- a/spk/python311/Makefile
+++ b/spk/python311/Makefile
@@ -1,7 +1,7 @@
 SPK_NAME = python311
-SPK_VERS = 3.11.4
+SPK_VERS = 3.11.5
 SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
-SPK_REV = 7
+SPK_REV = 8
 SPK_ICON = src/python3.png
 
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
@@ -15,7 +15,7 @@ DESCRIPTION_FRE = Language de programmation Python.
 DESCRIPTION_SPN = Lenguaje de programación Python.
 STARTABLE = no
 DISPLAY_NAME = Python 3.11
-CHANGELOG = "1. Update to Python 3.11.4<br/>2. Update all packages to OpenSSL 3.1.2"
+CHANGELOG = "1. Update to Python 3.11.5"
 
 HOMEPAGE = https://www.python.org
 LICENSE  = PSF
diff --git a/spk/python311/src/requirements-crossenv.txt b/spk/python311/src/requirements-crossenv.txt
index ed31bfcec28..48f3e1d53d0 100644
--- a/spk/python311/src/requirements-crossenv.txt
+++ b/spk/python311/src/requirements-crossenv.txt
@@ -15,7 +15,7 @@ bcrypt==4.0.1
 # https://docs.rs/openssl/latest/openssl/#automatic
 #  ENV += OPENSSL_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/
 #  ENV += OPENSSL_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/
-cryptography==41.0.1
+cryptography==41.0.3
 
 # Requirement for cryptography
 cffi==1.15.1
@@ -24,13 +24,13 @@ cffi==1.15.1
 # All tested and can be enabled but may conflict
 # with local python apps requirements
 
-immutables==0.19
+immutables==0.20
 MarkupSafe==2.1.3
 msgpack-python==0.5.6
 netifaces==0.11.0
 psutil==5.9.5
-regex==2023.6.3
-SQLAlchemy==2.0.17
+regex==2023.8.8
+SQLAlchemy==2.0.20
 zope.interface==6.0
 
 # [gevent]
@@ -38,11 +38,11 @@ zope.interface==6.0
 # Require environment variables
 #  GEVENTSETUP_EMBED_CARES=FALSE
 #  GEVENTSETUP_EMBED_LIBEV=FALSE
-gevent==22.10.2
+gevent==23.9.0
 
 # [lxml]
 # Depends: libxml2, libxslt
-lxml==4.9.2
+lxml==4.9.3
 
 # [mysqlclient]
 # Depends: mysql-connector-c, mariadb-connector-c
@@ -75,7 +75,7 @@ pycurl==7.45.2
 # Require environment variables
 #  PYO3_CROSS_LIB_DIR=$(STAGING_INSTALL_PREFIX)/lib/
 #  PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/
-pydantic_core==2.3.0
+pydantic_core==2.7.0
 
 # [PyNaCl]
 # Depends: cross/libsodium
@@ -85,7 +85,7 @@ PyNaCl==1.5.0
 
 # [PyYAML]
 # Depends: libyaml
-PyYAML==6.0
+PyYAML==6.0.1
 
 # [rencode]
 # Updated fork of the project
diff --git a/spk/python311/src/requirements-pure.txt b/spk/python311/src/requirements-pure.txt
index 7313f26e3bf..acae8820607 100644
--- a/spk/python311/src/requirements-pure.txt
+++ b/spk/python311/src/requirements-pure.txt
@@ -1,26 +1,26 @@
 # basic default wheels
-#pip==23.1.2             ==> Always install latest version (service-setup.sh:install_python_virtualenv)
+#pip==23.2.1             ==> Always install latest version (service-setup.sh:install_python_virtualenv)
 
 # Always match what's in cross/python310/Makefile
-setuptools==68.0.0
-wheel==0.40.0
+setuptools==68.1.2
+wheel==0.41.2
 
 # Always use latest version available
-# certifi==2022.12.7
+# certifi==2023.7.22
 certifi
 
 # Mandatory for python application
 # to create their local virtualenv
 # in order to install wheels within
 # their running environment
-virtualenv==20.23.1
+virtualenv==20.24.4
 
 # Other mandatory wheels that
 # gets install by default as
 # basic dependencies of above
-distlib==0.3.6
-filelock==3.12.2
-platformdirs==3.8.0
+distlib==0.3.7
+filelock==3.12.3
+platformdirs==3.10.0
 six==1.16.0
 
 ##

From 61967dd7d8c4cfff9257ee3484041c60ff6e2fb6 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sat, 2 Sep 2023 19:16:42 +0000
Subject: [PATCH 02/27] spk.mk: Add a make pythonclean option to facilitate
 rebuilds

---
 mk/spksrc.spk.mk                                       |  4 ++++
 .../src/requirements-crossenv-numpy-armv5.txt          | 10 ----------
 2 files changed, 4 insertions(+), 10 deletions(-)
 delete mode 100644 spk/python310/src/requirements-crossenv-numpy-armv5.txt

diff --git a/mk/spksrc.spk.mk b/mk/spksrc.spk.mk
index c61b7ca2a45..2aea690271b 100644
--- a/mk/spksrc.spk.mk
+++ b/mk/spksrc.spk.mk
@@ -530,6 +530,10 @@ wheelcleancache: wheelclean
 wheelcleanall: wheelcleancache
 	rm -fr ../../distrib/pip
 
+pythonclean: wheelcleanall
+	rm -fr work-*/[Pp]ython* work-*/.python* \
+	rm -fr work-*/crossenv
+
 all: package
 ifneq ($(filter 1 on ON,$(PSTAT)),)
 	@$(MSG) MAKELEVEL: $(MAKELEVEL), PARALLEL_MAKE: $(PARALLEL_MAKE), ARCH: $(ARCH)-$(TCVERSION) >> $(PSTAT_LOG)
diff --git a/spk/python310/src/requirements-crossenv-numpy-armv5.txt b/spk/python310/src/requirements-crossenv-numpy-armv5.txt
deleted file mode 100644
index 7696bc2457a..00000000000
--- a/spk/python310/src/requirements-crossenv-numpy-armv5.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## All configurations below are optional and
-## are provided to demonstrate how to build
-## various wheels.  Uncoment to enable.
-##
-
-# [numpy]
-#   - armv5 (88f6281-6.1) Last known working version
-#   - Require Cython in cross/python310 crossenv
-numpy==1.21.6

From 35a1027830585e51a4a0638b4af457fb54da24a8 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sat, 2 Sep 2023 19:17:15 +0000
Subject: [PATCH 03/27] py311-310: Test building all wheels

---
 cross/python310/Makefile                        |  5 ++++-
 cross/python311/Makefile                        |  5 ++++-
 spk/python310/Makefile                          | 17 ++++++++++-------
 spk/python310/src/requirements-abi3.txt         |  4 ++--
 .../src/requirements-crossenv-numpy-gcc4.txt    |  1 -
 .../src/requirements-crossenv-numpy.txt         |  4 +---
 spk/python310/src/requirements-crossenv.txt     |  2 +-
 spk/python311/Makefile                          | 12 ++++++++++--
 spk/python311/src/requirements-abi3.txt         |  4 ++--
 .../src/requirements-crossenv-numpy.txt         |  2 +-
 .../src/requirements-crossenv-rpds-py.txt       |  2 +-
 spk/python311/src/requirements-crossenv.txt     |  2 +-
 12 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/cross/python310/Makefile b/cross/python310/Makefile
index 24bcf83b2af..0c701b98ca8 100644
--- a/cross/python310/Makefile
+++ b/cross/python310/Makefile
@@ -136,7 +136,10 @@ python310_install:
 CROSSENV_WHEELS  = setuptools-rust==1.7.0
 CROSSENV_WHEELS += setuptools-scm==7.1.0
 CROSSENV_WHEELS += cffi==1.15.1
-CROSSENV_WHEELS += Cython==3.0.2
+# Version >= 3.x breaks PyYAML
+# https://github.com/yaml/pyyaml/issues/601
+#CROSSENV_WHEELS += Cython==3.0.2
+CROSSENV_WHEELS += Cython==0.29.36
 CROSSENV_WHEELS += flit==3.9.0
 ifneq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
 CROSSENV_WHEELS += cryptography==41.0.3
diff --git a/cross/python311/Makefile b/cross/python311/Makefile
index 0a8d4105310..42c119d4495 100644
--- a/cross/python311/Makefile
+++ b/cross/python311/Makefile
@@ -131,7 +131,10 @@ python311_install:
 # default wheels to install in crossenv
 CROSSENV_WHEELS  = cffi==1.15.1
 CROSSENV_WHEELS += cryptography==41.0.3
-CROSSENV_WHEELS += Cython==3.0.2
+# Version >= 3.x breaks PyYAML
+# https://github.com/yaml/pyyaml/issues/601
+#CROSSENV_WHEELS += Cython==3.0.2
+CROSSENV_WHEELS += Cython==0.29.36
 CROSSENV_WHEELS += flit==3.9.0
 CROSSENV_WHEELS += poetry==1.6.1
 CROSSENV_WHEELS += scikit-build==0.17.6
diff --git a/spk/python310/Makefile b/spk/python310/Makefile
index 01052d218e7..1ea00e8265f 100644
--- a/spk/python310/Makefile
+++ b/spk/python310/Makefile
@@ -20,11 +20,15 @@ LICENSE  = PSF
 
 # Force building pure-python wheels
 WHEELS_PURE_PYTHON_PACKAGING_ENABLE = 1
-WHEELS  = src/requirements-pure.txt
+WHEELS = src/requirements-pure.txt
+
 # Force testing all wheel builds
-WHEELS_TEST_ALL = 0
+WHEELS_TEST_ALL = 1
+
 # Force compiler LTO optimizations
+ifeq ($(strip $(WHEELS_TEST_ALL)),0)
 ENV += PYTHON_OPTIMIZE=1
+endif
 
 SERVICE_SETUP = src/service-setup.sh
 
@@ -114,12 +118,10 @@ WHEELS += src/requirements-crossenv-greenlet-v1.txt
 endif
 
 # [numpy] <= 1.21.6 (armv5)
-# gcc-4.6.4 failed with exit status 1
-# https://github.com/numpy/numpy/issues/20664
-ifeq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
-WHEELS += src/requirements-crossenv-numpy-armv5.txt
+# This version is now unsupported using pip>=23.2.1
+ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS)),$(ARCH))
 # [numpy] <= 1.22.4 (armv7l)
-else ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
+ifeq ($(findstring $(ARCH),$(ARMv7L_ARCHS)),$(ARCH))
 WHEELS += src/requirements-crossenv-numpy-armv7l.txt
 else ifeq ($(call version_le, $(TC_GCC), 5.0),1)
 WHEELS += src/requirements-crossenv-numpy-gcc4.txt
@@ -127,6 +129,7 @@ WHEELS += src/requirements-crossenv-numpy-gcc4.txt
 else ifeq ($(call version_gt, $(TC_GCC), 5.0),1)
 WHEELS += src/requirements-crossenv-numpy.txt
 endif
+endif
 # workaround for compiler bug:
 # https://github.com/numpy/numpy/issues/13622
 ifeq ($(call version_le, $(TC_GCC), 5.0),1)
diff --git a/spk/python310/src/requirements-abi3.txt b/spk/python310/src/requirements-abi3.txt
index 18171e5dc1b..be833c19a14 100644
--- a/spk/python310/src/requirements-abi3.txt
+++ b/spk/python310/src/requirements-abi3.txt
@@ -8,5 +8,5 @@
 # Require:
 #    - CFLAGS=-sdt=c99 <  gcc-4.9
 #    - CFLAGS=-sdt=c11 >= gcc-4.9
-pycryptodome==3.18
-pycryptodomex==3.18
+pycryptodome==3.18.0
+pycryptodomex==3.18.0
diff --git a/spk/python310/src/requirements-crossenv-numpy-gcc4.txt b/spk/python310/src/requirements-crossenv-numpy-gcc4.txt
index f73dbffb458..f4cb4bea3c8 100644
--- a/spk/python310/src/requirements-crossenv-numpy-gcc4.txt
+++ b/spk/python310/src/requirements-crossenv-numpy-gcc4.txt
@@ -8,5 +8,4 @@
 #   - Require Cython in cross/python311 crossenv
 #   - aarch64-6.1 require workaround WHEELS_CFLAGS=-O0
 #     ref: https://github.com/numpy/numpy/issues/13622
-numpy==1.23.5
 numpy==1.24.4
diff --git a/spk/python310/src/requirements-crossenv-numpy.txt b/spk/python310/src/requirements-crossenv-numpy.txt
index 38d08ba1f27..39ecab3b7e6 100644
--- a/spk/python310/src/requirements-crossenv-numpy.txt
+++ b/spk/python310/src/requirements-crossenv-numpy.txt
@@ -7,6 +7,4 @@
 # [numpy]
 #   - Require Cython in cross/python310 crossenv
 #   - Numpy 1.25.x require c++17
-numpy==1.23.5
-numpy==1.24.4
-numpy==1.25.0
+numpy==1.25.2
diff --git a/spk/python310/src/requirements-crossenv.txt b/spk/python310/src/requirements-crossenv.txt
index e5b47ea8eb7..01edc7b6fa0 100644
--- a/spk/python310/src/requirements-crossenv.txt
+++ b/spk/python310/src/requirements-crossenv.txt
@@ -38,7 +38,7 @@ zope.interface==6.0
 # Require environment variables
 #  GEVENTSETUP_EMBED_CARES=FALSE
 #  GEVENTSETUP_EMBED_LIBEV=FALSE
-gevent==23.9.0
+gevent==23.7.0
 
 # [lxml]
 # Depends: libxml2, libxslt
diff --git a/spk/python311/Makefile b/spk/python311/Makefile
index 691c1059519..70b17a7f344 100644
--- a/spk/python311/Makefile
+++ b/spk/python311/Makefile
@@ -5,6 +5,10 @@ SPK_REV = 8
 SPK_ICON = src/python3.png
 
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+# Missing libatomic for proper openssl >= 3.x support
+# Ref: https://github.com/SynoCommunity/spksrc/issues/5841
+#      https://github.com/SynoCommunity/spksrc/pull/5820#issuecomment-1678221438
+UNSUPPORTED_ARCHS += $(ARMv5_ARCHS)
 
 DEPENDS  = cross/$(SPK_NAME)
 DEPENDS += cross/pip
@@ -22,11 +26,15 @@ LICENSE  = PSF
 
 # Force building pure-python wheels
 WHEELS_PURE_PYTHON_PACKAGING_ENABLE = 1
-WHEELS  = src/requirements-pure.txt
+WHEELS = src/requirements-pure.txt
+
 # Force testing all wheel builds
-WHEELS_TEST_ALL = 0
+WHEELS_TEST_ALL = 1
+
 # Force compiler LTO optimizations
+ifeq ($(strip $(WHEELS_TEST_ALL)),0)
 ENV += PYTHON_OPTIMIZE=1
+endif
 
 SERVICE_SETUP = src/service-setup.sh
 
diff --git a/spk/python311/src/requirements-abi3.txt b/spk/python311/src/requirements-abi3.txt
index 18171e5dc1b..be833c19a14 100644
--- a/spk/python311/src/requirements-abi3.txt
+++ b/spk/python311/src/requirements-abi3.txt
@@ -8,5 +8,5 @@
 # Require:
 #    - CFLAGS=-sdt=c99 <  gcc-4.9
 #    - CFLAGS=-sdt=c11 >= gcc-4.9
-pycryptodome==3.18
-pycryptodomex==3.18
+pycryptodome==3.18.0
+pycryptodomex==3.18.0
diff --git a/spk/python311/src/requirements-crossenv-numpy.txt b/spk/python311/src/requirements-crossenv-numpy.txt
index 506858be48a..39ecab3b7e6 100644
--- a/spk/python311/src/requirements-crossenv-numpy.txt
+++ b/spk/python311/src/requirements-crossenv-numpy.txt
@@ -7,4 +7,4 @@
 # [numpy]
 #   - Require Cython in cross/python310 crossenv
 #   - Numpy 1.25.x require c++17
-numpy==1.25.1
+numpy==1.25.2
diff --git a/spk/python311/src/requirements-crossenv-rpds-py.txt b/spk/python311/src/requirements-crossenv-rpds-py.txt
index 08524639538..a1f828d76e9 100644
--- a/spk/python311/src/requirements-crossenv-rpds-py.txt
+++ b/spk/python311/src/requirements-crossenv-rpds-py.txt
@@ -10,4 +10,4 @@
 #  PYO3_CROSS_INCLUDE_DIR=$(STAGING_INSTALL_PREFIX)/include/
 # Requires path to maturin from crossenv
 #  ENV += PATH=$(WORK_DIR)/crossenv/build/bin:$(PATH)
-rpds-py==0.9.2
+rpds-py==0.10.0
diff --git a/spk/python311/src/requirements-crossenv.txt b/spk/python311/src/requirements-crossenv.txt
index 48f3e1d53d0..c73dcba588e 100644
--- a/spk/python311/src/requirements-crossenv.txt
+++ b/spk/python311/src/requirements-crossenv.txt
@@ -38,7 +38,7 @@ zope.interface==6.0
 # Require environment variables
 #  GEVENTSETUP_EMBED_CARES=FALSE
 #  GEVENTSETUP_EMBED_LIBEV=FALSE
-gevent==23.9.0
+gevent==23.7.0
 
 # [lxml]
 # Depends: libxml2, libxslt

From 49944c3be4b3f11f02044df869f44af35d6711fd Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 02:07:09 +0000
Subject: [PATCH 04/27] py311-310: Disable building all wheels as successful

---
 cross/python310/Makefile | 7 ++++++-
 cross/python311/Makefile | 7 ++++++-
 spk/python310/Makefile   | 2 +-
 spk/python311/Makefile   | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/cross/python310/Makefile b/cross/python310/Makefile
index 0c701b98ca8..8aaa979c9b6 100644
--- a/cross/python310/Makefile
+++ b/cross/python310/Makefile
@@ -136,8 +136,13 @@ python310_install:
 CROSSENV_WHEELS  = setuptools-rust==1.7.0
 CROSSENV_WHEELS += setuptools-scm==7.1.0
 CROSSENV_WHEELS += cffi==1.15.1
-# Version >= 3.x breaks PyYAML
+#
+# Cython version >= 3.x breaks PyYAML wheel
 # https://github.com/yaml/pyyaml/issues/601
+#
+# It also breaks numpy at crossenv creation time using github-action
+# https://numpy.org/devdocs/reference/distutils_status_migration.html
+# Python 3.12 considerations: scikit-build-core, meson-python
 #CROSSENV_WHEELS += Cython==3.0.2
 CROSSENV_WHEELS += Cython==0.29.36
 CROSSENV_WHEELS += flit==3.9.0
diff --git a/cross/python311/Makefile b/cross/python311/Makefile
index 42c119d4495..797d6dbc4de 100644
--- a/cross/python311/Makefile
+++ b/cross/python311/Makefile
@@ -131,8 +131,13 @@ python311_install:
 # default wheels to install in crossenv
 CROSSENV_WHEELS  = cffi==1.15.1
 CROSSENV_WHEELS += cryptography==41.0.3
-# Version >= 3.x breaks PyYAML
+#
+# Cython version >= 3.x breaks PyYAML wheel
 # https://github.com/yaml/pyyaml/issues/601
+#
+# It also breaks numpy at crossenv creation time using github-action
+# https://numpy.org/devdocs/reference/distutils_status_migration.html
+# Python 3.12 considerations: scikit-build-core, meson-python
 #CROSSENV_WHEELS += Cython==3.0.2
 CROSSENV_WHEELS += Cython==0.29.36
 CROSSENV_WHEELS += flit==3.9.0
diff --git a/spk/python310/Makefile b/spk/python310/Makefile
index 1ea00e8265f..8730b532a21 100644
--- a/spk/python310/Makefile
+++ b/spk/python310/Makefile
@@ -23,7 +23,7 @@ WHEELS_PURE_PYTHON_PACKAGING_ENABLE = 1
 WHEELS = src/requirements-pure.txt
 
 # Force testing all wheel builds
-WHEELS_TEST_ALL = 1
+WHEELS_TEST_ALL = 0
 
 # Force compiler LTO optimizations
 ifeq ($(strip $(WHEELS_TEST_ALL)),0)
diff --git a/spk/python311/Makefile b/spk/python311/Makefile
index 70b17a7f344..39f755792d3 100644
--- a/spk/python311/Makefile
+++ b/spk/python311/Makefile
@@ -29,7 +29,7 @@ WHEELS_PURE_PYTHON_PACKAGING_ENABLE = 1
 WHEELS = src/requirements-pure.txt
 
 # Force testing all wheel builds
-WHEELS_TEST_ALL = 1
+WHEELS_TEST_ALL = 0
 
 # Force compiler LTO optimizations
 ifeq ($(strip $(WHEELS_TEST_ALL)),0)

From e52bdd6932b1c26094b7b97a3fdf79900a0ebac9 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 11:29:04 +0000
Subject: [PATCH 05/27] python.mk: Ensure cross/* wheels are being re-processed

---
 mk/spksrc.python.mk | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/mk/spksrc.python.mk b/mk/spksrc.python.mk
index da9bce6196b..14cb2ee0369 100644
--- a/mk/spksrc.python.mk
+++ b/mk/spksrc.python.mk
@@ -56,6 +56,17 @@ python_pre_depend:
 	@ln -sf $(PYTHON_PACKAGE_ROOT)/crossenv $(WORK_DIR)/crossenv
 	@ln -sf $(PYTHON_PACKAGE_ROOT)/python-cc.mk $(WORK_DIR)/python-cc.mk
 	@$(foreach _done,$(PYTHON_DEPENDS), ln -sf $(_done) $(WORK_DIR) ;)
-	# EXCEPTIONS: Ensure zlib,bzip2 is always built locally
+	# EXCEPTION: Ensure zlib,bzip2 is always built locally
 	@rm -f $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/zlib.pc $(WORK_DIR)/.zlib*
 	@rm -f $(WORK_DIR)/.bzip2*
+	# EXCEPTION: Do not symlink cross/* wheel builds
+	@make --no-print-directory dependency-flat | sort -u | grep -v spk/ | while read depend ; do \
+	   makefile="../../$${depend}/Makefile" ; \
+	   if grep -q spksrc.python-wheel.mk $${makefile} ; then \
+	      pkgstr=$$(grep ^PKG_NAME $${makefile}) ; \
+	      pkgname=$$(echo $${pkgstr#*=} | xargs) ; \
+	      echo "rm -fr work-*/$${pkgname}*\\n       work-*/.$${pkgname}-*" ; \
+	      rm -fr work-*/$${pkgname}* \
+                     work-*/.$${pkgname}-* ; \
+	   fi ; \
+	done

From 23e033e9163868b3a0d2eeb7816f7321b3787916 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 11:31:57 +0000
Subject: [PATCH 06/27] homeassistant: Mark as broken until @hgy59 complete PR
 #5857

---
 spk/homeassistant/BROKEN | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 spk/homeassistant/BROKEN

diff --git a/spk/homeassistant/BROKEN b/spk/homeassistant/BROKEN
new file mode 100644
index 00000000000..bc8e698d8c6
--- /dev/null
+++ b/spk/homeassistant/BROKEN
@@ -0,0 +1 @@
+Migration in progress by @hgy59 PR #5857

From 123471050925abf2efdbe5a1025569523e8b777f Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 11:32:30 +0000
Subject: [PATCH 07/27] python38: Remove as deprecated in favor of python
 3.10-3.11

---
 spk/python38/Makefile                      |  47 ---------------------
 spk/python38/PLIST                         |   1 -
 spk/python38/src/python3.png               | Bin 7862 -> 0 bytes
 spk/python38/src/requirements-crossenv.txt |  29 -------------
 spk/python38/src/requirements-pure.txt     |   8 ----
 spk/python38/src/service-setup.sh          |  21 ---------
 6 files changed, 106 deletions(-)
 delete mode 100644 spk/python38/Makefile
 delete mode 100644 spk/python38/PLIST
 delete mode 100644 spk/python38/src/python3.png
 delete mode 100644 spk/python38/src/requirements-crossenv.txt
 delete mode 100644 spk/python38/src/requirements-pure.txt
 delete mode 100644 spk/python38/src/service-setup.sh

diff --git a/spk/python38/Makefile b/spk/python38/Makefile
deleted file mode 100644
index b6b92dc67b4..00000000000
--- a/spk/python38/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-SPK_NAME = python38
-SPK_VERS = 3.8.16
-SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
-SPK_REV = 8
-SPK_ICON = src/python3.png
-
-DEPENDS  = cross/$(SPK_NAME)
-DEPENDS += cross/setuptools cross/pip cross/wheel
-# Cross-compiled wheels
-DEPENDS += cross/bcrypt cross/cffi
-DEPENDS += cross/cryptography-legacy cross/greenlet cross/immutables
-DEPENDS += cross/lxml cross/msgpack-python
-DEPENDS += cross/pycrypto cross/pycurl
-DEPENDS += cross/pyyaml cross/ruamel.yaml cross/sqlite
-
-WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt
-
-MAINTAINER = SynoCommunity
-DESCRIPTION = Python Programming Language.
-DESCRIPTION_FRE = Language de programmation Python.
-DESCRIPTION_SPN = Lenguaje de programación Python.
-STARTABLE = no
-DISPLAY_NAME = Python 3.8
-CHANGELOG = "1. Update to Python 3.8.16<br/>2. Update to OpenSSL 1.1.1t"
-
-HOMEPAGE = https://www.python.org
-LICENSE  = PSF
-
-SERVICE_SETUP = src/service-setup.sh
-
-ENV += PYTHON_OPTIMIZE=1
-
-PYTHON_LIB_DIR = lib/python$(SPK_VERS_MAJOR_MINOR)
-
-POST_STRIP_TARGET = python38_extra_install
-
-include ../../mk/spksrc.spk.mk
-
-.PHONY: python38_extra_install
-python38_extra_install:
-	@$(MSG) - Remove static libpython
-	rm -f $(STAGING_DIR)/$(PYTHON_LIB_DIR)/config-$(SPK_VERS_MAJOR_MINOR)-*/libpython$(SPK_VERS_MAJOR_MINOR).a
-	rm -f $(STAGING_DIR)/$(PYTHON_LIB_DIR)/config-$(SPK_VERS_MAJOR_MINOR)-*/python.o
-	@$(MSG) - Remove test folder
-	rm -rf $(STAGING_DIR)/$(PYTHON_LIB_DIR)/test/
-	@$(MSG) - Remove compiled files from __pycache__
-	find $(STAGING_DIR)/$(PYTHON_LIB_DIR) -type f -regex '.*\.py[co]' -delete
diff --git a/spk/python38/PLIST b/spk/python38/PLIST
deleted file mode 100644
index 4cfaf73a12c..00000000000
--- a/spk/python38/PLIST
+++ /dev/null
@@ -1 +0,0 @@
-rsc:share/wheelhouse
diff --git a/spk/python38/src/python3.png b/spk/python38/src/python3.png
deleted file mode 100644
index 7c9cb8f7d1612fc23aeaf4fdfcad5e578d68ddaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7862
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
U*;Wn{=Kufz07*qoM6N<$f&yXEZU6uP

diff --git a/spk/python38/src/requirements-crossenv.txt b/spk/python38/src/requirements-crossenv.txt
deleted file mode 100644
index f87e67999cc..00000000000
--- a/spk/python38/src/requirements-crossenv.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-## default
-appdirs==1.4.4
-distlib==0.3.3
-markupsafe==2.0.1
-poetry==1.1.13
-psutil==5.8.0
-pyopenssl==21.0.0
-six==1.16.0
-sqlalchemy==1.4.26
-zope.interface==5.4.0
-
-# cryptography dependencies
-idna==3.3
-ipaddress==1.0.23
-
-## Modules cross-compiled via spksrc.python-wheel.mk
-# Included for reference
-#lxml==4.6.3
-#pycrypto==2.6.1
-#Pillow==8.2.0
-#pycurl==7.43.0.6
-#pyyaml==5.4.1
-#immutables==0.16
-
-# cryptography dependencies
-pyasn1==0.4.8
-
-# pillow dependencies
-olefile==0.46
diff --git a/spk/python38/src/requirements-pure.txt b/spk/python38/src/requirements-pure.txt
deleted file mode 100644
index c7ed16cf732..00000000000
--- a/spk/python38/src/requirements-pure.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# Wheels that absolutely needs
-# to be managed as pure-python
-filelock==3.3.1
-importlib-resources==5.2.2
-importlib-metadata==4.8.1
-platformdirs==2.4.0
-virtualenv==20.4.6
-zipp==3.6.0
diff --git a/spk/python38/src/service-setup.sh b/spk/python38/src/service-setup.sh
deleted file mode 100644
index 918029a3f43..00000000000
--- a/spk/python38/src/service-setup.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-
-PATH="${SYNOPKG_PKGDEST}/bin:$PATH"
-
-service_postinst ()
-{
-    # Install the wheels
-    wheelhouse=${SYNOPKG_PKGDEST}/share/wheelhouse
-    ${SYNOPKG_PKGDEST}/bin/pip install --no-deps --force-reinstall --no-index --find-links ${wheelhouse} ${wheelhouse}/*.whl
-
-    # Log installation informations
-    echo "Installed version: $( ${SYNOPKG_PKGDEST}/bin/python3 --version 2>&1 )"
-    
-    echo "Installed modules:"
-    ${SYNOPKG_PKGDEST}/bin/pip freeze
-
-    # Byte-compile in background
-    PYTHON_SHORT_VER=$(${SYNOPKG_PKGDEST}/bin/python3 -c 'import sys; print("{0}.{1}".format(*sys.version_info[:2]))')
-    ${SYNOPKG_PKGDEST}/bin/python3 -m compileall -q -f ${SYNOPKG_PKGDEST}/lib/python${PYTHON_SHORT_VER} </dev/null &>/dev/null &
-    ${SYNOPKG_PKGDEST}/bin/python3 -OO -m compileall -q -f ${SYNOPKG_PKGDEST}/lib/python${PYTHON_SHORT_VER} </dev/null &>/dev/null &
-}
-

From 05cefdfe7e327dbcaf8d04206c54f19d79043b95 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 11:39:48 +0000
Subject: [PATCH 08/27] cryptography: Mark armv5 as unsupported due to lack of
 libatomic

---
 cross/cryptography/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cross/cryptography/Makefile b/cross/cryptography/Makefile
index f87252594f6..20053bbbc57 100644
--- a/cross/cryptography/Makefile
+++ b/cross/cryptography/Makefile
@@ -11,6 +11,10 @@ HOMEPAGE = https://github.com/pyca/cryptography
 COMMENT  = Provide cryptographic recipes and primitives to Python developers
 LICENSE  = BSD/ASL2
 
+# Unsupported due to lack of libatomic
+# being mandatory with OpenSSL >= 3.x
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS)
+
 ###
 ### This cross/cryptography is needed to generate python-limited abi3 wheels
 ### Ref: https://github.com/pyca/cryptography/issues/7671

From a683c6cf476acbab1bef1b9753f731eeaf70ad5f Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 11:59:09 +0000
Subject: [PATCH 09/27] bazarr: Mark ARMv7L as now unsupported with py311 due
 to numpy

---
 spk/bazarr/Makefile                                   | 10 +++++-----
 spk/bazarr/src/requirements-crossenv-numpy-armv7l.txt | 10 ----------
 2 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 spk/bazarr/src/requirements-crossenv-numpy-armv7l.txt

diff --git a/spk/bazarr/Makefile b/spk/bazarr/Makefile
index ab29eb65899..d8aba43fc99 100644
--- a/spk/bazarr/Makefile
+++ b/spk/bazarr/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = bazarr
 SPK_VERS = 1.2.4
-SPK_REV = 10
+SPK_REV = 11
 SPK_ICON = src/bazarr.png
 
 PYTHON_PACKAGE = python311
@@ -28,15 +28,15 @@ WHEELS_BUILD_ARGS += --enable-zlib
 MAINTAINER = smaarn
 DESCRIPTION = "Bazarr is a companion application to Sonarr and Radarr. It manages and downloads subtitles based on your requirements. You define your preferences by TV show or movies and Bazarr takes care of everything for you."
 DISPLAY_NAME = Bazarr
-CHANGELOG = "Update to version 1.2.4. <br />See corresponding changelogs <a href=\"https://github.com/morpheus65535/bazarr/releases/tag/v1.2.1\">here</a> and <a href=\"https://github.com/morpheus65535/bazarr/releases/tag/v1.2.4\">here</a> for more details.<br/>Migrate to python 3.11"
+CHANGELOG = "Update to version 1.2.4<br/>2. Migrate to python 3.11<br/>3. Mark ARMv7L as unsupported<br/>See corresponding changelogs <a href=\"https://github.com/morpheus65535/bazarr/releases/tag/v1.2.1\">here</a> and <a href=\"https://github.com/morpheus65535/bazarr/releases/tag/v1.2.4\">here</a> for more details"
 
 HOMEPAGE  = https://www.bazarr.media/
 LICENSE   = GPL-3.0 license
 STARTABLE = yes
 
-# [numpy] <= 1.21.6 (armv5)
-# This version is now unsupported using py311
-UNSUPPORTED_ARCHS = $(ARMv5_ARCHS)
+# [numpy] <= 1.21.6 (armv5)  - gcc-4.6.4 - unsupported
+# [numpy] <= 1.22.4 (armv7l) - gcc-4.8.3 - unsupported
+UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(ARMv7L_ARCHS)
 
 HOMEPAGE = https://www.bazarr.media
 LICENSE = GPLv3
diff --git a/spk/bazarr/src/requirements-crossenv-numpy-armv7l.txt b/spk/bazarr/src/requirements-crossenv-numpy-armv7l.txt
deleted file mode 100644
index d794fd86565..00000000000
--- a/spk/bazarr/src/requirements-crossenv-numpy-armv7l.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-##
-## All configurations below are optional and
-## are provided to demonstrate how to build
-## various wheels.  Uncoment to enable.
-##
-
-# [numpy]
-#   - armv7L (hi3535-6.1) Last known working version
-#   - Require Cython in cross/python311 crossenv
-numpy==1.22.4

From ae7c2b920e6c2c434615c92c986eb48ba43acab7 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 12:08:23 +0000
Subject: [PATCH 10/27] sabnzbd: Bump package to enforce using newer python

---
 spk/sabnzbd/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spk/sabnzbd/Makefile b/spk/sabnzbd/Makefile
index ae165b7dba6..59e04fe8131 100644
--- a/spk/sabnzbd/Makefile
+++ b/spk/sabnzbd/Makefile
@@ -1,11 +1,11 @@
 SPK_NAME = sabnzbd
 SPK_VERS = 4.0.3
-SPK_REV = 64
+SPK_REV = 65
 SPK_ICON = src/sabnzbd.png
 
 PYTHON_PACKAGE = python311
 DEPENDS = cross/busybox cross/par2cmdline cross/unrar cross/p7zip cross/$(SPK_NAME)
-SPK_DEPENDS = "python311>=3.11.4-7"
+SPK_DEPENDS = "python311>=3.11.5-8"
 
 WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt
 
@@ -15,7 +15,7 @@ DESCRIPTION_FRE = SABnzbd rend Usenet aussi simple et automatisé que possible.
 DESCRIPTION_SPN = SABnzbd hace que Usenet sea lo más simple posible, automatizando todo lo que se puede. Todo lo que tienes que hacer es agregar un archivo .nzb. SABnzbd empieza desde ahí. Tus archivos serán automáticamente descargados, verificados, reparados, descomprimidos y archivados.
 DISPLAY_NAME = SABnzbd
 STARTABLE = yes
-CHANGELOG = "Update SABnzbd to 4.0.3<br/>Update to OpenSSL 3.1.2"
+CHANGELOG = "1. Update SABnzbd to 4.0.3<br/>2. Update to OpenSSL 3.1.2<br/>3. Fix for newer shared python"
 
 HOMEPAGE  = https://sabnzbd.org
 LICENSE   = GPL

From bdc0574ac192c90f626de86a5983cb5d71d33492 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 12:08:42 +0000
Subject: [PATCH 11/27] sickchill: Bump package to enforce using newer python

---
 spk/sickchill/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spk/sickchill/Makefile b/spk/sickchill/Makefile
index 444c182ba6c..df63b8dd6b8 100644
--- a/spk/sickchill/Makefile
+++ b/spk/sickchill/Makefile
@@ -1,11 +1,11 @@
 SPK_NAME = sickchill
 SPK_VERS = 20230627
-SPK_REV = 9
+SPK_REV = 10
 SPK_ICON = src/sickchill.png
 
 PYTHON_PACKAGE = python311
 
-SPK_DEPENDS = "python311>=3.11.4-7"
+SPK_DEPENDS = "python311>=3.11.5-8"
 
 # archs without C++11 support are not supported:
 UNSUPPORTED_ARCHS = $(ARMv5_ARCHS) $(OLD_PPC_ARCHS)
@@ -35,7 +35,7 @@ MAINTAINER = miigotu
 DESCRIPTION = Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic.
 STARTABLE = yes
 DISPLAY_NAME = SickChill
-CHANGELOG = "1. A wheel based install, git installs are not supported by upstream.<br/>2. Python update to 3.11<br/>3. Deprecated ARMv5 (88f628x) as no compiler support for updated dependencies<br/>4. Migrate to OpenSSL 3.1.2"
+CHANGELOG = "1. A wheel based install, git installs are not supported by upstream.<br/>2. Python update to 3.11<br/>3. Deprecated ARMv5 (88f628x) as no compiler support for updated dependencies<br/>4. Migrate to OpenSSL 3.1.2<br/>5. Fix for newer shared python"
 
 HOMEPAGE   = https://sickchill.github.io/
 LICENSE    = GPLv3+

From 2c8cbdf7443046805bfcbd98a903c61ddb56d0a5 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 12:11:11 +0000
Subject: [PATCH 12/27] deluge: Bump package to enforce using newer python

---
 spk/deluge/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spk/deluge/Makefile b/spk/deluge/Makefile
index 436e21df1e2..99f69addc47 100644
--- a/spk/deluge/Makefile
+++ b/spk/deluge/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = deluge
 SPK_VERS = 2.1.1.61
-SPK_REV = 22
+SPK_REV = 23
 SPK_ICON = src/deluge.png
 
 PYTHON_PACKAGE = python311
@@ -9,13 +9,13 @@ WHEELS  = src/requirements-crossenv.txt
 WHEELS += src/requirements-pure.txt
 WHEELS += src/requirements-abi3.txt
 
-SPK_DEPENDS = "python311>=3.11.4-7"
+SPK_DEPENDS = "python311>=3.11.5-8"
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Deluge is a cross platform BitTorrent client, based on libtorrent rasterbar. This package integrates both the deluge deamon \(deluged\), as well as its web counterpart \(deluge-web\), which serves the deluge web UI.
 DESCRIPTION_FRE = Deluge est un client BitTorrent multi-plateforme, basé sur libtorrent rasterbar. Ce paquet intègre à la fois le démon deluge \(deluged\) ainsi que son penchant web \(deluge-web\), desservant l\'interface utilisateur web deluge.
 STARTABLE = yes
-CHANGELOG = "1. Update to latest github development commit<br/>2. Update to libtorrent 2.0.9<br/>3. Update to OpenSSL 3.1.2"
+CHANGELOG = "1. Update to latest github development commit<br/>2. Update to libtorrent 2.0.9<br/>3. Update to OpenSSL 3.1.2<br/>4. Fix for newer shared python"
 DISPLAY_NAME = Deluge
 
 HOMEPAGE = https://deluge-torrent.org

From 2ecc100c3e001549430a045b7320fd549df69764 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 12:22:45 +0000
Subject: [PATCH 13/27] python311: Mark ARMv5 as unsupported directly within
 cross

---
 cross/python311/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cross/python311/Makefile b/cross/python311/Makefile
index 797d6dbc4de..cd7afe6f3fa 100644
--- a/cross/python311/Makefile
+++ b/cross/python311/Makefile
@@ -9,6 +9,10 @@ PKG_DIR = Python-$(PKG_VERS)
 # Platform "powerpc-none-linux-gnuspe" with compiler "gcc" is not supported by the
 # CPython core team, see https://peps.python.org/pep-0011/ for more information.
 UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS)
+# Missing libatomic for proper openssl >= 3.x support
+# Ref: https://github.com/SynoCommunity/spksrc/issues/5841
+#      https://github.com/SynoCommunity/spksrc/pull/5820#issuecomment-1678221438
+UNSUPPORTED_ARCHS += $(ARMv5_ARCHS)
 
 BUILD_DEPENDS = native/$(PKG_NAME)
 

From e9ebc248af41cd5f7904aefc6ce9261ddce391f1 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 13:36:35 +0000
Subject: [PATCH 14/27] python311: Revert setuptools ver for numpy 1.23 in
 homeassistant

---
 cross/python311/Makefile | 7 +++++--
 spk/homeassistant/BROKEN | 1 -
 2 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 spk/homeassistant/BROKEN

diff --git a/cross/python311/Makefile b/cross/python311/Makefile
index cd7afe6f3fa..cf89c24872c 100644
--- a/cross/python311/Makefile
+++ b/cross/python311/Makefile
@@ -149,6 +149,9 @@ CROSSENV_WHEELS += poetry==1.6.1
 CROSSENV_WHEELS += scikit-build==0.17.6
 CROSSENV_WHEELS += setuptools-rust==1.7.0
 CROSSENV_WHEELS += setuptools-scm==7.1.0
+# For future usages when building numpy >= 1.26
+#CROSSENV_WHEELS += meson-python==0.13.2
+#CROSSENV_WHEELS += scikit-build-core==0.5.0
 
 # [numpy] <= 1.21.6 (armv5)  - gcc-4.6.4 - unsupported
 # [numpy] <= 1.22.4 (armv7l) - gcc-4.8.3 - unsupported
@@ -177,8 +180,8 @@ python311_post_install: $(WORK_DIR)/python-cc.mk
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) wget https://bootstrap.pypa.io/get-pip.py
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==23.2.1" --no-setuptools --no-wheel --disable-pip-version-check
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==23.2.1" --no-setuptools --no-wheel --disable-pip-version-check
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==68.1.2" "wheel==0.41.2"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==68.1.2" "wheel==0.41.2"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==63.4.3" "wheel==0.41.2"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==63.4.3" "wheel==0.41.2"
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install $(CROSSENV_WHEELS)
 	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install $(CROSSENV_WHEELS)
 ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS))
diff --git a/spk/homeassistant/BROKEN b/spk/homeassistant/BROKEN
deleted file mode 100644
index bc8e698d8c6..00000000000
--- a/spk/homeassistant/BROKEN
+++ /dev/null
@@ -1 +0,0 @@
-Migration in progress by @hgy59 PR #5857

From 403aa94c2cf4124d332fc997301e132124d7cb7d Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 13:38:19 +0000
Subject: [PATCH 15/27] spk.mk: Differenciate pythonclean vs pythoncleanall

pythonclean: will cleanup the crossenv directory
pythoncleanall: will cleanup all python build files
---
 mk/spksrc.spk.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mk/spksrc.spk.mk b/mk/spksrc.spk.mk
index 2aea690271b..ae841adcf11 100644
--- a/mk/spksrc.spk.mk
+++ b/mk/spksrc.spk.mk
@@ -531,9 +531,12 @@ wheelcleanall: wheelcleancache
 	rm -fr ../../distrib/pip
 
 pythonclean: wheelcleanall
-	rm -fr work-*/[Pp]ython* work-*/.python* \
+	rm -fr work-*/.[Pp]ython*-install_done \
 	rm -fr work-*/crossenv
 
+pythoncleanall: pythonclean
+	rm -fr work-*/[Pp]ython* work-*/.python*
+
 all: package
 ifneq ($(filter 1 on ON,$(PSTAT)),)
 	@$(MSG) MAKELEVEL: $(MAKELEVEL), PARALLEL_MAKE: $(PARALLEL_MAKE), ARCH: $(ARCH)-$(TCVERSION) >> $(PSTAT_LOG)

From 19707d029f7a5b37c829efaf9fae5b07b25a8459 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 13:47:42 +0000
Subject: [PATCH 16/27] beets, borgbackup, mercurial, octoprint, rdiff-backup:
 ARMv5 removed

---
 spk/beets/Makefile        |  5 +++--
 spk/borgbackup/Makefile   |  5 +++--
 spk/mercurial/Makefile    |  5 +++--
 spk/octoprint/Makefile    | 10 +++++-----
 spk/rdiff-backup/Makefile |  5 +++--
 5 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/spk/beets/Makefile b/spk/beets/Makefile
index 670e941782c..6a5a355cb40 100644
--- a/spk/beets/Makefile
+++ b/spk/beets/Makefile
@@ -4,9 +4,10 @@ SPK_REV = 9
 SPK_ICON = src/beets.png
 
 PYTHON_PACKAGE = python311
+SPK_DEPENDS = "python311>=3.11.5-8"
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
 
 WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt
-SPK_DEPENDS = "python311>=3.11.4-7"
 
 # [lxml]
 DEPENDS += cross/libxml2
@@ -28,7 +29,7 @@ MAINTAINER = ymartin59
 DESCRIPTION = "Beets is the media library management system for obsessive-compulsive music geeks. The purpose of beets is to get your music collection right once and for all. It catalogs your collection, automatically improving its metadata as it goes. It then provides a bouquet of tools for manipulating and accessing your music. Plugins not available due to lacking dependencies: AcousticBrainz Submit, Gmusic, ReplayGain."
 DISPLAY_NAME = beets
 
-CHANGELOG = "1. Migrate to python 3.11<br/>2. Update to all wheels"
+CHANGELOG = "1. Migrate to python 3.11<br/>2. Update to all wheels<br/>3. Mark ARMv5 as unsupported"
 
 HOMEPAGE = http://beets.io/
 LICENSE  = GPL
diff --git a/spk/borgbackup/Makefile b/spk/borgbackup/Makefile
index 52a8d11e88b..961369a5f7e 100644
--- a/spk/borgbackup/Makefile
+++ b/spk/borgbackup/Makefile
@@ -4,7 +4,8 @@ SPK_REV = 14
 SPK_ICON = src/$(SPK_NAME).png
 
 PYTHON_PACKAGE = python311
-SPK_DEPENDS = "python311>=3.11.4-7"
+SPK_DEPENDS = "python311>=3.11.5-8"
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
 
 DEPENDS = cross/attr cross/acl cross/openssl3 cross/lz4 cross/zstd cross/libb2 cross/fuse
 
@@ -29,7 +30,7 @@ DESCRIPTION = Deduplicating backup program with compression and authenticated en
 
 DISPLAY_NAME = Borg
 STARTABLE = no
-CHANGELOG = "1. Update borg to v1.2.4<br/>2. Update borgmatic to v1.8.0.<br/>3. Update emborg to v1.37.<br/>Migrate to python 3.11"
+CHANGELOG = "1. Update borg to v1.2.4<br/>2. Update borgmatic to v1.8.0.<br/>3. Update emborg to v1.37.<br/>4. Migrate to python 3.11<br/>5. Mark ARMv5 as unsupported"
 
 HOMEPAGE = https://borgbackup.readthedocs.io
 LICENSE  = 3-Clause BSD
diff --git a/spk/mercurial/Makefile b/spk/mercurial/Makefile
index cb14736bbd8..74a508945c4 100644
--- a/spk/mercurial/Makefile
+++ b/spk/mercurial/Makefile
@@ -4,15 +4,16 @@ SPK_REV = 9
 SPK_ICON = src/mercurial.png
 
 PYTHON_PACKAGE = python311
+SPK_DEPENDS = "python311>=3.11.5-8"
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
 
 WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt
-SPK_DEPENDS = "$(PYTHON_PACKAGE)>=3.11.4-7"
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Mercurial is a free, distributed source control management tool
 STARTABLE = no
 DISPLAY_NAME = Mercurial
-CHANGELOG = "1. Update mercurial to 6.5<br/>2. Update to Python 3.11"
+CHANGELOG = "1. Update mercurial to 6.5<br/>2. Update to Python 3.11<br/>3. Mark ARMv5 as unsupported"
 
 HOMEPAGE = https://www.mercurial-scm.org/
 LICENSE  = MPL1.1
diff --git a/spk/octoprint/Makefile b/spk/octoprint/Makefile
index 69eedde6812..07954097b68 100644
--- a/spk/octoprint/Makefile
+++ b/spk/octoprint/Makefile
@@ -5,13 +5,13 @@ SPK_ICON   = src/octoprint.png
 DSM_UI_DIR = app
 
 PYTHON_PACKAGE = python311
-
-# Required for PyYAML
-DEPENDS += cross/libyaml
+SPK_DEPENDS = "python311>=3.11.5-8"
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
 
 WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt
 
-SPK_DEPENDS = "$(PYTHON_PACKAGE)>=3.11.4-7"
+# Required for PyYAML
+DEPENDS += cross/libyaml
 
 MAINTAINER   = SynoCommunity
 DESCRIPTION  = The snappy web interface for your 3D printer.
@@ -21,7 +21,7 @@ ADMIN_PORT   = $(SERVICE_PORT)
 DISPLAY_NAME = OctoPrint
 HOMEPAGE     = https://octoprint.org/
 LICENSE      = AGPLv3
-CHANGELOG    = "Update OctoPrint to v1.9.2 and Python dependency to 3.11."
+CHANGELOG    = "1. Update OctoPrint to v1.9.2<br/>2. Python dependency to 3.11<br/>3. Mark ARMv5 as unsupported"
 
 # SERVICE_COMMAND is in src/service-setup.sh
 STARTABLE     = yes
diff --git a/spk/rdiff-backup/Makefile b/spk/rdiff-backup/Makefile
index 7bc7f5c5407..af68edf11a3 100644
--- a/spk/rdiff-backup/Makefile
+++ b/spk/rdiff-backup/Makefile
@@ -4,9 +4,10 @@ SPK_REV = 5
 SPK_ICON = src/rdiff-backup.png
 
 PYTHON_PACKAGE = python311
+SPK_DEPENDS = "python311>=3.11.5-8"
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
 
 WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt
-SPK_DEPENDS = "python311>=3.11.4-7"
 
 DEPENDS = cross/librsync cross/attr cross/acl
 
@@ -17,7 +18,7 @@ MAINTAINER = SynoCommunity
 DESCRIPTION = Reverse differential backup tool, over a network or locally.
 STARTABLE = no
 DISPLAY_NAME = rdiff-backup
-CHANGELOG = "1. Update to v2.2.5<br/>2. Migrate to Python 3.11"
+CHANGELOG = "1. Update to v2.2.5<br/>2. Migrate to Python 3.11<br/>3. Mark ARMv5 as unsupported"
 
 HOMEPAGE = https://rdiff-backup.net/
 LICENSE  = GPLv2

From 80772d04e90d10fb3cccd8c95255c4bd8c08a5ac Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Sun, 3 Sep 2023 20:27:52 +0000
Subject: [PATCH 17/27] python.mk: Fix issue with znc

---
 cross/znc/Makefile  |  3 +--
 mk/spksrc.python.mk | 24 +++++++++++++++++++-----
 spk/znc/Makefile    |  4 ++--
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/cross/znc/Makefile b/cross/znc/Makefile
index 7a5203f3ea5..acca2734fcf 100644
--- a/cross/znc/Makefile
+++ b/cross/znc/Makefile
@@ -38,7 +38,6 @@ PLIST_TRANSFORM = sed -e '/:lib\/znc\/push.so/d'
 endif
 EXTRA_MODULES += clientbuffer.cpp
 
-
 # The following extra modules are stored in cross/znc/modules and are built via the znc-buildmod command.
 # Adapt as needed (-O is used to overwrite existing files, and to rename to *.cpp where needed).
 # call "make znc_update_modules" in cross/znc folder to get the latest versions.
@@ -58,5 +57,5 @@ znc_post_install:
 	@chmod +x $(WORK_DIR)/$(PKG_DIR)/znc-buildmod
 	@rm -fr $(WORK_DIR)/modules
 	@cp -R modules $(WORK_DIR)/
-	@cd $(WORK_DIR)/modules && PATH=$(WORK_DIR)/$(PKG_DIR) INCLUDES="-I$(STAGING_INSTALL_PREFIX)/include/znc -I$(OPENSSL_STAGING_PREFIX)/include" prefix=$(STAGING_INSTALL_PREFIX) znc-buildmod $(EXTRA_MODULES)
+	@cd $(WORK_DIR)/modules && PATH=$(WORK_DIR)/$(PKG_DIR) prefix=$(STAGING_INSTALL_PREFIX) znc-buildmod $(EXTRA_MODULES)
 	@install -m 644 $(WORK_DIR)/modules/*.so $(STAGING_INSTALL_PREFIX)/lib/znc/
diff --git a/mk/spksrc.python.mk b/mk/spksrc.python.mk
index 14cb2ee0369..ffaab9dfa27 100644
--- a/mk/spksrc.python.mk
+++ b/mk/spksrc.python.mk
@@ -9,19 +9,33 @@ PYTHON_PACKAGE_ROOT = $(realpath $(shell pwd)/../$(PYTHON_PACKAGE)/work-$(ARCH)-
 
 ifneq ($(wildcard $(PYTHON_PACKAGE_ROOT)),)
 
-# set ld flags to rewrite for the library path used to access
-# python libraries provided by the python package at destination
+# Set Python installtion prefix directory variables
 ifeq ($(strip $(PYTHON_STAGING_PREFIX)),)
 export PYTHON_PREFIX = /var/packages/$(PYTHON_PACKAGE)/target
 export PYTHON_STAGING_PREFIX = $(realpath $(PYTHON_PACKAGE_ROOT)/install/$(PYTHON_PREFIX))
-export ADDITIONAL_LDFLAGS += -Wl,--rpath-link,$(PYTHON_STAGING_PREFIX)/lib -Wl,--rpath,$(PYTHON_PREFIX)/lib
 endif
 
+# Set OpenSSL installtion prefix directory variables
 ifeq ($(strip $(OPENSSL_STAGING_PREFIX)),)
 export OPENSSL_PREFIX = $(PYTHON_PREFIX)
 export OPENSSL_STAGING_PREFIX = $(PYTHON_STAGING_PREFIX)
-else
-export ADDITIONAL_LDFLAGS += -Wl,--rpath-link,$(OPENSSL_STAGING_PREFIX)/lib -Wl,--rpath,$(OPENSSL_PREFIX)/lib
+endif
+
+# set build flags including ld to rewrite for the library path used to
+# access python libraries provided by the python package at destination
+export ADDITIONAL_CFLAGS   += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
+export ADDITIONAL_CPPFLAGS += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
+export ADDITIONAL_CXXFLAGS += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
+export ADDITIONAL_LDFLAGS  += -L$(PYTHON_STAGING_PREFIX)/lib
+export ADDITIONAL_LDFLAGS  += -Wl,--rpath-link,$(PYTHON_STAGING_PREFIX)/lib -Wl,--rpath,$(PYTHON_PREFIX)/lib
+
+# likewise for OpenSSL only if different
+ifneq ($(OPENSSL_STAGING_PREFIX),$(PYTHON_STAGING_PREFIX))
+export ADDITIONAL_CFLAGS   += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
+export ADDITIONAL_CPPFLAGS += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
+export ADDITIONAL_CXXFLAGS += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
+export ADDITIONAL_LDFLAGS  += -L$(OPENSSL_STAGING_PREFIX)/lib
+export ADDITIONAL_LDFLAGS  += -Wl,--rpath-link,$(OPENSSL_STAGING_PREFIX)/lib -Wl,--rpath,$(OPENSSL_PREFIX)/lib
 endif
 
 # get PYTHON_VERSION and other variables
diff --git a/spk/znc/Makefile b/spk/znc/Makefile
index 7010c45df6f..f5f578316ef 100644
--- a/spk/znc/Makefile
+++ b/spk/znc/Makefile
@@ -1,12 +1,12 @@
 SPK_NAME = znc
 SPK_VERS = 1.8.2
-SPK_REV = 22
+SPK_REV = 23
 SPK_ICON = src/znc.png
 DSM_UI_DIR = app
 
 DEPENDS = cross/$(SPK_NAME)
 PYTHON_PACKAGE = python311
-SPK_DEPENDS = "python311>=3.11.4-7"
+SPK_DEPENDS = "python311>=3.11.5-8"
 
 MAINTAINER = worstje
 DESCRIPTION = Advanced IRC bouncer. An IRC bouncer is nothing more than an IRC proxy. ZNC will always be connected in your chat rooms, and will be the gateway between your clients, and your IRC servers. You can, for instance, consult messages while you were offline or hide your identity.

From 7eee6b6c34a12f2aca111b32ac52447edf68252e Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Mon, 4 Sep 2023 13:07:01 +0000
Subject: [PATCH 18/27] python.mk: Fine-tune include directories and remov
 bzip2 exception

---
 mk/spksrc.python.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mk/spksrc.python.mk b/mk/spksrc.python.mk
index ffaab9dfa27..40f2f9c23e5 100644
--- a/mk/spksrc.python.mk
+++ b/mk/spksrc.python.mk
@@ -23,8 +23,11 @@ endif
 
 # set build flags including ld to rewrite for the library path used to
 # access python libraries provided by the python package at destination
+export ADDITIONAL_CFLAGS   += -I$(PYTHON_STAGING_PREFIX)/include
 export ADDITIONAL_CFLAGS   += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
+export ADDITIONAL_CPPFLAGS += -I$(PYTHON_STAGING_PREFIX)/include
 export ADDITIONAL_CPPFLAGS += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
+export ADDITIONAL_CXXFLAGS += -I$(PYTHON_STAGING_PREFIX)/include
 export ADDITIONAL_CXXFLAGS += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
 export ADDITIONAL_LDFLAGS  += -L$(PYTHON_STAGING_PREFIX)/lib
 export ADDITIONAL_LDFLAGS  += -Wl,--rpath-link,$(PYTHON_STAGING_PREFIX)/lib -Wl,--rpath,$(PYTHON_PREFIX)/lib
@@ -70,9 +73,8 @@ python_pre_depend:
 	@ln -sf $(PYTHON_PACKAGE_ROOT)/crossenv $(WORK_DIR)/crossenv
 	@ln -sf $(PYTHON_PACKAGE_ROOT)/python-cc.mk $(WORK_DIR)/python-cc.mk
 	@$(foreach _done,$(PYTHON_DEPENDS), ln -sf $(_done) $(WORK_DIR) ;)
-	# EXCEPTION: Ensure zlib,bzip2 is always built locally
+	# EXCEPTION: Ensure zlib is always built locally
 	@rm -f $(STAGING_INSTALL_PREFIX)/lib/pkgconfig/zlib.pc $(WORK_DIR)/.zlib*
-	@rm -f $(WORK_DIR)/.bzip2*
 	# EXCEPTION: Do not symlink cross/* wheel builds
 	@make --no-print-directory dependency-flat | sort -u | grep -v spk/ | while read depend ; do \
 	   makefile="../../$${depend}/Makefile" ; \

From b7dda748044a2fec8a25b4050580ab19d4a99086 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Mon, 4 Sep 2023 13:29:16 +0000
Subject: [PATCH 19/27] python.mk: Additional fixes specific to ZNC

---
 mk/spksrc.python.mk | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/mk/spksrc.python.mk b/mk/spksrc.python.mk
index 40f2f9c23e5..2015b34403e 100644
--- a/mk/spksrc.python.mk
+++ b/mk/spksrc.python.mk
@@ -21,26 +21,28 @@ export OPENSSL_PREFIX = $(PYTHON_PREFIX)
 export OPENSSL_STAGING_PREFIX = $(PYTHON_STAGING_PREFIX)
 endif
 
-# set build flags including ld to rewrite for the library path used to
-# access python libraries provided by the python package at destination
+# set build flags including ld to rewrite for the library path
+# used to access python package provide libraries at destination
 export ADDITIONAL_CFLAGS   += -I$(PYTHON_STAGING_PREFIX)/include
-export ADDITIONAL_CFLAGS   += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
 export ADDITIONAL_CPPFLAGS += -I$(PYTHON_STAGING_PREFIX)/include
-export ADDITIONAL_CPPFLAGS += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
 export ADDITIONAL_CXXFLAGS += -I$(PYTHON_STAGING_PREFIX)/include
-export ADDITIONAL_CXXFLAGS += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
 export ADDITIONAL_LDFLAGS  += -L$(PYTHON_STAGING_PREFIX)/lib
 export ADDITIONAL_LDFLAGS  += -Wl,--rpath-link,$(PYTHON_STAGING_PREFIX)/lib -Wl,--rpath,$(PYTHON_PREFIX)/lib
 
-# likewise for OpenSSL only if different
+# similarly, ld to rewrite OpenSSL library path if differs
 ifneq ($(OPENSSL_STAGING_PREFIX),$(PYTHON_STAGING_PREFIX))
-export ADDITIONAL_CFLAGS   += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
-export ADDITIONAL_CPPFLAGS += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
-export ADDITIONAL_CXXFLAGS += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
 export ADDITIONAL_LDFLAGS  += -L$(OPENSSL_STAGING_PREFIX)/lib
 export ADDITIONAL_LDFLAGS  += -Wl,--rpath-link,$(OPENSSL_STAGING_PREFIX)/lib -Wl,--rpath,$(OPENSSL_PREFIX)/lib
 endif
 
+# For ZNC to build using github-action, enforce adding Python & OpenSSL include directories
+export ADDITIONAL_CFLAGS   += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
+export ADDITIONAL_CPPFLAGS += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
+export ADDITIONAL_CXXFLAGS += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
+export ADDITIONAL_CFLAGS   += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
+export ADDITIONAL_CPPFLAGS += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
+export ADDITIONAL_CXXFLAGS += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
+
 # get PYTHON_VERSION and other variables
 -include $(PYTHON_PACKAGE_ROOT)/python-cc.mk
 

From aa866073b6c73c77da1143b4db2ba48ef0ffa031 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Mon, 4 Sep 2023 14:00:45 +0000
Subject: [PATCH 20/27] python.mk: Move exceptions to ZNC package directly

---
 cross/znc/Makefile  |  4 ++++
 mk/spksrc.python.mk | 11 +++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cross/znc/Makefile b/cross/znc/Makefile
index acca2734fcf..27a0529b734 100644
--- a/cross/znc/Makefile
+++ b/cross/znc/Makefile
@@ -20,6 +20,10 @@ GNU_CONFIGURE = 1
 CONFIGURE_ARGS  = --enable-python
 CONFIGURE_ARGS += --enable-openssl
 
+# For ZNC to build using github-action, enforce adding Python & OpenSSL include directories
+ADDITIONAL_CPPFLAGS += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
+ADDITIONAL_CPPFLAGS += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
+
 ifneq ($(wildcard modules/*),)
 POST_INSTALL_TARGET = znc_post_install
 endif
diff --git a/mk/spksrc.python.mk b/mk/spksrc.python.mk
index 2015b34403e..48fa72bcb24 100644
--- a/mk/spksrc.python.mk
+++ b/mk/spksrc.python.mk
@@ -9,6 +9,9 @@ PYTHON_PACKAGE_ROOT = $(realpath $(shell pwd)/../$(PYTHON_PACKAGE)/work-$(ARCH)-
 
 ifneq ($(wildcard $(PYTHON_PACKAGE_ROOT)),)
 
+# Export the python package variable so it is usable in cross/*
+export PYTHON_PACKAGE
+
 # Set Python installtion prefix directory variables
 ifeq ($(strip $(PYTHON_STAGING_PREFIX)),)
 export PYTHON_PREFIX = /var/packages/$(PYTHON_PACKAGE)/target
@@ -35,14 +38,6 @@ export ADDITIONAL_LDFLAGS  += -L$(OPENSSL_STAGING_PREFIX)/lib
 export ADDITIONAL_LDFLAGS  += -Wl,--rpath-link,$(OPENSSL_STAGING_PREFIX)/lib -Wl,--rpath,$(OPENSSL_PREFIX)/lib
 endif
 
-# For ZNC to build using github-action, enforce adding Python & OpenSSL include directories
-export ADDITIONAL_CFLAGS   += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
-export ADDITIONAL_CPPFLAGS += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
-export ADDITIONAL_CXXFLAGS += -I$(PYTHON_STAGING_PREFIX)/include/python3.$(subst python3,,$(PYTHON_PACKAGE))
-export ADDITIONAL_CFLAGS   += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
-export ADDITIONAL_CPPFLAGS += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
-export ADDITIONAL_CXXFLAGS += -I$(OPENSSL_STAGING_PREFIX)/include/openssl
-
 # get PYTHON_VERSION and other variables
 -include $(PYTHON_PACKAGE_ROOT)/python-cc.mk
 

From 0d07bd74bb88e45c9f26dec7a0a4c54142893e6a Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Mon, 4 Sep 2023 14:09:52 +0000
Subject: [PATCH 21/27] vim: Migrate to spksrc.python.mk along with python 3.11

---
 cross/vim/Makefile |  9 ++-------
 spk/vim/Makefile   | 10 ++++++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/cross/vim/Makefile b/cross/vim/Makefile
index d1812bf5bdc..c83b5f5185a 100644
--- a/cross/vim/Makefile
+++ b/cross/vim/Makefile
@@ -6,8 +6,6 @@ PKG_DIST_SITE = https://ftp.nluug.nl/pub/vim/unix
 SPECIFIC_VERSION=$(subst .,,$(PKG_VERS))
 PKG_DIR = $(PKG_NAME)$(SPECIFIC_VERSION)
 
-PYTHON_PACKAGE = python310
-
 BUILD_DEPENDS = cross/$(PYTHON_PACKAGE)
 DEPENDS = cross/ncursesw
 
@@ -33,14 +31,11 @@ ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
 # With -O2 optimization there is an ICE with older ppc cross compilers
 # usercmd.c:1535: internal compiler error: in set_uids_in_ptset, at tree-ssa-structalias.c:4775
 # bug of GCC 4.2/4.3 in tree-optimization
-   ADDITIONAL_CFLAGS = -O
+   ADDITIONAL_CFLAGS += -O
 else
-   ADDITIONAL_CFLAGS = -O2
+   ADDITIONAL_CFLAGS += -O2
 endif
 
-# Add the Python SPK's installed lib dir to vim's rpath to allow loading of libpython dynamically if it's available
-ADDITIONAL_LDFLAGS = -Wl,--rpath,/var/packages/$(PYTHON_PACKAGE)/target/lib
-
 PLIST_TRANSFORM = sed -e 's%@SPECIFIC_VERSION@%$(SPECIFIC_VERSION)%'
 
 INSTALL_MAKE_OPTIONS = install DESTDIR=$(INSTALL_DIR)
diff --git a/spk/vim/Makefile b/spk/vim/Makefile
index 2ce6e0cee67..6fab0f88357 100644
--- a/spk/vim/Makefile
+++ b/spk/vim/Makefile
@@ -1,9 +1,11 @@
 SPK_NAME = vim
 SPK_VERS = 9.0
-SPK_REV = 5
+SPK_REV = 6
 SPK_ICON = src/vim.png
 
-DEPENDS = cross/vim
+DEPENDS = cross/$(SPK_NAME)
+PYTHON_PACKAGE = python311
+SPK_DEPENDS = "python311>=3.11.5-8"
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Vim is a highly configurable text editor built to enable efficient text editing. It is an improved version of the vi editor distributed with most UNIX systems.
@@ -12,11 +14,11 @@ DESCRIPTION_FRE = Vim est un éditeur de texte avancé basé sur Vi \(unix\) ave
 DISPLAY_NAME = Vim
 STARTABLE = no
 
-CHANGELOG = "Update vim to v9.0."
+CHANGELOG = "Update vim to v9.0<br/>2. Migrate to Python 3.11"
 
 HOMEPAGE = https://www.vim.org/
 LICENSE  = Charityware
 
 SPK_COMMANDS = bin/vim bin/vim$(subst .,,$(SPK_VERS)) bin/view bin/vimdiff bin/rvim bin/rview bin/vimtutor
 
-include ../../mk/spksrc.spk.mk
+include ../../mk/spksrc.python.mk

From 3d815b40b56dbab7447af1b2a59a595e3093c07b Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Mon, 4 Sep 2023 14:11:46 +0000
Subject: [PATCH 22/27] znc: Refer to PYTHON_PACKAGE in BUILD_DEPENDS for cross

---
 cross/znc/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cross/znc/Makefile b/cross/znc/Makefile
index 27a0529b734..e8925eba5f7 100644
--- a/cross/znc/Makefile
+++ b/cross/znc/Makefile
@@ -5,7 +5,7 @@ PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://znc.in/releases/archive
 PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-BUILD_DEPENDS = cross/python311
+BUILD_DEPENDS = cross/$(PYTHON_PACKAGE)
 DEPENDS = cross/openssl3 cross/libicu cross/zlib
 
 # configure: No compiler with C++11 support was found

From a363ad8607b3c37bd2ca2bd28b96e7f9f1e16251 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Mon, 4 Sep 2023 16:23:57 +0000
Subject: [PATCH 23/27] vim: Mark armv5 as unsupported

---
 spk/vim/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/spk/vim/Makefile b/spk/vim/Makefile
index 6fab0f88357..16a0ff98b53 100644
--- a/spk/vim/Makefile
+++ b/spk/vim/Makefile
@@ -6,6 +6,7 @@ SPK_ICON = src/vim.png
 DEPENDS = cross/$(SPK_NAME)
 PYTHON_PACKAGE = python311
 SPK_DEPENDS = "python311>=3.11.5-8"
+UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Vim is a highly configurable text editor built to enable efficient text editing. It is an improved version of the vi editor distributed with most UNIX systems.

From eb0a842268f1f4c84bd2005547c81a7937708816 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Tue, 5 Sep 2023 13:15:56 +0000
Subject: [PATCH 24/27] vim & python.mk: Proposal to allow creating a vim for
 all archs

---
 cross/vim/Makefile  | 16 +++++++++++++---
 mk/spksrc.python.mk |  4 ++++
 spk/vim/Makefile    |  6 ++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/cross/vim/Makefile b/cross/vim/Makefile
index c83b5f5185a..7ead7ee477b 100644
--- a/cross/vim/Makefile
+++ b/cross/vim/Makefile
@@ -6,7 +6,11 @@ PKG_DIST_SITE = https://ftp.nluug.nl/pub/vim/unix
 SPECIFIC_VERSION=$(subst .,,$(PKG_VERS))
 PKG_DIR = $(PKG_NAME)$(SPECIFIC_VERSION)
 
-BUILD_DEPENDS = cross/$(PYTHON_PACKAGE)
+ifeq ($(strip $(PYTHON_PACKAGE)),)
+PYTHON_PACKAGE = python311
+endif
+
+OPTIONAL_DEPENDS = cross/$(PYTHON_PACKAGE)
 DEPENDS = cross/ncursesw
 
 HOMEPAGE = https://www.vim.org/
@@ -18,13 +22,17 @@ CONFIGURE_ARGS  = --with-compiledby=SynoCommunity
 CONFIGURE_ARGS += --with-features=huge --with-tlib=ncursesw
 CONFIGURE_ARGS += vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tgetent=zero vim_cv_tty_group=world
 CONFIGURE_ARGS += vim_cv_getcwd_broken=yes vim_cv_stat_ignores_slash=yes vim_cv_memmove_handles_overlap=yes
+
+include ../../mk/spksrc.archs.mk
+
+ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
+BUILD_DEPENDS = cross/$(PYTHON_PACKAGE)
 CONFIGURE_ARGS += --enable-python3interp=dynamic --with-python3-command=$(HOSTPYTHON) 
 CONFIGURE_ARGS += vi_cv_path_python3_conf=$(PYTHON_CFG_PATH)
 CONFIGURE_ARGS += vi_cv_path_python3_pfx=$(PYTHON_PREFIX)
 CONFIGURE_ARGS += vi_cv_path_python3_epfx=$(PYTHON_EXEC_PREFIX)
 CONFIGURE_ARGS += vi_cv_path_python3path=$(PYTHONPATH)
-
-include ../../mk/spksrc.archs.mk
+endif
 
 # Avoid warning that _FORTIFY_SOURCE requires compiling with optimization
 ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
@@ -44,6 +52,7 @@ POST_INSTALL_TARGET = vim_post_install
 
 include ../../mk/spksrc.cross-cc.mk
 
+ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
 # Only trigger building of dependencies (for the Python config) for targets where it's used
 ifeq ($(strip $(filter-out configure compile install plist all,$(MAKECMDGOALS))),)
 $(WORK_DIR)/python-cc.mk: depend ;
@@ -56,6 +65,7 @@ PYTHON_EXEC_PREFIX = $(STAGING_INSTALL_PREFIX)
 PYTHON_CFG_PATH = $(shell $(STAGING_INSTALL_PREFIX)/bin/python3-config --configdir)
 
 ENV += PYTHONPATH=$(PYTHONPATH)
+endif
 
 .PHONY: vim_post_install
 vim_post_install:
diff --git a/mk/spksrc.python.mk b/mk/spksrc.python.mk
index 48fa72bcb24..0f7648290a4 100644
--- a/mk/spksrc.python.mk
+++ b/mk/spksrc.python.mk
@@ -7,6 +7,8 @@
 # set default spk/python* path to use
 PYTHON_PACKAGE_ROOT = $(realpath $(shell pwd)/../$(PYTHON_PACKAGE)/work-$(ARCH)-$(TCVERSION))
 
+include ../../mk/spksrc.archs.mk
+
 ifneq ($(wildcard $(PYTHON_PACKAGE_ROOT)),)
 
 # Export the python package variable so it is usable in cross/*
@@ -54,8 +56,10 @@ PYTHON_DEPENDS := $(foreach cross,$(foreach pkg_name,$(shell $(MAKE) dependency-
 PRE_DEPEND_TARGET = python_pre_depend
 
 else
+ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
 BUILD_DEPENDS += cross/$(PYTHON_PACKAGE)
 endif
+endif
 
 include ../../mk/spksrc.spk.mk
 
diff --git a/spk/vim/Makefile b/spk/vim/Makefile
index 16a0ff98b53..220ecd87ade 100644
--- a/spk/vim/Makefile
+++ b/spk/vim/Makefile
@@ -5,8 +5,6 @@ SPK_ICON = src/vim.png
 
 DEPENDS = cross/$(SPK_NAME)
 PYTHON_PACKAGE = python311
-SPK_DEPENDS = "python311>=3.11.5-8"
-UNSUPPORTED_ARCHS = $(OLD_PPC_ARCHS) $(ARMv5_ARCHS)
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Vim is a highly configurable text editor built to enable efficient text editing. It is an improved version of the vi editor distributed with most UNIX systems.
@@ -20,6 +18,10 @@ CHANGELOG = "Update vim to v9.0<br/>2. Migrate to Python 3.11"
 HOMEPAGE = https://www.vim.org/
 LICENSE  = Charityware
 
+ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
+SPK_DEPENDS = "python311>=3.11.5-8"
+endif
+
 SPK_COMMANDS = bin/vim bin/vim$(subst .,,$(SPK_VERS)) bin/view bin/vimdiff bin/rvim bin/rview bin/vimtutor
 
 include ../../mk/spksrc.python.mk

From 1a355eb58d607827e5c12ae800a32fc79921a1a3 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Wed, 6 Sep 2023 13:02:20 +0000
Subject: [PATCH 25/27] vim: Apply @hgy59 proposal related to changelog

---
 spk/vim/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spk/vim/Makefile b/spk/vim/Makefile
index 220ecd87ade..297471e485e 100644
--- a/spk/vim/Makefile
+++ b/spk/vim/Makefile
@@ -13,13 +13,14 @@ DESCRIPTION_FRE = Vim est un éditeur de texte avancé basé sur Vi \(unix\) ave
 DISPLAY_NAME = Vim
 STARTABLE = no
 
-CHANGELOG = "Update vim to v9.0<br/>2. Migrate to Python 3.11"
+CHANGELOG = "1. Update vim to v9.0"
 
 HOMEPAGE = https://www.vim.org/
 LICENSE  = Charityware
 
 ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
-SPK_DEPENDS = "python311>=3.11.5-8"
+CHANGELOG += "<br/>2. Migrate to Python 3.11"
+CHANGELOG += "<br/><br/>NOTE: You need to install Python 3.11 package to enable Python support."
 endif
 
 SPK_COMMANDS = bin/vim bin/vim$(subst .,,$(SPK_VERS)) bin/view bin/vimdiff bin/rvim bin/rview bin/vimtutor

From 59b561d539bcd4e031f7e367e34720fa94099acb Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@gmail.com>
Date: Wed, 6 Sep 2023 13:07:06 +0000
Subject: [PATCH 26/27] vim: Added missing include of spksrc.archs.mk for
 proper ifneq

---
 spk/vim/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spk/vim/Makefile b/spk/vim/Makefile
index 297471e485e..020835d0c89 100644
--- a/spk/vim/Makefile
+++ b/spk/vim/Makefile
@@ -18,6 +18,8 @@ CHANGELOG = "1. Update vim to v9.0"
 HOMEPAGE = https://www.vim.org/
 LICENSE  = Charityware
 
+include ../../mk/spksrc.archs.mk
+
 ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
 CHANGELOG += "<br/>2. Migrate to Python 3.11"
 CHANGELOG += "<br/><br/>NOTE: You need to install Python 3.11 package to enable Python support."

From 5817155531a390ffdeeb51602ecf0d11b20a3707 Mon Sep 17 00:00:00 2001
From: Vincent Fortier <th0ma7@users.noreply.github.com>
Date: Wed, 6 Sep 2023 12:29:15 -0400
Subject: [PATCH 27/27] Update spk/vim/Makefile

Co-authored-by: hgy59 <hpgy59@gmail.com>
---
 spk/vim/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spk/vim/Makefile b/spk/vim/Makefile
index 020835d0c89..a27fddeb49d 100644
--- a/spk/vim/Makefile
+++ b/spk/vim/Makefile
@@ -22,9 +22,11 @@ include ../../mk/spksrc.archs.mk
 
 ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
 CHANGELOG += "<br/>2. Migrate to Python 3.11"
-CHANGELOG += "<br/><br/>NOTE: You need to install Python 3.11 package to enable Python support."
+DESCRIPTION += "NOTE: You need to install Python 3.11 package to enable Python support."
+else
+CHANGELOG += "<br/>2. Remove  python support"
+DESCRIPTION += "NOTE: This package is built without Python support."
 endif
-
 SPK_COMMANDS = bin/vim bin/vim$(subst .,,$(SPK_VERS)) bin/view bin/vimdiff bin/rvim bin/rview bin/vimtutor
 
 include ../../mk/spksrc.python.mk