Update Python 3.8 and 3.10

- update Python 3.10.4 to v3.10.5 and Python 3.8.12 to v3.8.13
- remove static libpython (3.10 has configure arg, 3.8 needs manual removal)
- pip: install specific version of pip with get-pip.py (revert change by SynoCommunity#5316)
- pip: avoid unintended update of pip with --disable-pip-version-check

cross/cffi/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = cffi
-PKG_VERS = 1.14.6
+PKG_VERS = 1.15.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/c/$(PKG_NAME)

cross/cffi/digests

@@ -1,3 +1,3 @@
-cffi-1.14.6.tar.gz SHA1 35bb24955834ecb5b7173e625fa95b02d638fcfd
-cffi-1.14.6.tar.gz SHA256 c9a875ce9d7fe32887784274dd533c57909b7b1dcadcc128a2ac21331a9765dd
-cffi-1.14.6.tar.gz MD5 5c118a18ea897df164dbff67a32876fc
+cffi-1.15.0.tar.gz SHA1 9c51c29e35510adf7f94542e1f8e05611930b07b
+cffi-1.15.0.tar.gz SHA256 920f0d66a896c2d99f0adbb391f990a84091179542c205fa53ce5787aff87954
+cffi-1.15.0.tar.gz MD5 f3a3f26cd3335fc597479c9475da0a0b

cross/pycparser/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = pycparser
-PKG_VERS = 2.20
+PKG_VERS = 2.21
 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)

cross/pycparser/digests

@@ -1,3 +1,3 @@
-pycparser-2.20.tar.gz SHA1 0ae93d89b69fab48af3a407a2f8663bcea270c3d
-pycparser-2.20.tar.gz SHA256 2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0
-pycparser-2.20.tar.gz MD5 b8f88de737db8c346ee8d31c07c7a25a
+pycparser-2.21.tar.gz SHA1 359c718c6ece361047f61846b9fa4ea0239576dc
+pycparser-2.21.tar.gz SHA256 e644fdec12f7872f86c58ff790da456218b10f863970249516d60a5eaca77206
+pycparser-2.21.tar.gz MD5 48f7d743bf018f7bb2ffc5fb976d1492

cross/python310/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = python310
-PKG_VERS = 3.10.4
+PKG_VERS = 3.10.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)
@@ -21,7 +21,9 @@ LICENSE  = PSF
 GNU_CONFIGURE = 1
 
 CONFIGURE_ARGS  = --enable-shared
+CONFIGURE_ARGS += --without-static-libpython
 CONFIGURE_ARGS += --enable-ipv6
+# installed pip is not on PATH
 CONFIGURE_ARGS += --without-ensurepip
 CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
 CONFIGURE_ARGS += --with-computed-gotos=yes
@@ -42,6 +44,11 @@ ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
 CONFIGURE_ARGS += --with-lto
 endif
 
+else
+
+# test modules are required for optimization only
+CONFIGURE_ARGS += --disable-test-modules
+
 endif
 
 ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
@@ -133,24 +140,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) $(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 --no-setuptools --no-wheel
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py --no-setuptools --no-wheel
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==62.4.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==62.4.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools-scm==6.4.2"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools-scm==6.4.2"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "wheel==0.37.1"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "wheel==0.37.1"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "cffi==1.15.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "cffi==1.15.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "cryptography==3.3.2"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "cryptography==3.3.2"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "poetry==1.1.13"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "poetry==1.1.13"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "Cython==0.29.28"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "Cython==0.29.28"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "flit==3.7.1"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "flit==3.7.1"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==22.0.4" --no-setuptools --no-wheel --disable-pip-version-check
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==62.4.0" "setuptools-scm==6.4.2" "wheel==0.37.1" "cffi==1.15.0" "cryptography==3.3.2" "poetry==1.1.13" "Cython==0.29.28" "flit==3.7.1"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==22.0.4" --no-setuptools --no-wheel --disable-pip-version-check
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==62.4.0" "setuptools-scm==6.4.2" "wheel==0.37.1" "cffi==1.15.0" "cryptography==3.3.2" "poetry==1.1.13" "Cython==0.29.28" "flit==3.7.1"
 ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS))
 	cp $(PYTHON_LIB_CROSS)/_sysconfigdata_*.py $(PYTHON_LIB_NATIVE)/_sysconfigdata.py
 endif

cross/python310/digests

