diff mbox series

[meta-python,wrynose] python3-django: upgrade 5.2.16 -> 5.2.17

Message ID 20260826162758.3827104-1-dkelaiya@cisco.com
State New
Headers show
Series [meta-python,wrynose] python3-django: upgrade 5.2.16 -> 5.2.17 | expand

Commit Message

From: Ankur Tyagi <ankur.tyagi85@gmail.com>

Release Notes:
https://docs.djangoproject.com/en/dev/releases/5.2.17/

CVE: CVE-2026-15307 CVE-2026-15337 CVE-2026-15830 CVE-2026-15920

Backport Changes:
- Django 5.2.17 requires setuptools >= 83, the first
  upstream release containing the fix [1]. Wrynose provides
  setuptools 82.0.1 with that fix backported, so retain the
  previous build requirement.

[1] https://github.com/pypa/setuptools/commit/dd9f436a36486b4cb8a4c70a2321548b0be09b8f

Signed-off-by: Ankur Tyagi <ankur.tyagi85@gmail.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
(cherry picked from commit 8a4bf31e7fd3be6e2ecbb0a4299de2316d4ae782)
Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
---
 ...project-lower-setuptools-requirement.patch | 28 +++++++++++++++++++
 .../python/python3-django_5.2.16.bb           |  5 ----
 .../python/python3-django_5.2.17.bb           |  6 ++++
 3 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 meta-python/recipes-devtools/python/python3-django/0001-pyproject-lower-setuptools-requirement.patch
 delete mode 100644 meta-python/recipes-devtools/python/python3-django_5.2.16.bb
 create mode 100644 meta-python/recipes-devtools/python/python3-django_5.2.17.bb
diff mbox series

Patch

diff --git a/meta-python/recipes-devtools/python/python3-django/0001-pyproject-lower-setuptools-requirement.patch b/meta-python/recipes-devtools/python/python3-django/0001-pyproject-lower-setuptools-requirement.patch
new file mode 100644
index 0000000000..fa4e087b6b
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django/0001-pyproject-lower-setuptools-requirement.patch
@@ -0,0 +1,28 @@ 
+From 7a05df92b0820675803a5e8e73d20b9453538d68 Mon Sep 17 00:00:00 2001
+From: Darsh Kelaiya <dkelaiya@cisco.com>
+Date: Fri, 21 Aug 2026 00:20:00 -0700
+Subject: [PATCH] pyproject.toml: lower setuptools requirement for Wrynose
+
+Django 5.2.17 requires setuptools >= 83, the first upstream release
+containing the fix for [1]. Wrynose provides setuptools 82.0.1
+with upstream commit dd9f436 backported, so retain the previous build
+requirement.
+
+[1] https://github.com/pypa/setuptools/security/advisories/GHSA-h35f-9h28-mq5c
+
+Upstream-Status: Inappropriate [Wrynose-specific toolchain compatibility]
+
+Signed-off-by: Darsh Kelaiya <dkelaiya@cisco.com>
+---
+ pyproject.toml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pyproject.toml b/pyproject.toml
+index b2327d6..e2d8244 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,3 +1,3 @@
+ [build-system]
+-requires = ["setuptools>=83"]
++requires = ["setuptools>=77.0.3"]
+ build-backend = "setuptools.build_meta"
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.16.bb b/meta-python/recipes-devtools/python/python3-django_5.2.16.bb
deleted file mode 100644
index 2629ff3714..0000000000
--- a/meta-python/recipes-devtools/python/python3-django_5.2.16.bb
+++ /dev/null
@@ -1,5 +0,0 @@ 
-require python3-django.inc
-inherit python_setuptools_build_meta
-
-SRC_URI += "file://0001-fix-test_msgfmt_error_including_non_ascii-test.patch"
-SRC_URI[sha256sum] = "59ea02020c3136fce14bef0bbece21a10a4febef5eed1c51c22ae468efa22200"
diff --git a/meta-python/recipes-devtools/python/python3-django_5.2.17.bb b/meta-python/recipes-devtools/python/python3-django_5.2.17.bb
new file mode 100644
index 0000000000..7f4ed2c92e
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-django_5.2.17.bb
@@ -0,0 +1,6 @@ 
+require python3-django.inc
+inherit python_setuptools_build_meta
+
+SRC_URI += "file://0001-fix-test_msgfmt_error_including_non_ascii-test.patch \
+            file://0001-pyproject-lower-setuptools-requirement.patch"
+SRC_URI[sha256sum] = "9d4d93be539a18ab80d058eb515900e10951e04c537c5a6b394fc49528d3251f"