diff options
Diffstat (limited to 'meta-python/recipes-devtools/python')
11 files changed, 127 insertions, 5 deletions
diff --git a/meta-python/recipes-devtools/python/python3-alembic_1.17.0.bb b/meta-python/recipes-devtools/python/python3-alembic_1.17.1.bb index 34273e6807..4c3602cdd2 100644 --- a/meta-python/recipes-devtools/python/python3-alembic_1.17.0.bb +++ b/meta-python/recipes-devtools/python/python3-alembic_1.17.1.bb | |||
| @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2ee18d90dcc02d96b76e9e953629936" | |||
| 4 | 4 | ||
| 5 | inherit pypi python_setuptools_build_meta | 5 | inherit pypi python_setuptools_build_meta |
| 6 | 6 | ||
| 7 | SRC_URI[sha256sum] = "4652a0b3e19616b57d652b82bfa5e38bf5dbea0813eed971612671cb9e90c0fe" | 7 | SRC_URI[sha256sum] = "8a289f6778262df31571d29cca4c7fbacd2f0f582ea0816f4c399b6da7528486" |
| 8 | 8 | ||
| 9 | RDEPENDS:${PN} += "\ | 9 | RDEPENDS:${PN} += "\ |
| 10 | python3-dateutil \ | 10 | python3-dateutil \ |
diff --git a/meta-python/recipes-devtools/python/python3-deprecated_1.2.18.bb b/meta-python/recipes-devtools/python/python3-deprecated_1.3.1.bb index 5f52571edd..cc5c96a7a1 100644 --- a/meta-python/recipes-devtools/python/python3-deprecated_1.2.18.bb +++ b/meta-python/recipes-devtools/python/python3-deprecated_1.3.1.bb | |||
| @@ -3,7 +3,7 @@ HOMEPAGE = "https://deprecated.readthedocs.io/en/latest/" | |||
| 3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=44288e26f4896bdab14072d4fa35ff01" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=44288e26f4896bdab14072d4fa35ff01" |
| 5 | 5 | ||
| 6 | SRC_URI[sha256sum] = "422b6f6d859da6f2ef57857761bfb392480502a64c3028ca9bbe86085d72115d" | 6 | SRC_URI[sha256sum] = "b1b50e0ff0c1fddaa5708a2c6b0a6588bb09b892825ab2b214ac9ea9d92a5223" |
| 7 | 7 | ||
| 8 | inherit pypi setuptools3 | 8 | inherit pypi setuptools3 |
| 9 | 9 | ||
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0001-fix-allow-64-bit-time_t-on-32-bit-systems-in-test_is.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0001-fix-allow-64-bit-time_t-on-32-bit-systems-in-test_is.patch new file mode 100644 index 0000000000..d49950074f --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-m2crypto/0001-fix-allow-64-bit-time_t-on-32-bit-systems-in-test_is.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 1 | From d123b4ddce99c44f2c290fb3d6cc887de98778e6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Haixiao Yan <haixiao.yan.cn@windriver.com> | ||
| 3 | Date: Wed, 22 Oct 2025 15:23:56 +0800 | ||
| 4 | Subject: [PATCH 1/2] fix: allow 64-bit time_t on 32-bit systems in | ||
| 5 | test_is32bit | ||
| 6 | |||
| 7 | Some modern 32-bit Linux systems (e.g. with glibc >= 2.34 or musl time64 ABI) | ||
| 8 | use 64-bit time_t by default when _TIME_BITS=64 is enabled. The original test | ||
| 9 | assumed time_t was always 32-bit on 32-bit architectures, which is no longer | ||
| 10 | true. | ||
| 11 | |||
| 12 | Relax the check to accept both 32-bit and 64-bit time_t values: | ||
| 13 | |||
| 14 | self.assertIn(bit32, (32, 64)) | ||
| 15 | |||
| 16 | This makes the test compatible with both legacy and time64 ABIs. | ||
| 17 | |||
| 18 | Upstream-Status: Backport [https://gitlab.com/m2crypto/m2crypto/-/commit/818c3dfda6ea] | ||
| 19 | |||
| 20 | Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com> | ||
| 21 | --- | ||
| 22 | tests/test_util.py | 2 +- | ||
| 23 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 24 | |||
| 25 | diff --git a/tests/test_util.py b/tests/test_util.py | ||
| 26 | index e925d03b090c..233fb7a099d9 100644 | ||
| 27 | --- a/tests/test_util.py | ||
| 28 | +++ b/tests/test_util.py | ||
| 29 | @@ -26,7 +26,7 @@ class UtilTestCase(unittest.TestCase): | ||
| 30 | not in ["true", "1", "yes"] | ||
| 31 | ) | ||
| 32 | ): | ||
| 33 | - self.assertEqual(bit32, 32) | ||
| 34 | + self.assertIn(bit32, (32, 64)) | ||
| 35 | else: | ||
| 36 | self.assertNotEqual(bit32, 32) | ||
| 37 | self.assertIsInstance(bit32, int) | ||
| 38 | -- | ||
| 39 | 2.34.1 | ||
| 40 | |||
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto/0002-fix-correct-struct-packing-on-32-bit-with-_TIME_BITS.patch b/meta-python/recipes-devtools/python/python3-m2crypto/0002-fix-correct-struct-packing-on-32-bit-with-_TIME_BITS.patch new file mode 100644 index 0000000000..c36afa5cc0 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-m2crypto/0002-fix-correct-struct-packing-on-32-bit-with-_TIME_BITS.patch | |||
| @@ -0,0 +1,72 @@ | |||
| 1 | From b5dbfca23986429853ccb15a38cc526d9df0dd40 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Haixiao Yan <haixiao.yan.cn@windriver.com> | ||
| 3 | Date: Wed, 22 Oct 2025 15:23:57 +0800 | ||
| 4 | Subject: [PATCH 2/2] fix: correct struct packing on 32-bit with _TIME_BITS=64 | ||
| 5 | |||
| 6 | On 32-bit platforms with glibc time64 ABI, time_t is 64-bit wide while | ||
| 7 | `long` remains 32-bit. This causes struct timeval to use two 64-bit fields | ||
| 8 | (tv_sec, tv_usec). The previous code incorrectly packed timeout as "ll", | ||
| 9 | leading to EINVAL in setsockopt(SO_RCVTIMEO). | ||
| 10 | |||
| 11 | Use "qq" instead when m2.time_t_bits() == 64 to match the actual ABI. | ||
| 12 | |||
| 13 | Fixes: https://todo.sr.ht/~mcepl/m2crypto/374 | ||
| 14 | |||
| 15 | Upstream-Status: Backport [https://gitlab.com/m2crypto/m2crypto/-/commit/473de659f78e] | ||
| 16 | |||
| 17 | Signed-off-by: Haixiao Yan <haixiao.yan.cn@windriver.com> | ||
| 18 | --- | ||
| 19 | src/M2Crypto/SSL/timeout.py | 24 ++++++++++++++++++++---- | ||
| 20 | 1 file changed, 20 insertions(+), 4 deletions(-) | ||
| 21 | |||
| 22 | diff --git a/src/M2Crypto/SSL/timeout.py b/src/M2Crypto/SSL/timeout.py | ||
| 23 | index b45f38b1cbdb..5ba52283b6f8 100644 | ||
| 24 | --- a/src/M2Crypto/SSL/timeout.py | ||
| 25 | +++ b/src/M2Crypto/SSL/timeout.py | ||
| 26 | @@ -33,10 +33,14 @@ class timeout(object): | ||
| 27 | millisec = int(self.sec * 1000 + round(float(self.microsec) / 1000)) | ||
| 28 | binstr = struct.pack("l", millisec) | ||
| 29 | else: | ||
| 30 | - if m2.time_t_bits() == 32: | ||
| 31 | + bits = m2.time_t_bits() | ||
| 32 | + if bits == 32: | ||
| 33 | binstr = struct.pack("ii", self.sec, self.microsec) | ||
| 34 | + elif bits == 64: | ||
| 35 | + # handle both 64-bit and 32-bit+TIME_BITS=64 | ||
| 36 | + binstr = struct.pack("qq", self.sec, self.microsec) | ||
| 37 | else: | ||
| 38 | - binstr = struct.pack("ll", self.sec, self.microsec) | ||
| 39 | + raise ValueError(f"Unsupported time_t_bits: {bits}") | ||
| 40 | return binstr | ||
| 41 | |||
| 42 | |||
| 43 | @@ -48,7 +52,13 @@ def struct_to_timeout(binstr: bytes) -> timeout: | ||
| 44 | sec = int(millisec / 1000) | ||
| 45 | microsec = (millisec % 1000) * 1000 | ||
| 46 | else: | ||
| 47 | - (sec, microsec) = struct.unpack("ll", binstr) | ||
| 48 | + bits = m2.time_t_bits() | ||
| 49 | + if bits == 32: | ||
| 50 | + (sec, microsec) = struct.unpack("ii", binstr) | ||
| 51 | + elif bits == 64: | ||
| 52 | + (sec, microsec) = struct.unpack("qq", binstr) | ||
| 53 | + else: | ||
| 54 | + raise ValueError(f"Unsupported time_t_bits: {bits}") | ||
| 55 | return timeout(sec, microsec) | ||
| 56 | |||
| 57 | |||
| 58 | @@ -56,4 +66,10 @@ def struct_size() -> int: | ||
| 59 | if sys.platform == "win32": | ||
| 60 | return struct.calcsize("l") | ||
| 61 | else: | ||
| 62 | - return struct.calcsize("ll") | ||
| 63 | + bits = m2.time_t_bits() | ||
| 64 | + if bits == 32: | ||
| 65 | + return struct.calcsize("ii") | ||
| 66 | + elif bits == 64: | ||
| 67 | + return struct.calcsize("qq") | ||
| 68 | + else: | ||
| 69 | + raise ValueError(f"Unsupported time_t_bits: {bits}") | ||
| 70 | -- | ||
| 71 | 2.34.1 | ||
| 72 | |||
diff --git a/meta-python/recipes-devtools/python/python3-m2crypto_0.46.2.bb b/meta-python/recipes-devtools/python/python3-m2crypto_0.46.2.bb index 0a631c7a07..9aac7b344f 100644 --- a/meta-python/recipes-devtools/python/python3-m2crypto_0.46.2.bb +++ b/meta-python/recipes-devtools/python/python3-m2crypto_0.46.2.bb | |||
| @@ -8,6 +8,8 @@ SRC_URI[sha256sum] = "13c2fa89562f7b8af40cc74b55f490be5e2ab8ccfb739f11c16d3ce622 | |||
| 8 | 8 | ||
| 9 | SRC_URI += " \ | 9 | SRC_URI += " \ |
| 10 | file://0001-setup.py-Make-the-cmd-available.patch \ | 10 | file://0001-setup.py-Make-the-cmd-available.patch \ |
| 11 | file://0001-fix-allow-64-bit-time_t-on-32-bit-systems-in-test_is.patch \ | ||
| 12 | file://0002-fix-correct-struct-packing-on-32-bit-with-_TIME_BITS.patch \ | ||
| 11 | " | 13 | " |
| 12 | 14 | ||
| 13 | inherit pypi siteinfo python_setuptools_build_meta | 15 | inherit pypi siteinfo python_setuptools_build_meta |
diff --git a/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb b/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb index 6f862804ce..d83c37e850 100644 --- a/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb +++ b/meta-python/recipes-devtools/python/python3-passlib_1.7.4.bb | |||
| @@ -14,7 +14,10 @@ SRC_URI[sha256sum] = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c415 | |||
| 14 | inherit pypi setuptools3 | 14 | inherit pypi setuptools3 |
| 15 | 15 | ||
| 16 | RDEPENDS:${PN} += "\ | 16 | RDEPENDS:${PN} += "\ |
| 17 | python3-misc \ | ||
| 17 | python3-crypt \ | 18 | python3-crypt \ |
| 18 | python3-logging \ | 19 | python3-logging \ |
| 19 | python3-netclient \ | 20 | python3-netclient \ |
| 20 | " | 21 | " |
| 22 | |||
| 23 | BBCLASSEXTEND = "native" \ No newline at end of file | ||
diff --git a/meta-python/recipes-devtools/python/python3-starlette_0.48.0.bb b/meta-python/recipes-devtools/python/python3-starlette_0.49.1.bb index ef1986f46b..f295b9b050 100644 --- a/meta-python/recipes-devtools/python/python3-starlette_0.48.0.bb +++ b/meta-python/recipes-devtools/python/python3-starlette_0.49.1.bb | |||
| @@ -2,7 +2,7 @@ SUMMARY = "Starlette is a lightweight ASGI framework/toolkit, which is ideal for | |||
| 2 | LICENSE = "BSD-3-Clause" | 2 | LICENSE = "BSD-3-Clause" |
| 3 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=11e8c8dbfd5fa373c703de492140ff7a" | 3 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=11e8c8dbfd5fa373c703de492140ff7a" |
| 4 | 4 | ||
| 5 | SRC_URI[sha256sum] = "7e8cee469a8ab2352911528110ce9088fdc6a37d9876926e73da7ce4aa4c7a46" | 5 | SRC_URI[sha256sum] = "481a43b71e24ed8c43b11ea02f5353d77840e01480881b8cb5a26b8cae64a8cb" |
| 6 | 6 | ||
| 7 | inherit pypi python_hatchling ptest | 7 | inherit pypi python_hatchling ptest |
| 8 | 8 | ||
diff --git a/meta-python/recipes-devtools/python/python3-systemd_235.bb b/meta-python/recipes-devtools/python/python3-systemd_235.bb index 6b44751df7..269e175cc5 100644 --- a/meta-python/recipes-devtools/python/python3-systemd_235.bb +++ b/meta-python/recipes-devtools/python/python3-systemd_235.bb | |||
| @@ -15,3 +15,6 @@ inherit pypi features_check pkgconfig setuptools3 | |||
| 15 | REQUIRED_DISTRO_FEATURES = "systemd" | 15 | REQUIRED_DISTRO_FEATURES = "systemd" |
| 16 | 16 | ||
| 17 | RDEPENDS:${PN} += "systemd python3-syslog python3-logging python3-syslog" | 17 | RDEPENDS:${PN} += "systemd python3-syslog python3-logging python3-syslog" |
| 18 | |||
| 19 | # v235's setup.py is not written in a way to avoid race condition | ||
| 20 | PARALLEL_MAKE = "-j 1" | ||
diff --git a/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb b/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb index 7a4ac0e796..6a54d3a79a 100644 --- a/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb +++ b/meta-python/recipes-devtools/python/python3-transitions_0.9.3.bb | |||
| @@ -7,3 +7,5 @@ inherit pypi setuptools3 | |||
| 7 | SRC_URI[sha256sum] = "881fb75bb1654ed55d86060bb067f2c716f8e155f57bb73fd444e53713aafec8" | 7 | SRC_URI[sha256sum] = "881fb75bb1654ed55d86060bb067f2c716f8e155f57bb73fd444e53713aafec8" |
| 8 | 8 | ||
| 9 | RDEPENDS:${PN} += "python3-six python3-logging" | 9 | RDEPENDS:${PN} += "python3-six python3-logging" |
| 10 | |||
| 11 | BBCLASSEXTEND = "native" \ No newline at end of file | ||
diff --git a/meta-python/recipes-devtools/python/python3-virtualenv_20.35.3.bb b/meta-python/recipes-devtools/python/python3-virtualenv_20.35.4.bb index 3d9b6a097f..28444f12c4 100644 --- a/meta-python/recipes-devtools/python/python3-virtualenv_20.35.3.bb +++ b/meta-python/recipes-devtools/python/python3-virtualenv_20.35.4.bb | |||
| @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/pypa/virtualenv" | |||
| 6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
| 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0ce089158cf60a8ab6abb452b6405538" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=0ce089158cf60a8ab6abb452b6405538" |
| 8 | 8 | ||
| 9 | SRC_URI[sha256sum] = "4f1a845d131133bdff10590489610c98c168ff99dc75d6c96853801f7f67af44" | 9 | SRC_URI[sha256sum] = "643d3914d73d3eeb0c552cbb12d7e82adf0e504dbf86a3182f8771a153a1971c" |
| 10 | 10 | ||
| 11 | BBCLASSEXTEND = "native nativesdk" | 11 | BBCLASSEXTEND = "native nativesdk" |
| 12 | inherit pypi python_hatchling | 12 | inherit pypi python_hatchling |
diff --git a/meta-python/recipes-devtools/python/python3-webargs_8.7.0.bb b/meta-python/recipes-devtools/python/python3-webargs_8.7.1.bb index 88cbd922e8..307d2436c2 100644 --- a/meta-python/recipes-devtools/python/python3-webargs_8.7.0.bb +++ b/meta-python/recipes-devtools/python/python3-webargs_8.7.1.bb | |||
| @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=27586b20700d7544c06933afe56f7df4" | |||
| 5 | 5 | ||
| 6 | inherit pypi python_flit_core | 6 | inherit pypi python_flit_core |
| 7 | 7 | ||
| 8 | SRC_URI[sha256sum] = "0c617dec19ed4f1ff6b247cd73855e949d87052d71900938b71f0cafd92f191b" | 8 | SRC_URI[sha256sum] = "799bf9039c76c23fd8dc1951107a75a9e561203c15d6ae8f89c1e46e234636c1" |
| 9 | 9 | ||
| 10 | RDEPENDS:${PN} += "\ | 10 | RDEPENDS:${PN} += "\ |
| 11 | python3-marshmallow \ | 11 | python3-marshmallow \ |