@@ -1,3 +1,3 @@
-Python-3.10.4.tar.xz SHA1 8f684863b92bf43936b16dbb867e392f10e8ffc7
-Python-3.10.4.tar.xz SHA256 80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19
-Python-3.10.4.tar.xz MD5 21f2e113e087083a1e8cf10553d93599
+Python-3.10.5.tar.xz SHA1 b80b9c13bb6ba5eb8762ca0d2b888c404582a405
+Python-3.10.5.tar.xz SHA256 8437efd5b106ef0a75aabfbf23d880625120a73a86a22ade4d2e2e68d7b74486
+Python-3.10.5.tar.xz MD5 f05727cb3489aa93cd57eb561c16747b

cross/python38/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = python38
-PKG_VERS = 3.8.12
+PKG_VERS = 3.8.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)
@@ -20,6 +20,7 @@ GNU_CONFIGURE = 1
 
 CONFIGURE_ARGS  = --enable-shared
 CONFIGURE_ARGS += --enable-ipv6
+# installed pip is not on PATH
 CONFIGURE_ARGS += --without-ensurepip
 CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
 CONFIGURE_ARGS += --with-computed-gotos=yes
@@ -132,18 +133,12 @@ python38_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) $(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 --no-setuptools --no-wheel
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py --no-setuptools --no-wheel
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==62.4.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==62.4.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "wheel==0.37.1"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "wheel==0.37.1"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "cffi==1.15.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "cffi==1.15.0"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "cryptography==3.3.2"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "cryptography==3.3.2"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "poetry==1.1.11"
-	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "poetry==1.1.11"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==22.0.4" --no-setuptools --no-wheel --disable-pip-version-check
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "setuptools==62.4.0" "wheel==0.37.1"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip --disable-pip-version-check install "cffi==1.15.0" "cryptography==3.3.2" "poetry==1.1.13"
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==22.0.4" --no-setuptools --no-wheel --disable-pip-version-check
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "setuptools==62.4.0" "wheel==0.37.1" 
+	. $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip --disable-pip-version-check install "cffi==1.15.0" "cryptography==3.3.2" "poetry==1.1.13"
 ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS))
 	cp $(PYTHON_LIB_CROSS)/_sysconfigdata_*.py $(PYTHON_LIB_NATIVE)/_sysconfigdata.py
 endif

cross/python38/digests

@@ -1,3 +1,3 @@
-Python-3.8.12.tar.xz SHA1 7643eccc15f5606bd0dc04affc7ea901e417165d
-Python-3.8.12.tar.xz SHA256 b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea
-Python-3.8.12.tar.xz MD5 9dd8f82e586b776383c82e27923f8795
+Python-3.8.13.tar.xz SHA1 fb46587353f092d91caeddb07f82bb66a5115468
+Python-3.8.13.tar.xz SHA256 6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57
+Python-3.8.13.tar.xz MD5 c4b7100dcaace9d33ab1fda9a3a038d6

cross/setuptools/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = setuptools
-PKG_VERS = 58.3.0
+PKG_VERS = 62.4.0
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/s/$(PKG_NAME)

cross/setuptools/PLIST

@@ -1 +0,0 @@
-rsc:bin/easy_install*

cross/setuptools/digests

@@ -1,3 +1,3 @@
-setuptools-58.3.0.tar.gz SHA1 d5354718cb8c9330d3abc27445467ce8a5ed9d70
-setuptools-58.3.0.tar.gz SHA256 b0c2461641b58fe30e11d4c3dfba316c513bdf9ec85f9fed0c871c678447205e
-setuptools-58.3.0.tar.gz MD5 7a2c32ef46b0f91acc8c2756af56a711
+setuptools-62.4.0.tar.gz SHA1 99111042219214b1fc586ec60e739047dd9c5ff8
+setuptools-62.4.0.tar.gz SHA256 bf8a748ac98b09d32c9a64a995a6b25921c96cc5743c1efa82763ba80ff54e91
+setuptools-62.4.0.tar.gz MD5 b5a0c722d9ca33743a54d815b579ef76

cross/wheel/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = wheel
-PKG_VERS = 0.37.0
+PKG_VERS = 0.37.1
 PKG_EXT = tar.gz
 PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://files.pythonhosted.org/packages/source/w/$(PKG_NAME)

cross/wheel/digests

@@ -1,3 +1,3 @@
-wheel-0.37.0.tar.gz SHA1 d25b95c1e0048051e5a94d7e9f415d253195eb0b
-wheel-0.37.0.tar.gz SHA256 e2ef7239991699e3355d54f8e968a21bb940a1dbf34a4d226741e64462516fad
-wheel-0.37.0.tar.gz MD5 79f55b898e6f274f5586bbde39f6fe8e
+wheel-0.37.1.tar.gz SHA1 f9f3d980579b88baaacdb6c4a3cc4466b9353030
+wheel-0.37.1.tar.gz SHA256 e9a504e793efbca1b8e0e9cb979a249cf4a0a7b5b8c9e8b65a5e39d49529c1c4
+wheel-0.37.1.tar.gz MD5 f490f1399e5903706cb1d4fbed9ecb28

