mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-14 05:49:57 +00:00
Code Issues Projects Releases Wiki Activity

python3-django: handle non-existing import from CVE patch

Browse Source 
This change is for python3-django_2.2.28.

During backporting a patch for CVE-2024-56374, an import got into
the patch for v2.2.28 that does not exist yet in that version.

This patch handles this import with a fallback to prevent throwing
and ImportError.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
Gyorgy Sarvari
2026-01-15 09:29:10 +01:00
parent 2e331249b2
commit 6d3dcbce79
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-python/recipes-devtools/python/python3-django/0001-fix-ipv6-test.patch
+34
View File
@@ -0,0 +1,34 @@
From b56516c12f05cf56e65cc960f865d5ebdae733e2 Mon Sep 17 00:00:00 2001
From: Gyorgy Sarvari <skandigraun@gmail.com>
Date: Wed, 14 Jan 2026 11:05:36 +0100
Subject: [PATCH] fix ipv6 test
During backporting a patch for CVE-2024-56374, an import got into
the patch for v2.2.28 that does not exist yet in that version.
This patch handles this import with a fallback to prevent throwing
and ImportError.
Upstream-Status: Inappropriate [Backport specific]
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
tests/utils_tests/test_ipv6.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/utils_tests/test_ipv6.py b/tests/utils_tests/test_ipv6.py
index 1ac6763..3b21948 100644
--- a/tests/utils_tests/test_ipv6.py
+++ b/tests/utils_tests/test_ipv6.py
@@ -8,8 +8,10 @@ from django.utils.ipv6 import (
clean_ipv6_address,
is_valid_ipv6_address,
)
-from django.utils.version import PY310
-
+try:
+ from django.utils.version import PY310
+except ImportError:
+ PY310 = None
class TestUtilsIPv6(SimpleTestCase):
meta-python/recipes-devtools/python/python3-django_2.2.28.bb
+2 -1
View File
@@ -36,7 +36,8 @@ SRC_URI += "file://CVE-2023-31047.patch \
file://Fix-missing-JSONField-in-django.db.mo.patch \
file://0001-Fixed-35172-Fixed-intcomma-for-string-floats.patch \
file://0001-implement-group-method-for-FakeMatch.patch \
"
file://0001-fix-ipv6-test.patch \
"
SRC_URI[sha256sum] = "0200b657afbf1bc08003845ddda053c7641b9b24951e52acd51f6abda33a7413"