summaryrefslogtreecommitdiffstats
path: root/meta-python
diff options
context:
space:
mode:
Diffstat (limited to 'meta-python')
-rw-r--r--meta-python/recipes-devtools/python/python3-django/0001-fix-ipv6-test.patch34
-rw-r--r--meta-python/recipes-devtools/python/python3-django_2.2.28.bb3
2 files changed, 36 insertions, 1 deletions
diff --git a/meta-python/recipes-devtools/python/python3-django/0001-fix-ipv6-test.patch b/meta-python/recipes-devtools/python/python3-django/0001-fix-ipv6-test.patch
new file mode 100644
index 0000000000..57f2a073cc
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django/0001-fix-ipv6-test.patch
@@ -0,0 +1,34 @@
1From b56516c12f05cf56e65cc960f865d5ebdae733e2 Mon Sep 17 00:00:00 2001
2From: Gyorgy Sarvari <skandigraun@gmail.com>
3Date: Wed, 14 Jan 2026 11:05:36 +0100
4Subject: [PATCH] fix ipv6 test
5
6During backporting a patch for CVE-2024-56374, an import got into
7the patch for v2.2.28 that does not exist yet in that version.
8
9This patch handles this import with a fallback to prevent throwing
10and ImportError.
11
12Upstream-Status: Inappropriate [Backport specific]
13Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
14---
15 tests/utils_tests/test_ipv6.py | 6 ++++--
16 1 file changed, 4 insertions(+), 2 deletions(-)
17
18diff --git a/tests/utils_tests/test_ipv6.py b/tests/utils_tests/test_ipv6.py
19index 1ac6763..3b21948 100644
20--- a/tests/utils_tests/test_ipv6.py
21+++ b/tests/utils_tests/test_ipv6.py
22@@ -8,8 +8,10 @@ from django.utils.ipv6 import (
23 clean_ipv6_address,
24 is_valid_ipv6_address,
25 )
26-from django.utils.version import PY310
27-
28+try:
29+ from django.utils.version import PY310
30+except ImportError:
31+ PY310 = None
32
33 class TestUtilsIPv6(SimpleTestCase):
34
diff --git a/meta-python/recipes-devtools/python/python3-django_2.2.28.bb b/meta-python/recipes-devtools/python/python3-django_2.2.28.bb
index 3b5491cd5e..3dd64a5507 100644
--- a/meta-python/recipes-devtools/python/python3-django_2.2.28.bb
+++ b/meta-python/recipes-devtools/python/python3-django_2.2.28.bb
@@ -36,7 +36,8 @@ SRC_URI += "file://CVE-2023-31047.patch \
36 file://Fix-missing-JSONField-in-django.db.mo.patch \ 36 file://Fix-missing-JSONField-in-django.db.mo.patch \
37 file://0001-Fixed-35172-Fixed-intcomma-for-string-floats.patch \ 37 file://0001-Fixed-35172-Fixed-intcomma-for-string-floats.patch \
38 file://0001-implement-group-method-for-FakeMatch.patch \ 38 file://0001-implement-group-method-for-FakeMatch.patch \
39 " 39 file://0001-fix-ipv6-test.patch \
40 "
40 41
41SRC_URI[sha256sum] = "0200b657afbf1bc08003845ddda053c7641b9b24951e52acd51f6abda33a7413" 42SRC_URI[sha256sum] = "0200b657afbf1bc08003845ddda053c7641b9b24951e52acd51f6abda33a7413"
42 43