native/python310/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = python310
-PKG_VERS = 3.10.4
+PKG_VERS = 3.10.5
 PKG_EXT = tar.xz
 PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
@@ -11,10 +11,11 @@ LICENSE  = PSF
 
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS  = --enable-ipv6
+CONFIGURE_ARGS += --without-static-libpython
+# installed pip is not on PATH
 CONFIGURE_ARGS += --without-ensurepip
-# old gcc does not know -Wno-unused-result
-# without this setting, cross compile wheels for ppc853x-5.2 will fail
-CONFIGURE_ARGS += ac_cv_disable_unused_result_warning=no
+# test modules are required for optimization only
+CONFIGURE_ARGS += --disable-test-modules
 
 COMPILE_MAKE_OPTIONS += all
 
@@ -28,13 +29,11 @@ PIP_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/loc
 
 .PHONY: python310_native_post_install
 python310_native_post_install: $(WORK_DIR)/python-native.mk
-	@$(MSG) Installing pip, setuptools and crossenv
+	@$(MSG) Installing pip
 	@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
-	@$(RUN) $(PYTHON) get-pip.py --no-setuptools --no-wheel
-	@$(PIP) install "setuptools==62.4.0"
-	@$(PIP) install "wheel==0.37.1"
-	@$(PIP) install "crossenv==1.3.0"
-	@$(PIP) install "cffi==1.15"
+	@$(RUN) $(PYTHON) get-pip.py "pip==22.0.4" --no-setuptools --no-wheel --disable-pip-version-check
+	@$(MSG) Installing setuptools, wheel, cffi and cross env
+	@$(PIP) --disable-pip-version-check install "setuptools==62.4.0" "wheel==0.37.1" "cffi==1.15" "crossenv==1.3.0"
 
 $(WORK_DIR)/python-native.mk:
 	@echo PIP=$(PIP_NATIVE) >> $@

native/python310/digests

@@ -1,3 +1,3 @@
-Python-3.10.4.tar.xz SHA1 8f684863b92bf43936b16dbb867e392f10e8ffc7
-Python-3.10.4.tar.xz SHA256 80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19
-Python-3.10.4.tar.xz MD5 21f2e113e087083a1e8cf10553d93599
+Python-3.10.5.tar.xz SHA1 b80b9c13bb6ba5eb8762ca0d2b888c404582a405
+Python-3.10.5.tar.xz SHA256 8437efd5b106ef0a75aabfbf23d880625120a73a86a22ade4d2e2e68d7b74486
+Python-3.10.5.tar.xz MD5 f05727cb3489aa93cd57eb561c16747b

native/python38/Makefile

@@ -1,5 +1,5 @@
 PKG_NAME = python38
-PKG_VERS = 3.8.12
+PKG_VERS = 3.8.13
 PKG_EXT = tar.xz
 PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)
 PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS)
@@ -11,10 +11,8 @@ LICENSE  = PSF
 
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS  = --enable-ipv6
+# installed pip is not on PATH
 CONFIGURE_ARGS += --without-ensurepip
-# old gcc does not know -Wno-unused-result
-# without this setting, cross compile wheels for ppc853x-5.2 will fail
-CONFIGURE_ARGS += ac_cv_disable_unused_result_warning=no
 
 COMPILE_MAKE_OPTIONS += Parser/pgen
 COMPILE_MAKE_OPTIONS += all
@@ -29,10 +27,11 @@ PIP_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/loc
 
 .PHONY: python38_native_post_install
 python38_native_post_install: $(WORK_DIR)/python-native.mk
-	@$(MSG) Installing pip, setuptools, cffi and cross env
+	@$(MSG) Installing pip
 	@$(RUN) wget https://bootstrap.pypa.io/get-pip.py
-	@$(RUN) $(PYTHON) get-pip.py --no-setuptools --no-wheel
-	@$(PIP) install "setuptools==62.4.0" "wheel==0.37.1" "cffi==1.15.0" "crossenv==1.3"
+	@$(RUN) $(PYTHON) get-pip.py "pip==22.0.4" --no-setuptools --no-wheel --disable-pip-version-check
+	@$(MSG) Installing setuptools, wheel, cffi and cross env
+	@$(PIP) --disable-pip-version-check install "setuptools==62.4.0" "wheel==0.37.1" "cffi==1.15" "crossenv==1.3.0"
 
 $(WORK_DIR)/python-native.mk:
 	@echo PIP=$(PIP_NATIVE) >> $@

