diff --git a/cross/c-ares/Makefile b/cross/c-ares/Makefile index 415a045d51e..3c4abc02af3 100644 --- a/cross/c-ares/Makefile +++ b/cross/c-ares/Makefile @@ -1,5 +1,5 @@ PKG_NAME = c-ares -PKG_VERS = 1.17.1 +PKG_VERS = 1.18.1 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://c-ares.haxx.se/download diff --git a/cross/c-ares/PLIST b/cross/c-ares/PLIST index 1cfb1c480fc..38646773edd 100644 --- a/cross/c-ares/PLIST +++ b/cross/c-ares/PLIST @@ -1,3 +1,3 @@ lnk:lib/libcares.so lnk:lib/libcares.so.2 -lib:lib/libcares.so.2.4.2 +lib:lib/libcares.so.2.5.1 diff --git a/cross/c-ares/digests b/cross/c-ares/digests index 9f1c730f80b..f469c3a26c7 100644 --- a/cross/c-ares/digests +++ b/cross/c-ares/digests @@ -1,3 +1,3 @@ -c-ares-1.17.1.tar.gz SHA1 431d5ff705db752f5d25e610827b7cb3653fc7ff -c-ares-1.17.1.tar.gz SHA256 d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40 -c-ares-1.17.1.tar.gz MD5 28f65c8ee6c097986bd902fd4f0804e2 +c-ares-1.18.1.tar.gz SHA1 9e2a99af58d163d084db6fcebb2165a960bdd1af +c-ares-1.18.1.tar.gz SHA256 1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf +c-ares-1.18.1.tar.gz MD5 bf770c0d3131ec0dd0575a0d2dcab226 diff --git a/cross/curl/Makefile b/cross/curl/Makefile index 4aeb6dd5cbd..c6e081e3d9f 100644 --- a/cross/curl/Makefile +++ b/cross/curl/Makefile @@ -1,5 +1,5 @@ PKG_NAME = curl -PKG_VERS = 7.80.0 +PKG_VERS = 7.82.0 PKG_EXT = tar.xz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://curl.se/download diff --git a/cross/curl/digests b/cross/curl/digests index d42424ba94b..01b22b66393 100644 --- a/cross/curl/digests +++ b/cross/curl/digests @@ -1,3 +1,3 @@ -curl-7.80.0.tar.xz SHA1 5bc5332d0a7f68747d685b3c8681f69447c3498d -curl-7.80.0.tar.xz SHA256 a132bd93188b938771135ac7c1f3ac1d3ce507c1fcbef8c471397639214ae2ab -curl-7.80.0.tar.xz MD5 cf9f8553762150ef0ebcd5ee412737f5 +curl-7.82.0.tar.xz SHA1 1da2b0a398a40b1b7e950940de21bc5e6dd8d622 +curl-7.82.0.tar.xz SHA256 0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c +curl-7.82.0.tar.xz MD5 ce05eb61ef7c398feb7dbe23122d0bd9 diff --git a/cross/libxml2/Makefile b/cross/libxml2/Makefile index b169f89a368..0d83a40d52b 100644 --- a/cross/libxml2/Makefile +++ b/cross/libxml2/Makefile @@ -1,5 +1,5 @@ PKG_NAME = libxml2 -PKG_VERS = 2.9.11 +PKG_VERS = 2.9.12 PKG_EXT = tar.gz PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = ftp://xmlsoft.org/libxml2 diff --git a/cross/libxml2/PLIST b/cross/libxml2/PLIST index 77cde552143..ffc40da9d79 100644 --- a/cross/libxml2/PLIST +++ b/cross/libxml2/PLIST @@ -3,4 +3,4 @@ bin:bin/xmlcatalog bin:bin/xmllint lnk:lib/libxml2.so lnk:lib/libxml2.so.2 -lib:lib/libxml2.so.2.9.11 +lib:lib/libxml2.so.2.9.12 diff --git a/cross/libxml2/digests b/cross/libxml2/digests index 2fd8e965e77..7e3a3d35a51 100644 --- a/cross/libxml2/digests +++ b/cross/libxml2/digests @@ -1,3 +1,3 @@ -libxml2-2.9.11.tar.gz SHA1 7902b9cc7a549c09f8fb227fc4aa1d0275d4282c -libxml2-2.9.11.tar.gz SHA256 886f696d5d5b45d780b2880645edf9e0c62a4fd6841b853e824ada4e02b4d331 -libxml2-2.9.11.tar.gz MD5 bce2745076131c8127da9aeac126223e +libxml2-2.9.12.tar.gz SHA1 339fe5bb2a7d0c13f068c26d8f7cd194c13f9a2a +libxml2-2.9.12.tar.gz SHA256 c8d6681e38c56f172892c85ddc0852e1fd4b53b4209e7f4ebf17f7e2eae71d92 +libxml2-2.9.12.tar.gz MD5 f433a39be087a9f0b197eb2307ad9f75 diff --git a/cross/mariadb-connector-c/Makefile b/cross/mariadb-connector-c/Makefile index 06132de51fc..c5ec9c49ca9 100644 --- a/cross/mariadb-connector-c/Makefile +++ b/cross/mariadb-connector-c/Makefile @@ -1,5 +1,5 @@ PKG_NAME = mariadb-connector-c -PKG_VERS = 3.2.5 +PKG_VERS = 3.2.6 PKG_EXT = tar.gz PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT) PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT) diff --git a/cross/mariadb-connector-c/digests b/cross/mariadb-connector-c/digests index d6f284c8a1f..ef4dc72bd80 100644 --- a/cross/mariadb-connector-c/digests +++ b/cross/mariadb-connector-c/digests @@ -1,3 +1,3 @@ -mariadb-connector-c-3.2.5.tar.gz SHA1 2054b8a6dbe51ad82d23f5c83e212e8411a91a2c -mariadb-connector-c-3.2.5.tar.gz SHA256 edf1e1035c020c23874561cab3f97fd1d8ed11221c47177a1bc178eb971fd351 -mariadb-connector-c-3.2.5.tar.gz MD5 9ab9205418a933b0a7920e7cf424cc36 +mariadb-connector-c-3.2.6.tar.gz SHA1 7b542d0f27fbf92cf17da38b07a7e052bec0b105 +mariadb-connector-c-3.2.6.tar.gz SHA256 d9aee070e1d954074a70eff1cfd2d6c6bc5d190dc00075975a55d4f3e1ac20c5 +mariadb-connector-c-3.2.6.tar.gz MD5 5690599dd143758c029291bffa625069 diff --git a/cross/pip/Makefile b/cross/pip/Makefile index da29a576948..65f0a21f096 100644 --- a/cross/pip/Makefile +++ b/cross/pip/Makefile @@ -1,6 +1,6 @@ PKG_NAME = pip # use the same version in native/python3/Makefile (python3_native_post_install) -PKG_VERS = 21.3.1 +PKG_VERS = 22.0.4 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 e56f342323d..b4a24cf89a9 100644 --- a/cross/pip/digests +++ b/cross/pip/digests @@ -1,3 +1,3 @@ -pip-21.3.1.tar.gz SHA1 a243525070cf70f22a185447ebd3e1435dabb218 -pip-21.3.1.tar.gz SHA256 fd11ba3d0fdb4c07fbc5ecbba0b1b719809420f25038f8ee3cd913d3faa3033a -pip-21.3.1.tar.gz MD5 0d3f27f4b7fecb33fd573e4f46cc6788 +pip-22.0.4.tar.gz SHA1 fa775332fc5dfbc0f8cb4aced2f50c5ccae9f361 +pip-22.0.4.tar.gz SHA256 b3a9de2c6ef801e9247d1527a4b16f92f2cc141cd1489f3fffaf6a9e96729764 +pip-22.0.4.tar.gz MD5 ffb2a7aa43004601409b3318777b75a8 diff --git a/cross/python310/Makefile b/cross/python310/Makefile index 459d38f23a4..927ddd30d0d 100644 --- a/cross/python310/Makefile +++ b/cross/python310/Makefile @@ -1,5 +1,5 @@ PKG_NAME = python310 -PKG_VERS = 3.10.2 +PKG_VERS = 3.10.4 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,10 +133,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 "pip==21.3.1" - . $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==21.3.1" - . $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==60.7.1" - . $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==60.7.1" + . $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-python get-pip.py "pip==22.0.4" + . $(WORK_DIR)/crossenv/bin/activate && $(RUN) python get-pip.py "pip==22.0.4" + . $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "setuptools==60.10.0" + . $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "setuptools==60.10.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" @@ -145,12 +145,12 @@ python310_post_install: $(WORK_DIR)/python-cc.mk . $(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.12" - . $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "poetry==1.1.12" - . $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "Cython==0.29.26" - . $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "Cython==0.29.26" - . $(WORK_DIR)/crossenv/bin/activate && $(RUN) build-pip install "flit==3.6.0" - . $(WORK_DIR)/crossenv/bin/activate && $(RUN) pip install "flit==3.6.0" + . $(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" ifneq ($(PYTHON_LIB_NATIVE),$(PYTHON_LIB_CROSS)) cp $(PYTHON_LIB_CROSS)/_sysconfigdata_*.py $(PYTHON_LIB_NATIVE)/_sysconfigdata.py endif diff --git a/cross/python310/digests b/cross/python310/digests index 5de4c57a488..32b51aa005e 100644 --- a/cross/python310/digests +++ b/cross/python310/digests @@ -1,3 +1,3 @@ -Python-3.10.2.tar.xz SHA1 e618946549cca1eb0d6d4cdf516003fec3975003 -Python-3.10.2.tar.xz SHA256 17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7 -Python-3.10.2.tar.xz MD5 14e8c22458ed7779a1957b26cde01db9 +Python-3.10.4.tar.xz SHA1 8f684863b92bf43936b16dbb867e392f10e8ffc7 +Python-3.10.4.tar.xz SHA256 80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19 +Python-3.10.4.tar.xz MD5 21f2e113e087083a1e8cf10553d93599 diff --git a/native/python310/Makefile b/native/python310/Makefile index edc147270f6..0f66d67ecb9 100644 --- a/native/python310/Makefile +++ b/native/python310/Makefile @@ -1,5 +1,5 @@ PKG_NAME = python310 -PKG_VERS = 3.10.2 +PKG_VERS = 3.10.4 PKG_EXT = tar.xz PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT) PKG_DIST_SITE = https://www.python.org/ftp/python/$(PKG_VERS) @@ -30,8 +30,8 @@ PIP_NATIVE = $(WORK_DIR)/../../../native/$(PKG_NAME)/work-native/install/usr/loc python310_native_post_install: $(WORK_DIR)/python-native.mk @$(MSG) Installing pip, setuptools and crossenv @$(RUN) wget https://bootstrap.pypa.io/get-pip.py - @$(RUN) $(PYTHON) get-pip.py "pip==21.3.1" - @$(PIP) install "setuptools==60.7.1" + @$(RUN) $(PYTHON) get-pip.py "pip==22.0.4" + @$(PIP) install "setuptools==60.10.0" @$(PIP) install "crossenv==1.2.0" @$(PIP) install "cffi==1.15" diff --git a/native/python310/digests b/native/python310/digests index 5de4c57a488..32b51aa005e 100644 --- a/native/python310/digests +++ b/native/python310/digests @@ -1,3 +1,3 @@ -Python-3.10.2.tar.xz SHA1 e618946549cca1eb0d6d4cdf516003fec3975003 -Python-3.10.2.tar.xz SHA256 17de3ac7da9f2519aa9d64378c603a73a0e9ad58dffa8812e45160c086de64c7 -Python-3.10.2.tar.xz MD5 14e8c22458ed7779a1957b26cde01db9 +Python-3.10.4.tar.xz SHA1 8f684863b92bf43936b16dbb867e392f10e8ffc7 +Python-3.10.4.tar.xz SHA256 80bf925f571da436b35210886cf79f6eb5fa5d6c571316b73568343451f77a19 +Python-3.10.4.tar.xz MD5 21f2e113e087083a1e8cf10553d93599 diff --git a/spk/python310/Makefile b/spk/python310/Makefile index 0bbf7e297a7..dde5456d41b 100644 --- a/spk/python310/Makefile +++ b/spk/python310/Makefile @@ -1,7 +1,7 @@ SPK_NAME = python310 -SPK_VERS = 3.10.2 +SPK_VERS = 3.10.4 SPK_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(SPK_VERS))).$(word 2,$(subst ., ,$(SPK_VERS))) -SPK_REV = 8 +SPK_REV = 9 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.2" +CHANGELOG = "1. Update to python 3.10.4
2. Update to OpenSSL 1.1.1n" HOMEPAGE = https://www.python.org LICENSE = PSF @@ -30,7 +30,7 @@ SPK_USR_LOCAL_LINKS = bin:bin/python3.10 WHEELS = src/requirements-crossenv.txt src/requirements-pure.txt src/requirements-abi3.txt # Force building pure-python wheels -#WHEELS_PURE_PYTHON_PACKAGING_ENABLE = 1 +# WHEELS_PURE_PYTHON_PACKAGING_ENABLE = 1 ## ## All configurations below are optional and diff --git a/spk/python310/src/requirements-crossenv.txt b/spk/python310/src/requirements-crossenv.txt index fe0216d4a00..b07b84d7689 100644 --- a/spk/python310/src/requirements-crossenv.txt +++ b/spk/python310/src/requirements-crossenv.txt @@ -17,12 +17,12 @@ # bcrypt==3.2.0 # greenlet==1.1.2 # immutables==0.16 -# MarkupSafe==2.0.1 +# MarkupSafe==2.1.1 # msgpack-python==0.5.6 # netifaces==0.11.0 # psutil==5.9.0 -# regex==2021.11.10 -# SQLAlchemy==1.4.29 +# regex==2022.3.15 +# SQLAlchemy==1.4.32 # zope.interface==5.4.0 # [gevent] @@ -34,7 +34,7 @@ # [lxml] # Depends: libxml2, libxslt -# lxml==4.7.1 +# lxml==4.8.0 # [mysqlclient] # Depends: mysql-connector-c, mariadb-connector-c @@ -69,13 +69,13 @@ # Depends: curl # Require environment variables # PYCURL_CURL_CONFIG -# pycurl==7.44.1 +# pycurl==7.45.1 # [PyNaCl] # Depends: cross/libsodium # Require environment variables # SODIUM_INSTALL=system -# PyNaCl==1.4.0 +# PyNaCl==1.5.0 # [PyYAML] # Depends: libyaml diff --git a/spk/python310/src/requirements-pure.txt b/spk/python310/src/requirements-pure.txt index 6ac39f1227d..14ba173cc82 100644 --- a/spk/python310/src/requirements-pure.txt +++ b/spk/python310/src/requirements-pure.txt @@ -1,6 +1,6 @@ # basic default wheels -#pip==21.3.1 ==> Always install latest version (service-setup.sh:install_python_virtualenv) -setuptools==60.7.1 +#pip==22.0.4 ==> Always install latest version (service-setup.sh:install_python_virtualenv) +setuptools==60.10.0 wheel==0.37.1 # Always use latest version available @@ -11,4 +11,12 @@ certifi # to create their local virtualenv # in order to install wheels within # their running environment -virtualenv==20.13.0 +virtualenv==20.13.4 + +# Other mandatory wheels that +# gets install by default as +# basic dependencies of above +distlib==0.3.4 +filelock==3.6.0 +platformdirs==2.5.1 +six==1.16.0