diff options
Diffstat (limited to 'meta/recipes-devtools/python')
39 files changed, 422 insertions, 155 deletions
diff --git a/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb b/meta/recipes-devtools/python/python3-jinja2_3.1.6.bb index 2c02037011..de2b251049 100644 --- a/meta/recipes-devtools/python/python3-jinja2_3.1.4.bb +++ b/meta/recipes-devtools/python/python3-jinja2_3.1.6.bb | |||
@@ -4,7 +4,7 @@ HOMEPAGE = "https://pypi.org/project/Jinja2/" | |||
4 | LICENSE = "BSD-3-Clause" | 4 | LICENSE = "BSD-3-Clause" |
5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dc88300786f1c214c1e9827a5229462" | 5 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dc88300786f1c214c1e9827a5229462" |
6 | 6 | ||
7 | SRC_URI[sha256sum] = "4a3aee7acbbe7303aede8e9648d13b8bf88a429282aa6122a993f0ac800cb369" | 7 | SRC_URI[sha256sum] = "0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d" |
8 | 8 | ||
9 | PYPI_PACKAGE = "jinja2" | 9 | PYPI_PACKAGE = "jinja2" |
10 | 10 | ||
@@ -21,6 +21,9 @@ SRC_URI += " \ | |||
21 | do_install_ptest() { | 21 | do_install_ptest() { |
22 | install -d ${D}${PTEST_PATH}/tests | 22 | install -d ${D}${PTEST_PATH}/tests |
23 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ | 23 | cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ |
24 | |||
25 | # test_async items require trio module | ||
26 | rm -f ${D}${PTEST_PATH}/tests/test_async.py ${D}${PTEST_PATH}/tests/test_async_filters.py | ||
24 | } | 27 | } |
25 | 28 | ||
26 | RDEPENDS:${PN}-ptest += " \ | 29 | RDEPENDS:${PN}-ptest += " \ |
diff --git a/meta/recipes-devtools/python/python3-lxml_5.0.0.bb b/meta/recipes-devtools/python/python3-lxml_5.0.2.bb index 66cb8b0938..c0b385c7ea 100644 --- a/meta/recipes-devtools/python/python3-lxml_5.0.0.bb +++ b/meta/recipes-devtools/python/python3-lxml_5.0.2.bb | |||
@@ -18,11 +18,10 @@ LIC_FILES_CHKSUM = "file://LICENSES.txt;md5=e4c045ebad958ead4b48008f70838403 \ | |||
18 | 18 | ||
19 | DEPENDS += "libxml2 libxslt" | 19 | DEPENDS += "libxml2 libxslt" |
20 | 20 | ||
21 | SRC_URI[sha256sum] = "2219cbf790e701acf9a21a31ead75f983e73daf0eceb9da6990212e4d20ebefe" | 21 | SRC_URI[sha256sum] = "6399703c40ba53e2c3b72fdb56cb908d2b83c08082ecf17de839b27e68d1e598" |
22 | 22 | ||
23 | SRC_URI += "${PYPI_SRC_URI}" | 23 | SRC_URI += "${PYPI_SRC_URI}" |
24 | inherit pkgconfig pypi setuptools3 | 24 | inherit pkgconfig pypi setuptools3 |
25 | PYPI_PACKAGE_EXT = "zip" | ||
26 | 25 | ||
27 | # {standard input}: Assembler messages: | 26 | # {standard input}: Assembler messages: |
28 | # {standard input}:1488805: Error: branch out of range | 27 | # {standard input}:1488805: Error: branch out of range |
diff --git a/meta/recipes-devtools/python/python3-poetry-core_1.9.0.bb b/meta/recipes-devtools/python/python3-poetry-core_1.9.0.bb index 540fdffaed..d1a8b939c0 100644 --- a/meta/recipes-devtools/python/python3-poetry-core_1.9.0.bb +++ b/meta/recipes-devtools/python/python3-poetry-core_1.9.0.bb | |||
@@ -36,7 +36,6 @@ RDEPENDS:${PN}:append:class-target = "\ | |||
36 | 36 | ||
37 | RDEPENDS:${PN} += "\ | 37 | RDEPENDS:${PN} += "\ |
38 | python3-pip \ | 38 | python3-pip \ |
39 | python3-six \ | ||
40 | " | 39 | " |
41 | 40 | ||
42 | BBCLASSEXTEND = "native nativesdk" | 41 | BBCLASSEXTEND = "native nativesdk" |
diff --git a/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh new file mode 100644 index 0000000000..492177a9c3 --- /dev/null +++ b/meta/recipes-devtools/python/python3-requests/environment.d-python3-requests.sh | |||
@@ -0,0 +1,11 @@ | |||
1 | # Respect host env REQUESTS_CA_BUNDLE first, then auto-detected host cert, then cert in buildtools | ||
2 | # CAFILE/CAPATH is auto-deteced when source buildtools | ||
3 | if [ -z "$REQUESTS_CA_BUNDLE" ]; then | ||
4 | if [ -n "$CAFILE" ];then | ||
5 | export REQUESTS_CA_BUNDLE="$CAFILE" | ||
6 | elif [ -e "${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" ];then | ||
7 | export REQUESTS_CA_BUNDLE="${OECORE_NATIVE_SYSROOT}/etc/ssl/certs/ca-certificates.crt" | ||
8 | fi | ||
9 | fi | ||
10 | |||
11 | export BB_ENV_PASSTHROUGH_ADDITIONS="${BB_ENV_PASSTHROUGH_ADDITIONS:-} REQUESTS_CA_BUNDLE" | ||
diff --git a/meta/recipes-devtools/python/python3-requests_2.31.0.bb b/meta/recipes-devtools/python/python3-requests_2.31.0.bb deleted file mode 100644 index 287b4f8eee..0000000000 --- a/meta/recipes-devtools/python/python3-requests_2.31.0.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | SUMMARY = "Python HTTP for Humans." | ||
2 | HOMEPAGE = "https://requests.readthedocs.io" | ||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" | ||
5 | |||
6 | SRC_URI[sha256sum] = "942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1" | ||
7 | |||
8 | inherit pypi setuptools3 | ||
9 | |||
10 | RDEPENDS:${PN} += " \ | ||
11 | python3-certifi \ | ||
12 | python3-email \ | ||
13 | python3-json \ | ||
14 | python3-netserver \ | ||
15 | python3-pysocks \ | ||
16 | python3-urllib3 \ | ||
17 | python3-chardet \ | ||
18 | python3-idna \ | ||
19 | python3-compression \ | ||
20 | " | ||
21 | |||
22 | CVE_PRODUCT = "requests" | ||
23 | |||
24 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-devtools/python/python3-requests_2.32.4.bb b/meta/recipes-devtools/python/python3-requests_2.32.4.bb new file mode 100644 index 0000000000..b86ecfba52 --- /dev/null +++ b/meta/recipes-devtools/python/python3-requests_2.32.4.bb | |||
@@ -0,0 +1,35 @@ | |||
1 | SUMMARY = "Python HTTP for Humans." | ||
2 | HOMEPAGE = "https://requests.readthedocs.io" | ||
3 | LICENSE = "Apache-2.0" | ||
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" | ||
5 | |||
6 | SRC_URI:append:class-nativesdk = " \ | ||
7 | file://environment.d-python3-requests.sh \ | ||
8 | " | ||
9 | |||
10 | SRC_URI[sha256sum] = "27d0316682c8a29834d3264820024b62a36942083d52caf2f14c0591336d3422" | ||
11 | |||
12 | inherit pypi python_setuptools_build_meta | ||
13 | |||
14 | do_install:append:class-nativesdk() { | ||
15 | mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d | ||
16 | install -m 644 ${WORKDIR}/environment.d-python3-requests.sh ${D}${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh | ||
17 | } | ||
18 | |||
19 | RDEPENDS:${PN} += " \ | ||
20 | python3-certifi \ | ||
21 | python3-email \ | ||
22 | python3-json \ | ||
23 | python3-netserver \ | ||
24 | python3-pysocks \ | ||
25 | python3-urllib3 \ | ||
26 | python3-chardet \ | ||
27 | python3-idna \ | ||
28 | python3-compression \ | ||
29 | " | ||
30 | |||
31 | FILES:${PN}:append:class-nativesdk = " ${SDKPATHNATIVE}/environment-setup.d/python3-requests.sh" | ||
32 | |||
33 | CVE_PRODUCT = "requests" | ||
34 | |||
35 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-devtools/python/python3-setuptools-scm/0001-respect-GIT_CEILING_DIRECTORIES.patch b/meta/recipes-devtools/python/python3-setuptools-scm/0001-respect-GIT_CEILING_DIRECTORIES.patch new file mode 100644 index 0000000000..7d2808cc0c --- /dev/null +++ b/meta/recipes-devtools/python/python3-setuptools-scm/0001-respect-GIT_CEILING_DIRECTORIES.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From a1cc419a118560d63e1ab8838c256a3622185750 Mon Sep 17 00:00:00 2001 | ||
2 | From: Etienne Cordonnier <ecordonnier@snap.com> | ||
3 | Date: Thu, 13 Feb 2025 15:44:40 +0100 | ||
4 | Subject: [PATCH] respect GIT_CEILING_DIRECTORIES | ||
5 | |||
6 | Fix for https://github.com/pypa/setuptools-scm/issues/1103 | ||
7 | |||
8 | When searching for the root-directory of the git repository e.g. with git rev-parse --show-toplevel, | ||
9 | git stops the search when reaching $GIT_CEILING_DIRECTORIES. By ignoring this variable, the function | ||
10 | _git_toplevel can go above the real git repository (e.g. when packaging a tarball without .git repository), | ||
11 | and then runs "git archive" on an unrelated git repository. | ||
12 | |||
13 | Upstream-Status: Pending | ||
14 | |||
15 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
16 | Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> | ||
17 | --- | ||
18 | src/setuptools_scm/_run_cmd.py | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/src/setuptools_scm/_run_cmd.py b/src/setuptools_scm/_run_cmd.py | ||
22 | index f2a8285..7e13d9f 100644 | ||
23 | --- a/src/setuptools_scm/_run_cmd.py | ||
24 | +++ b/src/setuptools_scm/_run_cmd.py | ||
25 | @@ -98,7 +98,7 @@ def no_git_env(env: Mapping[str, str]) -> dict[str, str]: | ||
26 | k: v | ||
27 | for k, v in env.items() | ||
28 | if not k.startswith("GIT_") | ||
29 | - or k in ("GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND") | ||
30 | + or k in ("GIT_CEILING_DIRECTORIES", "GIT_EXEC_PATH", "GIT_SSH", "GIT_SSH_COMMAND") | ||
31 | } | ||
32 | |||
33 | |||
34 | -- | ||
35 | 2.43.0 | ||
36 | |||
diff --git a/meta/recipes-devtools/python/python3-setuptools-scm_8.0.4.bb b/meta/recipes-devtools/python/python3-setuptools-scm_8.0.4.bb index 64b5050c3b..d5f8358a61 100644 --- a/meta/recipes-devtools/python/python3-setuptools-scm_8.0.4.bb +++ b/meta/recipes-devtools/python/python3-setuptools-scm_8.0.4.bb | |||
@@ -6,6 +6,7 @@ argument or in a SCM managed file." | |||
6 | LICENSE = "MIT" | 6 | LICENSE = "MIT" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=838c366f69b72c5df05c96dff79b35f2" |
8 | 8 | ||
9 | SRC_URI += "file://0001-respect-GIT_CEILING_DIRECTORIES.patch" | ||
9 | SRC_URI[sha256sum] = "b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7" | 10 | SRC_URI[sha256sum] = "b5f43ff6800669595193fd09891564ee9d1d7dcb196cab4b2506d53a2e1c95c7" |
10 | 11 | ||
11 | inherit pypi python_setuptools_build_meta | 12 | inherit pypi python_setuptools_build_meta |
diff --git a/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273-pre1.patch b/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273-pre1.patch new file mode 100644 index 0000000000..72bcaea435 --- /dev/null +++ b/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273-pre1.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From d8390feaa99091d1ba9626bec0e4ba7072fc507a Mon Sep 17 00:00:00 2001 | ||
2 | From: "Jason R. Coombs" <jaraco@jaraco.com> | ||
3 | Date: Sat, 19 Apr 2025 12:49:55 -0400 | ||
4 | Subject: [PATCH] Extract _resolve_download_filename with test. | ||
5 | |||
6 | Upstream-Status: Backport [https://github.com/pypa/setuptools/commit/d8390feaa99091d1ba9626bec0e4ba7072fc507a] | ||
7 | CVE: CVE-2025-47273 #Dependency Patch | ||
8 | Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> | ||
9 | --- | ||
10 | setuptools/package_index.py | 20 ++++++++++++++++---- | ||
11 | 1 file changed, 16 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/setuptools/package_index.py b/setuptools/package_index.py | ||
14 | index 00a972d..d460fcb 100644 | ||
15 | --- a/setuptools/package_index.py | ||
16 | +++ b/setuptools/package_index.py | ||
17 | @@ -815,9 +815,16 @@ class PackageIndex(Environment): | ||
18 | else: | ||
19 | raise DistutilsError("Download error for %s: %s" % (url, v)) from v | ||
20 | |||
21 | - def _download_url(self, url, tmpdir): | ||
22 | - # Determine download filename | ||
23 | - # | ||
24 | + @staticmethod | ||
25 | + def _resolve_download_filename(url, tmpdir): | ||
26 | + """ | ||
27 | + >>> du = PackageIndex._resolve_download_filename | ||
28 | + >>> root = getfixture('tmp_path') | ||
29 | + >>> url = 'https://files.pythonhosted.org/packages/a9/5a/0db.../setuptools-78.1.0.tar.gz' | ||
30 | + >>> import pathlib | ||
31 | + >>> str(pathlib.Path(du(url, root)).relative_to(root)) | ||
32 | + 'setuptools-78.1.0.tar.gz' | ||
33 | + """ | ||
34 | name, fragment = egg_info_for_url(url) | ||
35 | if name: | ||
36 | while '..' in name: | ||
37 | @@ -828,8 +835,13 @@ class PackageIndex(Environment): | ||
38 | if name.endswith('.egg.zip'): | ||
39 | name = name[:-4] # strip the extra .zip before download | ||
40 | |||
41 | - filename = os.path.join(tmpdir, name) | ||
42 | + return os.path.join(tmpdir, name) | ||
43 | |||
44 | + def _download_url(self, url, tmpdir): | ||
45 | + """ | ||
46 | + Determine the download filename. | ||
47 | + """ | ||
48 | + filename = self._resolve_download_filename(url, tmpdir) | ||
49 | return self._download_vcs(url, filename) or self._download_other(url, filename) | ||
50 | |||
51 | @staticmethod | ||
52 | -- | ||
53 | 2.25.1 | ||
54 | |||
diff --git a/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273.patch b/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273.patch new file mode 100644 index 0000000000..be6617e0f6 --- /dev/null +++ b/meta/recipes-devtools/python/python3-setuptools/CVE-2025-47273.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From 250a6d17978f9f6ac3ac887091f2d32886fbbb0b Mon Sep 17 00:00:00 2001 | ||
2 | From: "Jason R. Coombs" <jaraco@jaraco.com> | ||
3 | Date: Sat, 19 Apr 2025 13:03:47 -0400 | ||
4 | Subject: [PATCH] Add a check to ensure the name resolves relative to the | ||
5 | tmpdir. | ||
6 | |||
7 | Closes #4946 | ||
8 | |||
9 | Upstream-Status: Backport [https://github.com/pypa/setuptools/commit/250a6d17978f9f6ac3ac887091f2d32886fbbb0b] | ||
10 | CVE: CVE-2025-47273 | ||
11 | Signed-off-by: Vijay Anusuri <vanusuri@mvista.com> | ||
12 | --- | ||
13 | setuptools/package_index.py | 18 ++++++++++++++++-- | ||
14 | 1 file changed, 16 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/setuptools/package_index.py b/setuptools/package_index.py | ||
17 | index d460fcb..6c7874d 100644 | ||
18 | --- a/setuptools/package_index.py | ||
19 | +++ b/setuptools/package_index.py | ||
20 | @@ -818,12 +818,20 @@ class PackageIndex(Environment): | ||
21 | @staticmethod | ||
22 | def _resolve_download_filename(url, tmpdir): | ||
23 | """ | ||
24 | + >>> import pathlib | ||
25 | >>> du = PackageIndex._resolve_download_filename | ||
26 | >>> root = getfixture('tmp_path') | ||
27 | >>> url = 'https://files.pythonhosted.org/packages/a9/5a/0db.../setuptools-78.1.0.tar.gz' | ||
28 | - >>> import pathlib | ||
29 | >>> str(pathlib.Path(du(url, root)).relative_to(root)) | ||
30 | 'setuptools-78.1.0.tar.gz' | ||
31 | + | ||
32 | + Ensures the target is always in tmpdir. | ||
33 | + | ||
34 | + >>> url = 'https://anyhost/%2fhome%2fuser%2f.ssh%2fauthorized_keys' | ||
35 | + >>> du(url, root) | ||
36 | + Traceback (most recent call last): | ||
37 | + ... | ||
38 | + ValueError: Invalid filename... | ||
39 | """ | ||
40 | name, fragment = egg_info_for_url(url) | ||
41 | if name: | ||
42 | @@ -835,7 +843,13 @@ class PackageIndex(Environment): | ||
43 | if name.endswith('.egg.zip'): | ||
44 | name = name[:-4] # strip the extra .zip before download | ||
45 | |||
46 | - return os.path.join(tmpdir, name) | ||
47 | + filename = os.path.join(tmpdir, name) | ||
48 | + | ||
49 | + # ensure path resolves within the tmpdir | ||
50 | + if not filename.startswith(str(tmpdir)): | ||
51 | + raise ValueError(f"Invalid filename {filename}") | ||
52 | + | ||
53 | + return filename | ||
54 | |||
55 | def _download_url(self, url, tmpdir): | ||
56 | """ | ||
57 | -- | ||
58 | 2.25.1 | ||
59 | |||
diff --git a/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb b/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb index 7b9b02059f..46b2f0ab00 100644 --- a/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb +++ b/meta/recipes-devtools/python/python3-setuptools_69.1.1.bb | |||
@@ -6,11 +6,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" | |||
6 | 6 | ||
7 | inherit pypi python_setuptools_build_meta | 7 | inherit pypi python_setuptools_build_meta |
8 | 8 | ||
9 | CVE_PRODUCT = "python3-setuptools python:setuptools" | ||
10 | |||
9 | SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" | 11 | SRC_URI:append:class-native = " file://0001-conditionally-do-not-fetch-code-by-easy_install.patch" |
10 | 12 | ||
11 | SRC_URI += " \ | 13 | SRC_URI += " \ |
12 | file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch \ | 14 | file://0001-_distutils-sysconfig.py-make-it-possible-to-substite.patch \ |
13 | file://CVE-2024-6345.patch \ | 15 | file://CVE-2024-6345.patch \ |
16 | file://CVE-2025-47273-pre1.patch \ | ||
17 | file://CVE-2025-47273.patch \ | ||
14 | " | 18 | " |
15 | 19 | ||
16 | SRC_URI[sha256sum] = "5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8" | 20 | SRC_URI[sha256sum] = "5c0806c7d9af348e6dd3777b4f4dbb42c7ad85b190104837488eab9a7c945cf8" |
diff --git a/meta/recipes-devtools/python/python3-urllib3_2.2.1.bb b/meta/recipes-devtools/python/python3-urllib3_2.2.2.bb index fc1828b4ee..31a03a60b3 100644 --- a/meta/recipes-devtools/python/python3-urllib3_2.2.1.bb +++ b/meta/recipes-devtools/python/python3-urllib3_2.2.2.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda" | 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda" |
5 | 5 | ||
6 | SRC_URI[sha256sum] = "d0570876c61ab9e520d776c38acbbb5b05a776d3f9ff98a5c8fd5162a444cf19" | 6 | SRC_URI[sha256sum] = "dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168" |
7 | 7 | ||
8 | inherit pypi python_hatchling | 8 | inherit pypi python_hatchling |
9 | 9 | ||
diff --git a/meta/recipes-devtools/python/python3-zipp/CVE-2024-5569.patch b/meta/recipes-devtools/python/python3-zipp/CVE-2024-5569.patch new file mode 100644 index 0000000000..1cc43243bf --- /dev/null +++ b/meta/recipes-devtools/python/python3-zipp/CVE-2024-5569.patch | |||
@@ -0,0 +1,138 @@ | |||
1 | From b1804347ec2db16452a7bff2b469d2c66776b904 Mon Sep 17 00:00:00 2001 | ||
2 | From: "Jason R. Coombs" <jaraco@jaraco.com> | ||
3 | Date: Fri, 31 May 2024 11:20:57 -0400 | ||
4 | Subject: [PATCH] fix CVE-2024-5569 | ||
5 | |||
6 | The patch includes the following changes: | ||
7 | c18417e Add news fragment. | ||
8 | 58115d2 Employ SanitizedNames in CompleteDirs. Fixes broken test. | ||
9 | 564fcc1 Add SanitizedNames mixin. | ||
10 | 79a309f Add some assertions about malformed paths. | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | [https://github.com/jaraco/zipp/pull/120/commits/79a309fe54dc6b7934fb72e9f31bcb58f2e9f547] | ||
14 | [https://github.com/jaraco/zipp/pull/120/commits/564fcc10cdbfdaecdb33688e149827465931c9e0] | ||
15 | [https://github.com/jaraco/zipp/pull/120/commits/58115d2be968644ce71ce6bcc9b79826c82a1806] | ||
16 | [https://github.com/jaraco/zipp/pull/120/commits/c18417ed2953e181728a7dac07bff88a2190abf7] | ||
17 | |||
18 | CVE: CVE-2024-5569 | ||
19 | |||
20 | Signed-off-by: Jiaying Song <jiaying.song.cn@windriver.com> | ||
21 | --- | ||
22 | newsfragments/119.bugfix.rst | 1 + | ||
23 | tests/test_path.py | 17 ++++++++++ | ||
24 | zipp/__init__.py | 64 +++++++++++++++++++++++++++++++++++- | ||
25 | 3 files changed, 81 insertions(+), 1 deletion(-) | ||
26 | create mode 100644 newsfragments/119.bugfix.rst | ||
27 | |||
28 | diff --git a/newsfragments/119.bugfix.rst b/newsfragments/119.bugfix.rst | ||
29 | new file mode 100644 | ||
30 | index 0000000..6c72e2d | ||
31 | --- /dev/null | ||
32 | +++ b/newsfragments/119.bugfix.rst | ||
33 | @@ -0,0 +1 @@ | ||
34 | +Improved handling of malformed zip files. | ||
35 | \ No newline at end of file | ||
36 | diff --git a/tests/test_path.py b/tests/test_path.py | ||
37 | index a77a5de..3752243 100644 | ||
38 | --- a/tests/test_path.py | ||
39 | +++ b/tests/test_path.py | ||
40 | @@ -575,3 +575,20 @@ class TestPath(unittest.TestCase): | ||
41 | zipp.Path(alpharep) | ||
42 | with self.assertRaises(KeyError): | ||
43 | alpharep.getinfo('does-not-exist') | ||
44 | + | ||
45 | + def test_malformed_paths(self): | ||
46 | + """ | ||
47 | + Path should handle malformed paths. | ||
48 | + """ | ||
49 | + data = io.BytesIO() | ||
50 | + zf = zipfile.ZipFile(data, "w") | ||
51 | + zf.writestr("/one-slash.txt", b"content") | ||
52 | + zf.writestr("//two-slash.txt", b"content") | ||
53 | + zf.writestr("../parent.txt", b"content") | ||
54 | + zf.filename = '' | ||
55 | + root = zipfile.Path(zf) | ||
56 | + assert list(map(str, root.iterdir())) == [ | ||
57 | + 'one-slash.txt', | ||
58 | + 'two-slash.txt', | ||
59 | + 'parent.txt', | ||
60 | + ] | ||
61 | diff --git a/zipp/__init__.py b/zipp/__init__.py | ||
62 | index becd010..e980e9b 100644 | ||
63 | --- a/zipp/__init__.py | ||
64 | +++ b/zipp/__init__.py | ||
65 | @@ -84,7 +84,69 @@ class InitializedState: | ||
66 | super().__init__(*args, **kwargs) | ||
67 | |||
68 | |||
69 | -class CompleteDirs(InitializedState, zipfile.ZipFile): | ||
70 | +class SanitizedNames: | ||
71 | + """ | ||
72 | + ZipFile mix-in to ensure names are sanitized. | ||
73 | + """ | ||
74 | + | ||
75 | + def namelist(self): | ||
76 | + return list(map(self._sanitize, super().namelist())) | ||
77 | + | ||
78 | + @staticmethod | ||
79 | + def _sanitize(name): | ||
80 | + r""" | ||
81 | + Ensure a relative path with posix separators and no dot names. | ||
82 | + | ||
83 | + Modeled after | ||
84 | + https://github.com/python/cpython/blob/bcc1be39cb1d04ad9fc0bd1b9193d3972835a57c/Lib/zipfile/__init__.py#L1799-L1813 | ||
85 | + but provides consistent cross-platform behavior. | ||
86 | + | ||
87 | + >>> san = SanitizedNames._sanitize | ||
88 | + >>> san('/foo/bar') | ||
89 | + 'foo/bar' | ||
90 | + >>> san('//foo.txt') | ||
91 | + 'foo.txt' | ||
92 | + >>> san('foo/.././bar.txt') | ||
93 | + 'foo/bar.txt' | ||
94 | + >>> san('foo../.bar.txt') | ||
95 | + 'foo../.bar.txt' | ||
96 | + >>> san('\\foo\\bar.txt') | ||
97 | + 'foo/bar.txt' | ||
98 | + >>> san('D:\\foo.txt') | ||
99 | + 'D/foo.txt' | ||
100 | + >>> san('\\\\server\\share\\file.txt') | ||
101 | + 'server/share/file.txt' | ||
102 | + >>> san('\\\\?\\GLOBALROOT\\Volume3') | ||
103 | + '?/GLOBALROOT/Volume3' | ||
104 | + >>> san('\\\\.\\PhysicalDrive1\\root') | ||
105 | + 'PhysicalDrive1/root' | ||
106 | + | ||
107 | + Retain any trailing slash. | ||
108 | + >>> san('abc/') | ||
109 | + 'abc/' | ||
110 | + | ||
111 | + Raises a ValueError if the result is empty. | ||
112 | + >>> san('../..') | ||
113 | + Traceback (most recent call last): | ||
114 | + ... | ||
115 | + ValueError: Empty filename | ||
116 | + """ | ||
117 | + | ||
118 | + def allowed(part): | ||
119 | + return part and part not in {'..', '.'} | ||
120 | + | ||
121 | + # Remove the drive letter. | ||
122 | + # Don't use ntpath.splitdrive, because that also strips UNC paths | ||
123 | + bare = re.sub('^([A-Z]):', r'\1', name, flags=re.IGNORECASE) | ||
124 | + clean = bare.replace('\\', '/') | ||
125 | + parts = clean.split('/') | ||
126 | + joined = '/'.join(filter(allowed, parts)) | ||
127 | + if not joined: | ||
128 | + raise ValueError("Empty filename") | ||
129 | + return joined + '/' * name.endswith('/') | ||
130 | + | ||
131 | + | ||
132 | +class CompleteDirs(InitializedState, SanitizedNames, zipfile.ZipFile): | ||
133 | """ | ||
134 | A ZipFile subclass that ensures that implied directories | ||
135 | are always included in the namelist. | ||
136 | -- | ||
137 | 2.25.1 | ||
138 | |||
diff --git a/meta/recipes-devtools/python/python3-zipp_3.17.0.bb b/meta/recipes-devtools/python/python3-zipp_3.17.0.bb index e9e220e315..9f756887b5 100644 --- a/meta/recipes-devtools/python/python3-zipp_3.17.0.bb +++ b/meta/recipes-devtools/python/python3-zipp_3.17.0.bb | |||
@@ -3,6 +3,7 @@ HOMEPAGE = "https://github.com/jaraco/zipp" | |||
3 | LICENSE = "MIT" | 3 | LICENSE = "MIT" |
4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" | 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" |
5 | 5 | ||
6 | SRC_URI += "file://CVE-2024-5569.patch" | ||
6 | SRC_URI[sha256sum] = "84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0" | 7 | SRC_URI[sha256sum] = "84e64a1c28cf7e91ed2078bb8cc8c259cb19b76942096c8d7b84947690cabaf0" |
7 | 8 | ||
8 | DEPENDS += "python3-setuptools-scm-native" | 9 | DEPENDS += "python3-setuptools-scm-native" |
diff --git a/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch b/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch index 0d807db39f..a8f98d873e 100644 --- a/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch +++ b/meta/recipes-devtools/python/python3/0001-Avoid-shebang-overflow-on-python-config.py.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 365399f17d35719d828ddd49182dcb401fb7791c Mon Sep 17 00:00:00 2001 | 1 | From e8bd4f8ee56cbb12a61c1dcabf35a1835a863132 Mon Sep 17 00:00:00 2001 |
2 | From: Paulo Neves <ptsneves@gmail.com> | 2 | From: Paulo Neves <ptsneves@gmail.com> |
3 | Date: Tue, 7 Jun 2022 16:16:41 +0200 | 3 | Date: Tue, 7 Jun 2022 16:16:41 +0200 |
4 | Subject: [PATCH] Avoid shebang overflow on python-config.py | 4 | Subject: [PATCH] Avoid shebang overflow on python-config.py |
@@ -16,10 +16,10 @@ Upstream-Status: Denied [distribution] | |||
16 | 1 file changed, 2 insertions(+) | 16 | 1 file changed, 2 insertions(+) |
17 | 17 | ||
18 | diff --git a/Makefile.pre.in b/Makefile.pre.in | 18 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
19 | index 77bf09a..6353c57 100644 | 19 | index 2d235d2..1ac2263 100644 |
20 | --- a/Makefile.pre.in | 20 | --- a/Makefile.pre.in |
21 | +++ b/Makefile.pre.in | 21 | +++ b/Makefile.pre.in |
22 | @@ -2339,6 +2339,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh | 22 | @@ -2356,6 +2356,8 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh |
23 | @ # Substitution happens here, as the completely-expanded BINDIR | 23 | @ # Substitution happens here, as the completely-expanded BINDIR |
24 | @ # is not available in configure | 24 | @ # is not available in configure |
25 | sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py | 25 | sed -e "s,@EXENAME@,$(EXENAME)," < $(srcdir)/Misc/python-config.in >python-config.py |
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch index 026150f0e2..5ca09c6f3c 100644 --- a/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch +++ b/meta/recipes-devtools/python/python3/0001-Lib-pty.py-handle-stdin-I-O-errors-same-way-as-maste.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From f8a664cf1fc73e381d57d6927207286059744837 Mon Sep 17 00:00:00 2001 | 1 | From bbfb7fdf01f0502c7bf3d418f3a912ea76c93f24 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Thu, 16 Sep 2021 16:35:37 +0200 | 3 | Date: Thu, 16 Sep 2021 16:35:37 +0200 |
4 | Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O | 4 | Subject: [PATCH] Lib/pty.py: handle stdin I/O errors same way as master I/O |
@@ -24,7 +24,6 @@ So let's treat both channels the same. | |||
24 | 24 | ||
25 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/28388] | 25 | Upstream-Status: Submitted [https://github.com/python/cpython/pull/28388] |
26 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 26 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
27 | |||
28 | --- | 27 | --- |
29 | Lib/pty.py | 5 ++++- | 28 | Lib/pty.py | 5 ++++- |
30 | 1 file changed, 4 insertions(+), 1 deletion(-) | 29 | 1 file changed, 4 insertions(+), 1 deletion(-) |
diff --git a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch index 680254fab9..c42a56bcb3 100644 --- a/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch +++ b/meta/recipes-devtools/python/python3/0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 71c194077bb907bfe423d3f3275f33a6c8ca0e74 Mon Sep 17 00:00:00 2001 | 1 | From c739bf214b9dd6060db216b79077806fccb582ae Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Fri, 17 Nov 2023 14:26:32 +0100 | 3 | Date: Fri, 17 Nov 2023 14:26:32 +0100 |
4 | Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration | 4 | Subject: [PATCH] Lib/sysconfig.py: use prefix value from build configuration |
@@ -9,16 +9,15 @@ native python. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core cross builds] | 10 | Upstream-Status: Inappropriate [oe-core cross builds] |
11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 11 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
12 | |||
13 | --- | 12 | --- |
14 | Lib/sysconfig.py | 5 +++++ | 13 | Lib/sysconfig.py | 5 +++++ |
15 | 1 file changed, 5 insertions(+) | 14 | 1 file changed, 5 insertions(+) |
16 | 15 | ||
17 | diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py | 16 | diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py |
18 | index 79c0510..91ebcb6 100644 | 17 | index 6258b68..d59ec6e 100644 |
19 | --- a/Lib/sysconfig.py | 18 | --- a/Lib/sysconfig.py |
20 | +++ b/Lib/sysconfig.py | 19 | +++ b/Lib/sysconfig.py |
21 | @@ -668,6 +668,11 @@ def _init_config_vars(): | 20 | @@ -675,6 +675,11 @@ def _init_config_vars(): |
22 | _CONFIG_VARS['VPATH'] = sys._vpath | 21 | _CONFIG_VARS['VPATH'] = sys._vpath |
23 | if os.name == 'posix': | 22 | if os.name == 'posix': |
24 | _init_posix(_CONFIG_VARS) | 23 | _init_posix(_CONFIG_VARS) |
diff --git a/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch b/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch index ee33128fa1..b78f619958 100644 --- a/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch +++ b/meta/recipes-devtools/python/python3/0001-Makefile.pre-use-qemu-wrapper-when-gathering-profile.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 38278339832a57dbf5fa3ef21accaa03e2c814d7 Mon Sep 17 00:00:00 2001 | 1 | From b9081b2e21983f2a828bc40a47ab278ef69f4dfe Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 30 Jan 2019 12:41:04 +0100 | 3 | Date: Wed, 30 Jan 2019 12:41:04 +0100 |
4 | Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data | 4 | Subject: [PATCH] Makefile.pre: use qemu wrapper when gathering profile data |
@@ -10,10 +10,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
10 | 1 file changed, 1 insertion(+), 2 deletions(-) | 10 | 1 file changed, 1 insertion(+), 2 deletions(-) |
11 | 11 | ||
12 | diff --git a/Makefile.pre.in b/Makefile.pre.in | 12 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
13 | index dd5e69f..381feb0 100644 | 13 | index 083f4c7..dce36a5 100644 |
14 | --- a/Makefile.pre.in | 14 | --- a/Makefile.pre.in |
15 | +++ b/Makefile.pre.in | 15 | +++ b/Makefile.pre.in |
16 | @@ -658,8 +658,7 @@ profile-run-stamp: | 16 | @@ -660,8 +660,7 @@ profile-run-stamp: |
17 | # enabled. | 17 | # enabled. |
18 | $(MAKE) profile-gen-stamp | 18 | $(MAKE) profile-gen-stamp |
19 | # Next, run the profile task to generate the profile information. | 19 | # Next, run the profile task to generate the profile information. |
diff --git a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch index 197daa71a5..051ec2c635 100644 --- a/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch +++ b/meta/recipes-devtools/python/python3/0001-Skip-failing-tests-due-to-load-variability-on-YP-AB.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3471e3478e0760c42e04f8046cee2367ab5706d2 Mon Sep 17 00:00:00 2001 | 1 | From b4014e3d1d9e38b25f2840e65e2acd757f3e5d41 Mon Sep 17 00:00:00 2001 |
2 | From: Yi Fan Yu <yifan.yu@windriver.com> | 2 | From: Yi Fan Yu <yifan.yu@windriver.com> |
3 | Date: Thu, 1 Apr 2021 13:08:37 -0700 | 3 | Date: Thu, 1 Apr 2021 13:08:37 -0700 |
4 | Subject: [PATCH] Skip failing tests due to load variability on YP AB | 4 | Subject: [PATCH] Skip failing tests due to load variability on YP AB |
@@ -23,10 +23,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | |||
23 | 2 files changed, 5 insertions(+) | 23 | 2 files changed, 5 insertions(+) |
24 | 24 | ||
25 | diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py | 25 | diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py |
26 | index e42c7ab..dff5227 100644 | 26 | index 3b4415b..1f94dec 100644 |
27 | --- a/Lib/test/_test_multiprocessing.py | 27 | --- a/Lib/test/_test_multiprocessing.py |
28 | +++ b/Lib/test/_test_multiprocessing.py | 28 | +++ b/Lib/test/_test_multiprocessing.py |
29 | @@ -682,6 +682,7 @@ class _TestProcess(BaseTestCase): | 29 | @@ -692,6 +692,7 @@ class _TestProcess(BaseTestCase): |
30 | close_queue(q) | 30 | close_queue(q) |
31 | 31 | ||
32 | @support.requires_resource('walltime') | 32 | @support.requires_resource('walltime') |
@@ -34,7 +34,7 @@ index e42c7ab..dff5227 100644 | |||
34 | def test_many_processes(self): | 34 | def test_many_processes(self): |
35 | if self.TYPE == 'threads': | 35 | if self.TYPE == 'threads': |
36 | self.skipTest('test not appropriate for {}'.format(self.TYPE)) | 36 | self.skipTest('test not appropriate for {}'.format(self.TYPE)) |
37 | @@ -2066,6 +2067,7 @@ class _TestBarrier(BaseTestCase): | 37 | @@ -2223,6 +2224,7 @@ class _TestBarrier(BaseTestCase): |
38 | except threading.BrokenBarrierError: | 38 | except threading.BrokenBarrierError: |
39 | results.append(True) | 39 | results.append(True) |
40 | 40 | ||
@@ -42,7 +42,7 @@ index e42c7ab..dff5227 100644 | |||
42 | def test_timeout(self): | 42 | def test_timeout(self): |
43 | """ | 43 | """ |
44 | Test wait(timeout) | 44 | Test wait(timeout) |
45 | @@ -5024,6 +5026,7 @@ class TestWait(unittest.TestCase): | 45 | @@ -5220,6 +5222,7 @@ class TestWait(unittest.TestCase): |
46 | time.sleep(period) | 46 | time.sleep(period) |
47 | 47 | ||
48 | @support.requires_resource('walltime') | 48 | @support.requires_resource('walltime') |
@@ -51,10 +51,10 @@ index e42c7ab..dff5227 100644 | |||
51 | from multiprocessing.connection import wait | 51 | from multiprocessing.connection import wait |
52 | 52 | ||
53 | diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py | 53 | diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py |
54 | index 02cc3f4..51a4548 100644 | 54 | index 9463add..4e0f39d 100644 |
55 | --- a/Lib/test/test_time.py | 55 | --- a/Lib/test/test_time.py |
56 | +++ b/Lib/test/test_time.py | 56 | +++ b/Lib/test/test_time.py |
57 | @@ -492,6 +492,7 @@ class TimeTestCase(unittest.TestCase): | 57 | @@ -536,6 +536,7 @@ class TimeTestCase(unittest.TestCase): |
58 | @unittest.skipIf( | 58 | @unittest.skipIf( |
59 | support.is_wasi, "process_time not available on WASI" | 59 | support.is_wasi, "process_time not available on WASI" |
60 | ) | 60 | ) |
@@ -62,7 +62,7 @@ index 02cc3f4..51a4548 100644 | |||
62 | def test_process_time(self): | 62 | def test_process_time(self): |
63 | # process_time() should not include time spend during a sleep | 63 | # process_time() should not include time spend during a sleep |
64 | start = time.process_time() | 64 | start = time.process_time() |
65 | @@ -505,6 +506,7 @@ class TimeTestCase(unittest.TestCase): | 65 | @@ -549,6 +550,7 @@ class TimeTestCase(unittest.TestCase): |
66 | self.assertTrue(info.monotonic) | 66 | self.assertTrue(info.monotonic) |
67 | self.assertFalse(info.adjustable) | 67 | self.assertFalse(info.adjustable) |
68 | 68 | ||
diff --git a/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch b/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch index b6c6ac5a28..08142617c0 100644 --- a/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch +++ b/meta/recipes-devtools/python/python3/0001-Update-test_sysconfig-for-posix_user-purelib.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 37d058e841ba3bd89b5746cc5381afb014b11581 Mon Sep 17 00:00:00 2001 | 1 | From 5224cc0ac21f4c2574c24e0fee38b145ca15175b Mon Sep 17 00:00:00 2001 |
2 | From: Wentao Zhang <wentao.zhang@windriver.com> | 2 | From: Wentao Zhang <wentao.zhang@windriver.com> |
3 | Date: Mon, 20 Mar 2023 13:39:52 +0800 | 3 | Date: Mon, 20 Mar 2023 13:39:52 +0800 |
4 | Subject: [PATCH] Update test_sysconfig for posix_user purelib | 4 | Subject: [PATCH] Update test_sysconfig for posix_user purelib |
@@ -17,16 +17,15 @@ Update test_sysconfig.test_user_similar() for the posix_user scheme: | |||
17 | 17 | ||
18 | Upstream-Status: Inappropriate [oe-core specific] | 18 | Upstream-Status: Inappropriate [oe-core specific] |
19 | Signed-off-by: Wentao Zhang <wentao.zhang@windriver.com> | 19 | Signed-off-by: Wentao Zhang <wentao.zhang@windriver.com> |
20 | |||
21 | --- | 20 | --- |
22 | Lib/test/test_sysconfig.py | 2 +- | 21 | Lib/test/test_sysconfig.py | 2 +- |
23 | 1 file changed, 1 insertion(+), 1 deletion(-) | 22 | 1 file changed, 1 insertion(+), 1 deletion(-) |
24 | 23 | ||
25 | diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py | 24 | diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py |
26 | index b6dbf3d..5672590 100644 | 25 | index 3468d0c..9ff174c 100644 |
27 | --- a/Lib/test/test_sysconfig.py | 26 | --- a/Lib/test/test_sysconfig.py |
28 | +++ b/Lib/test/test_sysconfig.py | 27 | +++ b/Lib/test/test_sysconfig.py |
29 | @@ -372,7 +372,7 @@ class TestSysConfig(unittest.TestCase): | 28 | @@ -390,7 +390,7 @@ class TestSysConfig(unittest.TestCase): |
30 | expected = os.path.normpath(global_path.replace(base, user, 1)) | 29 | expected = os.path.normpath(global_path.replace(base, user, 1)) |
31 | # bpo-44860: platlib of posix_user doesn't use sys.platlibdir, | 30 | # bpo-44860: platlib of posix_user doesn't use sys.platlibdir, |
32 | # whereas posix_prefix does. | 31 | # whereas posix_prefix does. |
diff --git a/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch index 88b84c6024..1cffdd6e05 100644 --- a/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch +++ b/meta/recipes-devtools/python/python3/0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 999d4e74d34afa233ad8ad0c70b989d77a21957f Mon Sep 17 00:00:00 2001 | 1 | From 6e3868c8c330f997bc242a8d51d742baac449ecc Mon Sep 17 00:00:00 2001 |
2 | From: Petr Viktorin <encukou@gmail.com> | 2 | From: Petr Viktorin <encukou@gmail.com> |
3 | Date: Wed, 23 Aug 2023 20:00:07 +0200 | 3 | Date: Wed, 23 Aug 2023 20:00:07 +0200 |
4 | Subject: [PATCH] gh-107811: tarfile: treat overflow in UID/GID as failure to | 4 | Subject: [PATCH] gh-107811: tarfile: treat overflow in UID/GID as failure to |
@@ -13,10 +13,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
13 | create mode 100644 Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst | 13 | create mode 100644 Misc/NEWS.d/next/Library/2023-08-23-17-34-39.gh-issue-107811.3Fng72.rst |
14 | 14 | ||
15 | diff --git a/Lib/tarfile.py b/Lib/tarfile.py | 15 | diff --git a/Lib/tarfile.py b/Lib/tarfile.py |
16 | index 3bbbcaa..473167d 100755 | 16 | index 0a0f31e..4dfb67d 100755 |
17 | --- a/Lib/tarfile.py | 17 | --- a/Lib/tarfile.py |
18 | +++ b/Lib/tarfile.py | 18 | +++ b/Lib/tarfile.py |
19 | @@ -2557,7 +2557,8 @@ class TarFile(object): | 19 | @@ -2685,7 +2685,8 @@ class TarFile(object): |
20 | os.lchown(targetpath, u, g) | 20 | os.lchown(targetpath, u, g) |
21 | else: | 21 | else: |
22 | os.chown(targetpath, u, g) | 22 | os.chown(targetpath, u, g) |
@@ -35,6 +35,3 @@ index 0000000..ffca413 | |||
35 | +:mod:`tarfile`: extraction of members with overly large UID or GID (e.g. on | 35 | +:mod:`tarfile`: extraction of members with overly large UID or GID (e.g. on |
36 | +an OS with 32-bit :c:type:`!id_t`) now fails in the same way as failing to | 36 | +an OS with 32-bit :c:type:`!id_t`) now fails in the same way as failing to |
37 | +set the ID. | 37 | +set the ID. |
38 | -- | ||
39 | 2.45.0 | ||
40 | |||
diff --git a/meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch b/meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch deleted file mode 100644 index 8406ef30a2..0000000000 --- a/meta/recipes-devtools/python/python3/0001-gh-114492-Initialize-struct-termios-before-calling-t.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | From 439aa02f42d6e6715c172076261757fcb89a936a Mon Sep 17 00:00:00 2001 | ||
2 | From: "Miss Islington (bot)" | ||
3 | <31488909+miss-islington@users.noreply.github.com> | ||
4 | Date: Tue, 23 Jan 2024 23:02:02 +0100 | ||
5 | Subject: [PATCH] gh-114492: Initialize struct termios before calling | ||
6 | tcgetattr() (GH-114495) (GH-114502) | ||
7 | |||
8 | On Alpine Linux it could leave some field non-initialized. | ||
9 | (cherry picked from commit d22c066b802592932f9eb18434782299e80ca42e) | ||
10 | |||
11 | Upstream-Status: Backport [https://github.com/python/cpython/commit/386c72d9928c51aa2c855ce592bd8022da3b407f] | ||
12 | Co-authored-by: Serhiy Storchaka <storchaka@gmail.com> | ||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | --- | ||
15 | .../next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | 2 ++ | ||
16 | 1 file changed, 2 insertions(+) | ||
17 | create mode 100644 Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | ||
18 | |||
19 | diff --git a/Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst b/Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | ||
20 | new file mode 100644 | ||
21 | index 0000000..8df8299 | ||
22 | --- /dev/null | ||
23 | +++ b/Misc/NEWS.d/next/Library/2024-01-23-21-20-40.gh-issue-114492.vKxl5o.rst | ||
24 | @@ -0,0 +1,2 @@ | ||
25 | +Make the result of :func:`termios.tcgetattr` reproducible on Alpine Linux. | ||
26 | +Previously it could leave a random garbage in some fields. | ||
diff --git a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch index bbeabe4389..5a1f9ffccf 100644 --- a/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch +++ b/meta/recipes-devtools/python/python3/0001-python3-use-cc_basename-to-replace-CC-for-checking-c.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ababc7b1db8c406910766e11cdd04cbef7a706c9 Mon Sep 17 00:00:00 2001 | 1 | From 82576cdb9d6d9736ba122592974b0e7727216a3f Mon Sep 17 00:00:00 2001 |
2 | From: Changqing Li <changqing.li@windriver.com> | 2 | From: Changqing Li <changqing.li@windriver.com> |
3 | Date: Mon, 22 Oct 2018 15:19:51 +0800 | 3 | Date: Mon, 22 Oct 2018 15:19:51 +0800 |
4 | Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler | 4 | Subject: [PATCH] python3: use cc_basename to replace CC for checking compiler |
@@ -26,7 +26,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
26 | 1 file changed, 10 insertions(+), 9 deletions(-) | 26 | 1 file changed, 10 insertions(+), 9 deletions(-) |
27 | 27 | ||
28 | diff --git a/configure.ac b/configure.ac | 28 | diff --git a/configure.ac b/configure.ac |
29 | index 384718d..5a1d58b 100644 | 29 | index 9270b5f..955daad 100644 |
30 | --- a/configure.ac | 30 | --- a/configure.ac |
31 | +++ b/configure.ac | 31 | +++ b/configure.ac |
32 | @@ -137,6 +137,7 @@ AC_CONFIG_HEADERS([pyconfig.h]) | 32 | @@ -137,6 +137,7 @@ AC_CONFIG_HEADERS([pyconfig.h]) |
@@ -46,7 +46,7 @@ index 384718d..5a1d58b 100644 | |||
46 | gcc) AC_PATH_TOOL([CXX], [g++], [g++], [notfound]) ;; | 46 | gcc) AC_PATH_TOOL([CXX], [g++], [g++], [notfound]) ;; |
47 | cc) AC_PATH_TOOL([CXX], [c++], [c++], [notfound]) ;; | 47 | cc) AC_PATH_TOOL([CXX], [c++], [c++], [notfound]) ;; |
48 | clang|*/clang) AC_PATH_TOOL([CXX], [clang++], [clang++], [notfound]) ;; | 48 | clang|*/clang) AC_PATH_TOOL([CXX], [clang++], [clang++], [notfound]) ;; |
49 | @@ -1328,7 +1329,7 @@ rmdir CaseSensitiveTestDir | 49 | @@ -1331,7 +1332,7 @@ rmdir CaseSensitiveTestDir |
50 | 50 | ||
51 | case $ac_sys_system in | 51 | case $ac_sys_system in |
52 | hp*|HP*) | 52 | hp*|HP*) |
@@ -55,7 +55,7 @@ index 384718d..5a1d58b 100644 | |||
55 | cc|*/cc) CC="$CC -Ae";; | 55 | cc|*/cc) CC="$CC -Ae";; |
56 | esac;; | 56 | esac;; |
57 | esac | 57 | esac |
58 | @@ -1854,7 +1855,7 @@ esac | 58 | @@ -1857,7 +1858,7 @@ esac |
59 | ], | 59 | ], |
60 | [AC_MSG_RESULT([no])]) | 60 | [AC_MSG_RESULT([no])]) |
61 | if test "$Py_LTO" = 'true' ; then | 61 | if test "$Py_LTO" = 'true' ; then |
@@ -64,7 +64,7 @@ index 384718d..5a1d58b 100644 | |||
64 | *clang*) | 64 | *clang*) |
65 | LDFLAGS_NOLTO="-fno-lto" | 65 | LDFLAGS_NOLTO="-fno-lto" |
66 | dnl Clang linker requires -flto in order to link objects with LTO information. | 66 | dnl Clang linker requires -flto in order to link objects with LTO information. |
67 | @@ -1983,7 +1984,7 @@ then | 67 | @@ -1986,7 +1987,7 @@ then |
68 | fi | 68 | fi |
69 | fi | 69 | fi |
70 | LLVM_PROF_ERR=no | 70 | LLVM_PROF_ERR=no |
@@ -73,7 +73,7 @@ index 384718d..5a1d58b 100644 | |||
73 | *clang*) | 73 | *clang*) |
74 | # Any changes made here should be reflected in the GCC+Darwin case below | 74 | # Any changes made here should be reflected in the GCC+Darwin case below |
75 | PGO_PROF_GEN_FLAG="-fprofile-instr-generate" | 75 | PGO_PROF_GEN_FLAG="-fprofile-instr-generate" |
76 | @@ -2147,7 +2148,7 @@ AC_MSG_RESULT([$BOLT_APPLY_FLAGS]) | 76 | @@ -2179,7 +2180,7 @@ AC_MSG_RESULT([$BOLT_APPLY_FLAGS]) |
77 | # compiler and platform. BASECFLAGS tweaks need to be made even if the | 77 | # compiler and platform. BASECFLAGS tweaks need to be made even if the |
78 | # user set OPT. | 78 | # user set OPT. |
79 | 79 | ||
@@ -82,7 +82,7 @@ index 384718d..5a1d58b 100644 | |||
82 | *clang*) | 82 | *clang*) |
83 | cc_is_clang=1 | 83 | cc_is_clang=1 |
84 | ;; | 84 | ;; |
85 | @@ -2419,7 +2420,7 @@ yes) | 85 | @@ -2451,7 +2452,7 @@ yes) |
86 | 86 | ||
87 | # ICC doesn't recognize the option, but only emits a warning | 87 | # ICC doesn't recognize the option, but only emits a warning |
88 | ## XXX does it emit an unused result warning and can it be disabled? | 88 | ## XXX does it emit an unused result warning and can it be disabled? |
@@ -91,7 +91,7 @@ index 384718d..5a1d58b 100644 | |||
91 | [*icc*], [ac_cv_disable_unused_result_warning=no] | 91 | [*icc*], [ac_cv_disable_unused_result_warning=no] |
92 | [PY_CHECK_CC_WARNING([disable], [unused-result])]) | 92 | [PY_CHECK_CC_WARNING([disable], [unused-result])]) |
93 | AS_VAR_IF([ac_cv_disable_unused_result_warning], [yes], | 93 | AS_VAR_IF([ac_cv_disable_unused_result_warning], [yes], |
94 | @@ -2665,7 +2666,7 @@ yes) | 94 | @@ -2697,7 +2698,7 @@ yes) |
95 | ;; | 95 | ;; |
96 | esac | 96 | esac |
97 | 97 | ||
@@ -100,7 +100,7 @@ index 384718d..5a1d58b 100644 | |||
100 | *mpicc*) | 100 | *mpicc*) |
101 | CFLAGS_NODIST="$CFLAGS_NODIST" | 101 | CFLAGS_NODIST="$CFLAGS_NODIST" |
102 | ;; | 102 | ;; |
103 | @@ -3482,7 +3483,7 @@ then | 103 | @@ -3532,7 +3533,7 @@ then |
104 | then | 104 | then |
105 | LINKFORSHARED="-Wl,--export-dynamic" | 105 | LINKFORSHARED="-Wl,--export-dynamic" |
106 | fi;; | 106 | fi;; |
@@ -109,7 +109,7 @@ index 384718d..5a1d58b 100644 | |||
109 | *gcc*) | 109 | *gcc*) |
110 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null | 110 | if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null |
111 | then | 111 | then |
112 | @@ -6803,7 +6804,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then | 112 | @@ -6853,7 +6854,7 @@ if test "$ac_cv_gcc_asm_for_x87" = yes; then |
113 | # Some versions of gcc miscompile inline asm: | 113 | # Some versions of gcc miscompile inline asm: |
114 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 | 114 | # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46491 |
115 | # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html | 115 | # http://gcc.gnu.org/ml/gcc/2010-11/msg00366.html |
diff --git a/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch b/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch index 2d7bca6a77..4920cb9ad9 100644 --- a/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch +++ b/meta/recipes-devtools/python/python3/0001-skip-no_stdout_fileno-test-due-to-load-variability.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 217cea231462e7703e8c9ea39c0a6833f799a420 Mon Sep 17 00:00:00 2001 | 1 | From 5944f707fc04fb65caec3f0e1ce3a42169426c47 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Fri, 15 Sep 2023 08:48:33 -0400 | 3 | Date: Fri, 15 Sep 2023 08:48:33 -0400 |
4 | Subject: [PATCH] skip no_stdout_fileno test due to load variability | 4 | Subject: [PATCH] skip no_stdout_fileno test due to load variability |
@@ -16,10 +16,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | |||
16 | 1 file changed, 1 insertion(+) | 16 | 1 file changed, 1 insertion(+) |
17 | 17 | ||
18 | diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py | 18 | diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py |
19 | index 4d03c46..b329b7a 100644 | 19 | index c71c568..e41ab5e 100644 |
20 | --- a/Lib/test/test_builtin.py | 20 | --- a/Lib/test/test_builtin.py |
21 | +++ b/Lib/test/test_builtin.py | 21 | +++ b/Lib/test/test_builtin.py |
22 | @@ -2326,6 +2326,7 @@ class PtyTests(unittest.TestCase): | 22 | @@ -2375,6 +2375,7 @@ class PtyTests(unittest.TestCase): |
23 | # Check stdin/stdout error handler is used when invoking PyOS_Readline() | 23 | # Check stdin/stdout error handler is used when invoking PyOS_Readline() |
24 | self.check_input_tty("prompté", b"quux\xe9", "ascii") | 24 | self.check_input_tty("prompté", b"quux\xe9", "ascii") |
25 | 25 | ||
diff --git a/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch b/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch index fc52fdac26..c7ac43cc85 100644 --- a/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch +++ b/meta/recipes-devtools/python/python3/0001-sysconfig.py-use-platlibdir-also-for-purelib.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a5d429a0e1a4809c1ded7be7e45dcabeb82c53d8 Mon Sep 17 00:00:00 2001 | 1 | From 3aeeddb1325679d5c0471ad86806e92e72187138 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Sun, 12 Sep 2021 21:44:36 +0200 | 3 | Date: Sun, 12 Sep 2021 21:44:36 +0200 |
4 | Subject: [PATCH] sysconfig.py: use platlibdir also for purelib | 4 | Subject: [PATCH] sysconfig.py: use platlibdir also for purelib |
@@ -8,13 +8,12 @@ is not correct. | |||
8 | 8 | ||
9 | Upstream-Status: Inappropriate [oe-core specific] | 9 | Upstream-Status: Inappropriate [oe-core specific] |
10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | 10 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> |
11 | |||
12 | --- | 11 | --- |
13 | Lib/sysconfig.py | 2 +- | 12 | Lib/sysconfig.py | 2 +- |
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
15 | 14 | ||
16 | diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py | 15 | diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py |
17 | index 122d441..79c0510 100644 | 16 | index 517b13a..6258b68 100644 |
18 | --- a/Lib/sysconfig.py | 17 | --- a/Lib/sysconfig.py |
19 | +++ b/Lib/sysconfig.py | 18 | +++ b/Lib/sysconfig.py |
20 | @@ -28,7 +28,7 @@ _INSTALL_SCHEMES = { | 19 | @@ -28,7 +28,7 @@ _INSTALL_SCHEMES = { |
diff --git a/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch index 6ebbaf10e0..164c8b5180 100644 --- a/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_active_children-skip-problematic-test.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From bf3eb28bba24509a3e1cd40f1f0e26db833779a2 Mon Sep 17 00:00:00 2001 | 1 | From a83311a1030b816f422dbb4457fc38c1289c224d Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Thu, 13 Jun 2024 10:54:31 -0400 | 3 | Date: Thu, 13 Jun 2024 10:54:31 -0400 |
4 | Subject: [PATCH] test_active_children: skip problematic test | 4 | Subject: [PATCH] test_active_children: skip problematic test |
@@ -14,10 +14,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | |||
14 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 1 insertion(+) |
15 | 15 | ||
16 | diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py | 16 | diff --git a/Lib/test/_test_multiprocessing.py b/Lib/test/_test_multiprocessing.py |
17 | index 3955123455..a1861fa3a0 100644 | 17 | index 1f94dec..3632219 100644 |
18 | --- a/Lib/test/_test_multiprocessing.py | 18 | --- a/Lib/test/_test_multiprocessing.py |
19 | +++ b/Lib/test/_test_multiprocessing.py | 19 | +++ b/Lib/test/_test_multiprocessing.py |
20 | @@ -579,6 +579,7 @@ def test_cpu_count(self): | 20 | @@ -585,6 +585,7 @@ class _TestProcess(BaseTestCase): |
21 | self.assertTrue(type(cpus) is int) | 21 | self.assertTrue(type(cpus) is int) |
22 | self.assertTrue(cpus >= 1) | 22 | self.assertTrue(cpus >= 1) |
23 | 23 | ||
@@ -25,6 +25,3 @@ index 3955123455..a1861fa3a0 100644 | |||
25 | def test_active_children(self): | 25 | def test_active_children(self): |
26 | self.assertEqual(type(self.active_children()), list) | 26 | self.assertEqual(type(self.active_children()), list) |
27 | 27 | ||
28 | -- | ||
29 | 2.45.2 | ||
30 | |||
diff --git a/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch b/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch index b4fe946cba..307e4bf306 100644 --- a/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch +++ b/meta/recipes-devtools/python/python3/0001-test_ctypes.test_find-skip-without-tools-sdk.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b64c131a576a4b4f821514e711ab91b1394fb4ff Mon Sep 17 00:00:00 2001 | 1 | From fbbf04dbeae217b985073263499174960e5fd142 Mon Sep 17 00:00:00 2001 |
2 | From: Tim Orling <timothy.t.orling@intel.com> | 2 | From: Tim Orling <timothy.t.orling@intel.com> |
3 | Date: Fri, 18 Jun 2021 11:56:50 -0700 | 3 | Date: Fri, 18 Jun 2021 11:56:50 -0700 |
4 | Subject: [PATCH] test_ctypes.test_find: skip without tools-sdk | 4 | Subject: [PATCH] test_ctypes.test_find: skip without tools-sdk |
@@ -10,13 +10,12 @@ easiest way to dynamically check for that is looking for | |||
10 | Upstream-Status: Inappropriate [oe-specific] | 10 | Upstream-Status: Inappropriate [oe-specific] |
11 | 11 | ||
12 | Signed-off-by: Tim Orling <timothy.t.orling@intel.com> | 12 | Signed-off-by: Tim Orling <timothy.t.orling@intel.com> |
13 | |||
14 | --- | 13 | --- |
15 | Lib/test/test_ctypes/test_find.py | 2 ++ | 14 | Lib/test/test_ctypes/test_find.py | 2 ++ |
16 | 1 file changed, 2 insertions(+) | 15 | 1 file changed, 2 insertions(+) |
17 | 16 | ||
18 | diff --git a/Lib/test/test_ctypes/test_find.py b/Lib/test/test_ctypes/test_find.py | 17 | diff --git a/Lib/test/test_ctypes/test_find.py b/Lib/test/test_ctypes/test_find.py |
19 | index 1ff9d01..59def26 100644 | 18 | index a41e949..eb5fe19 100644 |
20 | --- a/Lib/test/test_ctypes/test_find.py | 19 | --- a/Lib/test/test_ctypes/test_find.py |
21 | +++ b/Lib/test/test_ctypes/test_find.py | 20 | +++ b/Lib/test/test_ctypes/test_find.py |
22 | @@ -113,10 +113,12 @@ class FindLibraryLinux(unittest.TestCase): | 21 | @@ -113,10 +113,12 @@ class FindLibraryLinux(unittest.TestCase): |
diff --git a/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch index f0a7cfd39b..e07f7392f6 100644 --- a/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_deadlock-skip-problematic-test.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d7e3f26e7094fbe20e2271d75f18ac3b23a67f58 Mon Sep 17 00:00:00 2001 | 1 | From 9d658dd20f02edcf878b245d638c474c808ab8d1 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Wed, 12 Jun 2024 10:29:03 -0400 | 3 | Date: Wed, 12 Jun 2024 10:29:03 -0400 |
4 | Subject: [PATCH] test_deadlock: skip problematic test | 4 | Subject: [PATCH] test_deadlock: skip problematic test |
@@ -14,10 +14,10 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | |||
14 | 1 file changed, 1 insertion(+) | 14 | 1 file changed, 1 insertion(+) |
15 | 15 | ||
16 | diff --git a/Lib/test/test_concurrent_futures/test_deadlock.py b/Lib/test/test_concurrent_futures/test_deadlock.py | 16 | diff --git a/Lib/test/test_concurrent_futures/test_deadlock.py b/Lib/test/test_concurrent_futures/test_deadlock.py |
17 | index 1db4cd0099..fd07895a17 100644 | 17 | index e8cd8f6..021906b 100644 |
18 | --- a/Lib/test/test_concurrent_futures/test_deadlock.py | 18 | --- a/Lib/test/test_concurrent_futures/test_deadlock.py |
19 | +++ b/Lib/test/test_concurrent_futures/test_deadlock.py | 19 | +++ b/Lib/test/test_concurrent_futures/test_deadlock.py |
20 | @@ -90,6 +90,7 @@ def __reduce__(self): | 20 | @@ -90,6 +90,7 @@ class ErrorAtUnpickle(object): |
21 | return _raise_error_ignore_stderr, (UnpicklingError, ) | 21 | return _raise_error_ignore_stderr, (UnpicklingError, ) |
22 | 22 | ||
23 | 23 | ||
@@ -25,6 +25,3 @@ index 1db4cd0099..fd07895a17 100644 | |||
25 | class ExecutorDeadlockTest: | 25 | class ExecutorDeadlockTest: |
26 | TIMEOUT = support.LONG_TIMEOUT | 26 | TIMEOUT = support.LONG_TIMEOUT |
27 | 27 | ||
28 | -- | ||
29 | 2.45.2 | ||
30 | |||
diff --git a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch index 410a9fc7f1..535c48c769 100644 --- a/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch +++ b/meta/recipes-devtools/python/python3/0001-test_locale.py-correct-the-test-output-format.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ef5728f0af14da5c9f80b0f038fe5bf6d44cb0e9 Mon Sep 17 00:00:00 2001 | 1 | From fcd5b7d30d3245ce92ea45dfbab3c7b7da690c20 Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
3 | Date: Mon, 5 Aug 2019 15:57:39 +0800 | 3 | Date: Mon, 5 Aug 2019 15:57:39 +0800 |
4 | Subject: [PATCH] test_locale.py: correct the test output format | 4 | Subject: [PATCH] test_locale.py: correct the test output format |
@@ -26,16 +26,15 @@ Upstream-Status: Submitted [https://github.com/python/cpython/pull/15132] | |||
26 | Rebased for 3.9.4, still not accepted upstream Signed-off-by: Alejandro Hernandez <alejandro@enedino.org> | 26 | Rebased for 3.9.4, still not accepted upstream Signed-off-by: Alejandro Hernandez <alejandro@enedino.org> |
27 | 27 | ||
28 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 28 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
29 | |||
30 | --- | 29 | --- |
31 | Lib/test/test_locale.py | 2 +- | 30 | Lib/test/test_locale.py | 2 +- |
32 | 1 file changed, 1 insertion(+), 1 deletion(-) | 31 | 1 file changed, 1 insertion(+), 1 deletion(-) |
33 | 32 | ||
34 | diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py | 33 | diff --git a/Lib/test/test_locale.py b/Lib/test/test_locale.py |
35 | index b0d7998..cb12153 100644 | 34 | index cde80a4..e8ffd71 100644 |
36 | --- a/Lib/test/test_locale.py | 35 | --- a/Lib/test/test_locale.py |
37 | +++ b/Lib/test/test_locale.py | 36 | +++ b/Lib/test/test_locale.py |
38 | @@ -557,7 +557,7 @@ class TestMiscellaneous(unittest.TestCase): | 37 | @@ -561,7 +561,7 @@ class TestMiscellaneous(unittest.TestCase): |
39 | self.skipTest('test needs Turkish locale') | 38 | self.skipTest('test needs Turkish locale') |
40 | loc = locale.getlocale(locale.LC_CTYPE) | 39 | loc = locale.getlocale(locale.LC_CTYPE) |
41 | if verbose: | 40 | if verbose: |
diff --git a/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch b/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch index e8d297c721..f9dc0ddcda 100644 --- a/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d9d916d5ea946c945323679d1709de1b87029b96 Mon Sep 17 00:00:00 2001 | 1 | From 34fd0bc8afc67a11eea5d73f9e0edf045c5ce541 Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Tue, 13 Aug 2024 11:07:05 -0400 | 3 | Date: Tue, 13 Aug 2024 11:07:05 -0400 |
4 | Subject: [PATCH] test_readline: skip limited history test | 4 | Subject: [PATCH] test_readline: skip limited history test |
@@ -16,11 +16,11 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | |||
16 | Lib/test/test_readline.py | 2 ++ | 16 | Lib/test/test_readline.py | 2 ++ |
17 | 1 file changed, 2 insertions(+) | 17 | 1 file changed, 2 insertions(+) |
18 | 18 | ||
19 | Index: Python-3.12.6/Lib/test/test_readline.py | 19 | diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py |
20 | =================================================================== | 20 | index fab124a..291dd48 100644 |
21 | --- Python-3.12.6.orig/Lib/test/test_readline.py | 21 | --- a/Lib/test/test_readline.py |
22 | +++ Python-3.12.6/Lib/test/test_readline.py | 22 | +++ b/Lib/test/test_readline.py |
23 | @@ -133,6 +133,7 @@ class TestHistoryManipulation (unittest. | 23 | @@ -141,6 +141,7 @@ class TestHistoryManipulation (unittest.TestCase): |
24 | self.assertEqual(readline.get_history_item(1), "entrée 1") | 24 | self.assertEqual(readline.get_history_item(1), "entrée 1") |
25 | self.assertEqual(readline.get_history_item(2), "entrée 22") | 25 | self.assertEqual(readline.get_history_item(2), "entrée 22") |
26 | 26 | ||
@@ -28,7 +28,7 @@ Index: Python-3.12.6/Lib/test/test_readline.py | |||
28 | def test_write_read_limited_history(self): | 28 | def test_write_read_limited_history(self): |
29 | previous_length = readline.get_history_length() | 29 | previous_length = readline.get_history_length() |
30 | self.addCleanup(readline.set_history_length, previous_length) | 30 | self.addCleanup(readline.set_history_length, previous_length) |
31 | @@ -371,6 +372,7 @@ readline.write_history_file(history_file | 31 | @@ -379,6 +380,7 @@ readline.write_history_file(history_file) |
32 | self.assertIn(b"done", output) | 32 | self.assertIn(b"done", output) |
33 | 33 | ||
34 | 34 | ||
diff --git a/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch index 1d4cda18b1..61fe5e9ba1 100644 --- a/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch +++ b/meta/recipes-devtools/python/python3/0001-test_shutdown-skip-problematic-test.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9d4cdbde100798ba9fa1cf3f82dbaf18fd10a543 Mon Sep 17 00:00:00 2001 | 1 | From d09a034acba8922158d38fd16be970b5a454428a Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Wed, 8 May 2024 11:58:09 -0400 | 3 | Date: Wed, 8 May 2024 11:58:09 -0400 |
4 | Subject: [PATCH] test_shutdown: skip problematic test | 4 | Subject: [PATCH] test_shutdown: skip problematic test |
@@ -14,7 +14,7 @@ Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | |||
14 | 1 file changed, 3 insertions(+) | 14 | 1 file changed, 3 insertions(+) |
15 | 15 | ||
16 | diff --git a/Lib/test/test_concurrent_futures/test_shutdown.py b/Lib/test/test_concurrent_futures/test_shutdown.py | 16 | diff --git a/Lib/test/test_concurrent_futures/test_shutdown.py b/Lib/test/test_concurrent_futures/test_shutdown.py |
17 | index 7a4065afd4..6b878a48bf 100644 | 17 | index 7a4065a..6b878a4 100644 |
18 | --- a/Lib/test/test_concurrent_futures/test_shutdown.py | 18 | --- a/Lib/test/test_concurrent_futures/test_shutdown.py |
19 | +++ b/Lib/test/test_concurrent_futures/test_shutdown.py | 19 | +++ b/Lib/test/test_concurrent_futures/test_shutdown.py |
20 | @@ -20,6 +20,7 @@ def sleep_and_print(t, msg): | 20 | @@ -20,6 +20,7 @@ def sleep_and_print(t, msg): |
@@ -25,7 +25,7 @@ index 7a4065afd4..6b878a48bf 100644 | |||
25 | class ExecutorShutdownTest: | 25 | class ExecutorShutdownTest: |
26 | def test_run_after_shutdown(self): | 26 | def test_run_after_shutdown(self): |
27 | self.executor.shutdown() | 27 | self.executor.shutdown() |
28 | @@ -156,6 +157,7 @@ def timeout(_signum, _frame): | 28 | @@ -156,6 +157,7 @@ class ExecutorShutdownTest: |
29 | signal.signal(signal.SIGALRM, old_handler) | 29 | signal.signal(signal.SIGALRM, old_handler) |
30 | 30 | ||
31 | 31 | ||
@@ -33,7 +33,7 @@ index 7a4065afd4..6b878a48bf 100644 | |||
33 | class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase): | 33 | class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase): |
34 | def test_threads_terminate(self): | 34 | def test_threads_terminate(self): |
35 | def acquire_lock(lock): | 35 | def acquire_lock(lock): |
36 | @@ -252,6 +254,7 @@ def test_cancel_futures_wait_false(self): | 36 | @@ -252,6 +254,7 @@ class ThreadPoolShutdownTest(ThreadPoolMixin, ExecutorShutdownTest, BaseTestCase |
37 | self.assertIn(out.strip(), [b"apple", b""]) | 37 | self.assertIn(out.strip(), [b"apple", b""]) |
38 | 38 | ||
39 | 39 | ||
@@ -41,6 +41,3 @@ index 7a4065afd4..6b878a48bf 100644 | |||
41 | class ProcessPoolShutdownTest(ExecutorShutdownTest): | 41 | class ProcessPoolShutdownTest(ExecutorShutdownTest): |
42 | def test_processes_terminate(self): | 42 | def test_processes_terminate(self): |
43 | def acquire_lock(lock): | 43 | def acquire_lock(lock): |
44 | -- | ||
45 | 2.45.0 | ||
46 | |||
diff --git a/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch index 0d0eb08459..88cd93a51f 100644 --- a/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch +++ b/meta/recipes-devtools/python/python3/0001-test_storlines-skip-due-to-load-variability.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dc69a1afdb3ba619705ff71e14f19ed3142e422f Mon Sep 17 00:00:00 2001 | 1 | From 6715560de4d622c2d72ee7b587c916ac647c54bb Mon Sep 17 00:00:00 2001 |
2 | From: Trevor Gamblin <tgamblin@baylibre.com> | 2 | From: Trevor Gamblin <tgamblin@baylibre.com> |
3 | Date: Fri, 6 Oct 2023 10:59:44 -0400 | 3 | Date: Fri, 6 Oct 2023 10:59:44 -0400 |
4 | Subject: [PATCH] test_storlines: skip due to load variability | 4 | Subject: [PATCH] test_storlines: skip due to load variability |
@@ -11,16 +11,15 @@ Upstream-Status: Inappropriate [OE-Specific] | |||
11 | [YOCTO #14933] | 11 | [YOCTO #14933] |
12 | 12 | ||
13 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> | 13 | Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> |
14 | |||
15 | --- | 14 | --- |
16 | Lib/test/test_ftplib.py | 1 + | 15 | Lib/test/test_ftplib.py | 1 + |
17 | 1 file changed, 1 insertion(+) | 16 | 1 file changed, 1 insertion(+) |
18 | 17 | ||
19 | diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py | 18 | diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py |
20 | index 2f191ea..dc29346 100644 | 19 | index 4c4a449..b8c79a4 100644 |
21 | --- a/Lib/test/test_ftplib.py | 20 | --- a/Lib/test/test_ftplib.py |
22 | +++ b/Lib/test/test_ftplib.py | 21 | +++ b/Lib/test/test_ftplib.py |
23 | @@ -626,6 +626,7 @@ class TestFTPClass(TestCase): | 22 | @@ -629,6 +629,7 @@ class TestFTPClass(TestCase): |
24 | self.client.storbinary('stor', f, rest=r) | 23 | self.client.storbinary('stor', f, rest=r) |
25 | self.assertEqual(self.server.handler_instance.rest, str(r)) | 24 | self.assertEqual(self.server.handler_instance.rest, str(r)) |
26 | 25 | ||
diff --git a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch index 0661249bfd..e917c8bdf0 100644 --- a/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch +++ b/meta/recipes-devtools/python/python3/0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d0205c60d08f51d84bd8ddc07a57e8c71710fdad Mon Sep 17 00:00:00 2001 | 1 | From 011b21dc9b090c0b97eaecbd80a9e0c1cd39b12d Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex@linutronix.de> | 2 | From: Alexander Kanavin <alex@linutronix.de> |
3 | Date: Fri, 17 Nov 2023 14:16:40 +0100 | 3 | Date: Fri, 17 Nov 2023 14:16:40 +0100 |
4 | Subject: [PATCH] configure.ac: do not add a curses include path from the host | 4 | Subject: [PATCH] configure.ac: do not add a curses include path from the host |
@@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
15 | 1 file changed, 6 deletions(-) | 15 | 1 file changed, 6 deletions(-) |
16 | 16 | ||
17 | diff --git a/configure.ac b/configure.ac | 17 | diff --git a/configure.ac b/configure.ac |
18 | index c49cd4f..affdedf 100644 | 18 | index 6e465a4..13c4835 100644 |
19 | --- a/configure.ac | 19 | --- a/configure.ac |
20 | +++ b/configure.ac | 20 | +++ b/configure.ac |
21 | @@ -6508,12 +6508,6 @@ AS_VAR_IF([have_panel], [no], [ | 21 | @@ -6558,12 +6558,6 @@ AS_VAR_IF([have_panel], [no], [ |
22 | AC_MSG_RESULT([$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)]) | 22 | AC_MSG_RESULT([$have_panel (CFLAGS: $PANEL_CFLAGS, LIBS: $PANEL_LIBS)]) |
23 | ]) | 23 | ]) |
24 | 24 | ||
diff --git a/meta/recipes-devtools/python/python3/cgi_py.patch b/meta/recipes-devtools/python/python3/cgi_py.patch index 8262c88e73..880a463760 100644 --- a/meta/recipes-devtools/python/python3/cgi_py.patch +++ b/meta/recipes-devtools/python/python3/cgi_py.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From a56778372fe8dc7c42f5ffd911d89498c22dd064 Mon Sep 17 00:00:00 2001 | 1 | From 6ebd9de3505be0965cfc37e2e4d0d882d75f0ec2 Mon Sep 17 00:00:00 2001 |
2 | From: Mark Hatle <mark.hatle@windriver.com> | 2 | From: Mark Hatle <mark.hatle@windriver.com> |
3 | Date: Wed, 21 Sep 2011 20:55:33 -0500 | 3 | Date: Wed, 21 Sep 2011 20:55:33 -0500 |
4 | Subject: [PATCH] Lib/cgi.py: Update the script as mentioned in the comment | 4 | Subject: [PATCH] Lib/cgi.py: Update the script as mentioned in the comment |
@@ -6,7 +6,6 @@ Subject: [PATCH] Lib/cgi.py: Update the script as mentioned in the comment | |||
6 | Upstream-Status: Inappropriate [distribution] | 6 | Upstream-Status: Inappropriate [distribution] |
7 | 7 | ||
8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 8 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
9 | |||
10 | --- | 9 | --- |
11 | Lib/cgi.py | 11 +---------- | 10 | Lib/cgi.py | 11 +---------- |
12 | 1 file changed, 1 insertion(+), 10 deletions(-) | 11 | 1 file changed, 1 insertion(+), 10 deletions(-) |
diff --git a/meta/recipes-devtools/python/python3/crosspythonpath.patch b/meta/recipes-devtools/python/python3/crosspythonpath.patch index 2c4aef0511..24268fb91a 100644 --- a/meta/recipes-devtools/python/python3/crosspythonpath.patch +++ b/meta/recipes-devtools/python/python3/crosspythonpath.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 5b66463c10fec1440e977d5a21a0167862d6d79c Mon Sep 17 00:00:00 2001 | 1 | From 0bcdb84db7801507b155a40db2228ba516edeb73 Mon Sep 17 00:00:00 2001 |
2 | From: Ricardo Ribalda <ricardo@ribalda.com> | 2 | From: Ricardo Ribalda <ricardo@ribalda.com> |
3 | Date: Tue, 18 Nov 2014 03:35:33 -0500 | 3 | Date: Tue, 18 Nov 2014 03:35:33 -0500 |
4 | Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for | 4 | Subject: [PATCH] configure.ac: add CROSSPYTHONPATH into PYTHONPATH for |
@@ -14,13 +14,12 @@ Upstream-Status: Inappropriate [OE-Core integration specific] | |||
14 | Credits-to: Mark Hatle <mark.hatle@windriver.com> | 14 | Credits-to: Mark Hatle <mark.hatle@windriver.com> |
15 | Credits-to: Jackie Huang <jackie.huang@windriver.com> | 15 | Credits-to: Jackie Huang <jackie.huang@windriver.com> |
16 | Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> | 16 | Signed-off-by: Ricardo Ribalda <ricardo@ribalda.com> |
17 | |||
18 | --- | 17 | --- |
19 | configure.ac | 2 +- | 18 | configure.ac | 2 +- |
20 | 1 file changed, 1 insertion(+), 1 deletion(-) | 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
21 | 20 | ||
22 | diff --git a/configure.ac b/configure.ac | 21 | diff --git a/configure.ac b/configure.ac |
23 | index cb9e198..d81c19a 100644 | 22 | index 955daad..6e465a4 100644 |
24 | --- a/configure.ac | 23 | --- a/configure.ac |
25 | +++ b/configure.ac | 24 | +++ b/configure.ac |
26 | @@ -165,7 +165,7 @@ AC_ARG_WITH([build-python], | 25 | @@ -165,7 +165,7 @@ AC_ARG_WITH([build-python], |
diff --git a/meta/recipes-devtools/python/python3/deterministic_imports.patch b/meta/recipes-devtools/python/python3/deterministic_imports.patch index 2de6ae2e98..9bfdf5cd47 100644 --- a/meta/recipes-devtools/python/python3/deterministic_imports.patch +++ b/meta/recipes-devtools/python/python3/deterministic_imports.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 039d5e652796b55f1132afa568c7432b6ed89afd Mon Sep 17 00:00:00 2001 | 1 | From 1d6f0f5f8a1279fc9bc06266caa3f3b6f234c4cb Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Fri, 27 May 2022 17:05:44 +0100 | 3 | Date: Fri, 27 May 2022 17:05:44 +0100 |
4 | Subject: [PATCH] python3: Ensure stale empty python module directories don't | 4 | Subject: [PATCH] python3: Ensure stale empty python module directories don't |
@@ -13,13 +13,12 @@ As a result, patch this to a behaviour which works for us. | |||
13 | 13 | ||
14 | Upstream-Status: Submitted [https://github.com/python/cpython/issues/120492; need to first talk to upstream to see if they'll take one or both fixes] | 14 | Upstream-Status: Submitted [https://github.com/python/cpython/issues/120492; need to first talk to upstream to see if they'll take one or both fixes] |
15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 15 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
16 | |||
17 | --- | 16 | --- |
18 | Lib/importlib/metadata/__init__.py | 9 ++++++++- | 17 | Lib/importlib/metadata/__init__.py | 9 ++++++++- |
19 | 1 file changed, 8 insertions(+), 1 deletion(-) | 18 | 1 file changed, 8 insertions(+), 1 deletion(-) |
20 | 19 | ||
21 | diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py | 20 | diff --git a/Lib/importlib/metadata/__init__.py b/Lib/importlib/metadata/__init__.py |
22 | index 82e0ce1..969cac4 100644 | 21 | index e6ca178..ac5a75b 100644 |
23 | --- a/Lib/importlib/metadata/__init__.py | 22 | --- a/Lib/importlib/metadata/__init__.py |
24 | +++ b/Lib/importlib/metadata/__init__.py | 23 | +++ b/Lib/importlib/metadata/__init__.py |
25 | @@ -710,7 +710,14 @@ class Lookup: | 24 | @@ -710,7 +710,14 @@ class Lookup: |
diff --git a/meta/recipes-devtools/python/python3/makerace.patch b/meta/recipes-devtools/python/python3/makerace.patch index c1b20703e6..fbe12a5fca 100644 --- a/meta/recipes-devtools/python/python3/makerace.patch +++ b/meta/recipes-devtools/python/python3/makerace.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9f827c29adbe656af3c8fc963fdd8f47aec0c442 Mon Sep 17 00:00:00 2001 | 1 | From be22dd9b091af8f971f924fdbce5b439d9b2e850 Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Tue, 13 Jul 2021 23:19:29 +0100 | 3 | Date: Tue, 13 Jul 2021 23:19:29 +0100 |
4 | Subject: [PATCH] python3: Fix make race | 4 | Subject: [PATCH] python3: Fix make race |
@@ -17,10 +17,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | |||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
18 | 18 | ||
19 | diff --git a/Makefile.pre.in b/Makefile.pre.in | 19 | diff --git a/Makefile.pre.in b/Makefile.pre.in |
20 | index 381feb0..77bf09a 100644 | 20 | index dce36a5..2d235d2 100644 |
21 | --- a/Makefile.pre.in | 21 | --- a/Makefile.pre.in |
22 | +++ b/Makefile.pre.in | 22 | +++ b/Makefile.pre.in |
23 | @@ -2250,7 +2250,7 @@ COMPILEALL_OPTS=-j0 | 23 | @@ -2267,7 +2267,7 @@ COMPILEALL_OPTS=-j0 |
24 | TEST_MODULES=@TEST_MODULES@ | 24 | TEST_MODULES=@TEST_MODULES@ |
25 | 25 | ||
26 | .PHONY: libinstall | 26 | .PHONY: libinstall |
diff --git a/meta/recipes-devtools/python/python3/python3-manifest.json b/meta/recipes-devtools/python/python3/python3-manifest.json index 46092d4004..292c5bbc5d 100644 --- a/meta/recipes-devtools/python/python3/python3-manifest.json +++ b/meta/recipes-devtools/python/python3/python3-manifest.json | |||
@@ -216,7 +216,7 @@ | |||
216 | }, | 216 | }, |
217 | "core": { | 217 | "core": { |
218 | "summary": "Python interpreter and core modules", | 218 | "summary": "Python interpreter and core modules", |
219 | "rdepends": [], | 219 | "rdepends": ["compression"], |
220 | "files": [ | 220 | "files": [ |
221 | "${bindir}/python${PYTHON_MAJMIN}", | 221 | "${bindir}/python${PYTHON_MAJMIN}", |
222 | "${bindir}/python${PYTHON_MAJMIN}.real", | 222 | "${bindir}/python${PYTHON_MAJMIN}.real", |
diff --git a/meta/recipes-devtools/python/python3_3.12.6.bb b/meta/recipes-devtools/python/python3_3.12.11.bb index ae69f0e781..706dabb5cd 100644 --- a/meta/recipes-devtools/python/python3_3.12.6.bb +++ b/meta/recipes-devtools/python/python3_3.12.11.bb | |||
@@ -29,7 +29,6 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ | |||
29 | file://0001-Update-test_sysconfig-for-posix_user-purelib.patch \ | 29 | file://0001-Update-test_sysconfig-for-posix_user-purelib.patch \ |
30 | file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ | 30 | file://0001-skip-no_stdout_fileno-test-due-to-load-variability.patch \ |
31 | file://0001-test_storlines-skip-due-to-load-variability.patch \ | 31 | file://0001-test_storlines-skip-due-to-load-variability.patch \ |
32 | file://0001-gh-114492-Initialize-struct-termios-before-calling-t.patch \ | ||
33 | file://0001-test_shutdown-skip-problematic-test.patch \ | 32 | file://0001-test_shutdown-skip-problematic-test.patch \ |
34 | file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ | 33 | file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \ |
35 | file://0001-test_deadlock-skip-problematic-test.patch \ | 34 | file://0001-test_deadlock-skip-problematic-test.patch \ |
@@ -41,7 +40,7 @@ SRC_URI:append:class-native = " \ | |||
41 | file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ | 40 | file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \ |
42 | " | 41 | " |
43 | 42 | ||
44 | SRC_URI[sha256sum] = "1999658298cf2fb837dffed8ff3c033ef0c98ef20cf73c5d5f66bed5ab89697c" | 43 | SRC_URI[sha256sum] = "c30bb24b7f1e9a19b11b55a546434f74e739bb4c271a3e3a80ff4380d49f7adb" |
45 | 44 | ||
46 | # exclude pre-releases for both python 2.x and 3.x | 45 | # exclude pre-releases for both python 2.x and 3.x |
47 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" | 46 | UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar" |