Skip to contentSkip to conversation

python3: Upgrade 3.12.5 -> 3.12.6

PATCH In review dchellam 3 participants 4 messages Sep 12, 2024

lore
Share & tools
lore

dchellam

author
#0 lore raw

PATCH 1/1 python3: Upgrade 3.12.5 -> 3.12.6

From: Divya Chellam <[email protected]>

Includes security fixes for CVE-2024-7592, CVE-2024-8088, CVE-2024-6232 and other bug fixes.

Removed below patches, as the fix is included in 3.12.6 upgrade:
1. CVE-2024-7592.patch
2. 0001-test_readline-skip-limited-history-test.patch

Release Notes:
https://www.python.org/downloads/release/python-3126/

---
 ...t_readline-skip-limited-history-test.patch |  41 ----
 .../python/python3/CVE-2024-7592.patch        | 231 ------------------
 .../{python3_3.12.5.bb => python3_3.12.6.bb}  |   4 +-
 3 files changed, 1 insertion(+), 275 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch
 delete mode 100644 meta/recipes-devtools/python/python3/CVE-2024-7592.patch
 rename meta/recipes-devtools/python/{python3_3.12.5.bb => python3_3.12.6.bb} (99%)
meta/recipes-devtools/python/python3/0001-test_readline-skip-limited-history-test.patch deleted +0 -41
deleted file mode 100644
index 50a4609f7a..0000000000
@@ -1,41 +0,0 @@
-From d9d916d5ea946c945323679d1709de1b87029b96 Mon Sep 17 00:00:00 2001
-From: Trevor Gamblin <[email protected]>
-Date: Tue, 13 Aug 2024 11:07:05 -0400
-Subject: [PATCH] test_readline: skip limited history test
-
-This test was added recently and is failing on the ptest image when
-using the default PACKAGECONFIG settings (i.e. with editline instead of
-readline).. Disable it until the proper fix is determined.
-
-A bug has been opened upstream: https://github.com/python/cpython/issues/123018
-
-Upstream-Status: Inappropriate [OE-specific]
-
-Signed-off-by: Trevor Gamblin <[email protected]>
----
- Lib/test/test_readline.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Lib/test/test_readline.py b/Lib/test/test_readline.py
-index 91fd7dd13f9..d81f9bf8eed 100644
---- a/Lib/test/test_readline.py
-+++ b/Lib/test/test_readline.py
-@@ -132,6 +132,7 @@ def test_nonascii_history(self):
-         self.assertEqual(readline.get_history_item(1), "entrée 1")
-         self.assertEqual(readline.get_history_item(2), "entrée 22")
- 
-+    @unittest.skip("Skipping problematic test")
-     def test_write_read_limited_history(self):
-         previous_length = readline.get_history_length()
-         self.addCleanup(readline.set_history_length, previous_length)
-@@ -349,6 +350,7 @@ def test_history_size(self):
-             self.assertEqual(len(lines), history_size)
-             self.assertEqual(lines[-1].strip(), b"last input")
- 
-+    @unittest.skip("Skipping problematic test")
-     def test_write_read_limited_history(self):
-         previous_length = readline.get_history_length()
-         self.addCleanup(readline.set_history_length, previous_length)
--- 
-2.39.2
-
meta/recipes-devtools/python/python3/CVE-2024-7592.patch deleted +0 -231

231 lines not on this page · raw message

meta/recipes-devtools/python/python3_3.12.6.bb renamed from meta/recipes-devtools/python/python3_3.12.5.bb +1 -3
similarity index 99%
rename from meta/recipes-devtools/python/python3_3.12.5.bb
rename to meta/recipes-devtools/python/python3_3.12.6.bb
index 29b02ef510..8c938554ed 100644
@@ -33,15 +33,13 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \
            file://0001-gh-107811-tarfile-treat-overflow-in-UID-GID-as-failu.patch \
 	   file://0001-test_deadlock-skip-problematic-test.patch \
 	   file://0001-test_active_children-skip-problematic-test.patch \
-           file://0001-test_readline-skip-limited-history-test.patch \
-           file://CVE-2024-7592.patch \
            "
 
 SRC_URI:append:class-native = " \
            file://0001-Lib-sysconfig.py-use-prefix-value-from-build-configu.patch \
            "
 
-SRC_URI[sha256sum] = "fa8a2e12c5e620b09f53e65bcd87550d2e5a1e2e04bf8ba991dcc55113876397"
+SRC_URI[sha256sum] = "1999658298cf2fb837dffed8ff3c033ef0c98ef20cf73c5d5f66bed5ab89697c"
 
 # exclude pre-releases for both python 2.x and 3.x
 UPSTREAM_CHECK_REGEX = "[Pp]ython-(?P<pver>\d+(\.\d+)+).tar"
Signature · 1 line
2.40.0
#1 lore raw
Quoted 9 lines · dchellam via lists.openembedded.org

From: Divya Chellam <[email protected]>

Includes security fixes for CVE-2024-7592, CVE-2024-8088, CVE-2024-6232 and other bug fixes.

Removed below patches, as the fix is included in 3.12.6 upgrade:
1. CVE-2024-7592.patch
2. 0001-test_readline-skip-limited-history-test.patch

Quoted 5 lines

Release Notes:
https://www.python.org/downloads/release/python-3126/

---

Unfortunately "0001-test_readline-skip-limited-history-test.patch" is still needed as it failed in testing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6985/steps/12/logs/stdio

Could you rebase that patch and resend with it included please?

Thanks,

Richard

#2 lore raw

Hi Divya,

Quoted 6 lines · Richard Purdie via lists.openembedded.org

Unfortunately "0001-test_readline-skip-limited-history-test.patch" is still needed as it failed in testing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6985/steps/12/logs/stdio

Could you rebase that patch and resend with it included please?

We’d really like this to be part of the next release which is scheduled to be built asap (like, Monday), so sending this revised patch promptly would be _much_ appreciated.

Cheers,
Ross

#3 lore raw
Quoted 7 lines · Ross Burton via lists.openembedded.org

Hi Divya,

Quoted 5 lines

On 12 Sep 2024, at 16:22, Richard Purdie via lists.openembedded.org <[email protected]> wrote:
Unfortunately "0001-test_readline-skip-limited-history-test.patch" is still needed as it failed in testing:

Quoted 7 lines
Quoted 3 lines

https://autobuilder.yoctoproject.org/typhoon/#/builders/81/builds/6985/steps/12/logs/stdio

Could you rebase that patch and resend with it included please?

We’d really like this to be part of the next release which is scheduled to be built asap (like, Monday), so sending this revised patch promptly would be _much_ appreciated.

As I'm worried about time pressures, I've tried refreshing that patch in master-next and am retesting...

Cheers,

Richard