native/python38/digests

@@ -1,3 +1,3 @@
-Python-3.8.12.tar.xz SHA1 7643eccc15f5606bd0dc04affc7ea901e417165d
-Python-3.8.12.tar.xz SHA256 b1d3a76420375343b5e8a22fceb1ac65b77193e9ed27146524f0a9db058728ea
-Python-3.8.12.tar.xz MD5 9dd8f82e586b776383c82e27923f8795
+Python-3.8.13.tar.xz SHA1 fb46587353f092d91caeddb07f82bb66a5115468
+Python-3.8.13.tar.xz SHA256 6f309077012040aa39fe8f0c61db8c0fa1c45136763299d375c9e5756f09cf57
+Python-3.8.13.tar.xz MD5 c4b7100dcaace9d33ab1fda9a3a038d6

spk/python310/Makefile

@@ -1,7 +1,7 @@
 SPK_NAME = python310
-SPK_VERS = 3.10.4
+SPK_VERS = 3.10.5
 SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
-SPK_REV = 9
+SPK_REV = 10
 SPK_ICON = src/python3.png
 
 DEPENDS  = cross/$(SPK_NAME)
@@ -13,7 +13,7 @@ DESCRIPTION_FRE = Langage de programmation Python.
 DESCRIPTION_SPN = Lenguaje de programación Python.
 STARTABLE = no
 DISPLAY_NAME = Python 3.10
-CHANGELOG = "1. Update to python 3.10.4 <br/>2. Update to OpenSSL 1.1.1n"
+CHANGELOG = "1. Update to Python 3.10.5<br/>2. Update to OpenSSL 1.1.1o"
 
 HOMEPAGE = https://www.python.org
 LICENSE  = PSF
@@ -141,6 +141,7 @@ include ../../mk/spksrc.spk.mk
 
 .PHONY: python310_extra_install
 python310_extra_install:
-	rm -f $(STAGING_DIR)/$(PYTHON_LIB_DIR)/config/libpython*.a
+	@$(MSG) - Remove test folder
 	rm -rf $(STAGING_DIR)/$(PYTHON_LIB_DIR)/test/
-	find $(STAGING_DIR)/$(PYTHON_LIB_DIR) -type f -regex '.*\.py[co]' | xargs rm -f
+	@$(MSG) - Remove compiled files from __pycache__
+	find $(STAGING_DIR)/$(PYTHON_LIB_DIR) -type f -regex '.*\.py[co]' -delete

spk/python38/Makefile

@@ -1,5 +1,5 @@
 SPK_NAME = python38
-SPK_VERS = 3.8.12
+SPK_VERS = 3.8.13
 SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS)))
 SPK_REV = 7
 SPK_ICON = src/python3.png
@@ -21,7 +21,7 @@ DESCRIPTION_FRE = Langage de programmation Python.
 DESCRIPTION_SPN = Lenguaje de programación Python.
 STARTABLE = no
 DISPLAY_NAME = Python 3.8
-CHANGELOG = "1. Update to Python 3.8.12<br/>2. Update OpenSSL to v1.1.1l<br/>3. Update included wheels"
+CHANGELOG = "1. Update to Python 3.8.13<br/>2. Update to OpenSSL 1.1.1o"
 
 HOMEPAGE = https://www.python.org
 LICENSE  = PSF
@@ -38,6 +38,10 @@ include ../../mk/spksrc.spk.mk
 
 .PHONY: python38_extra_install
 python38_extra_install:
-	rm -f $(STAGING_DIR)/$(PYTHON_LIB_DIR)/config/libpython*.a
+	@$(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/
-	find $(STAGING_DIR)/$(PYTHON_LIB_DIR) -type f -regex '.*\.py[co]' | xargs rm -f
+	@$(MSG) - Remove compiled files from __pycache__
+	find $(STAGING_DIR)/$(PYTHON_LIB_DIR) -type f -regex '.*\.py[co]' -delete

spk/python38/src/requirements-crossenv.txt

@@ -2,7 +2,7 @@
 appdirs==1.4.4
 distlib==0.3.3
 markupsafe==2.0.1
-poetry==1.1.11
+poetry==1.1.13
 psutil==5.8.0
 pyopenssl==21.0.0
 six==1.16.0