From 28bca99ba4eeb87e297b9166a881be2a2425873d Mon Sep 17 00:00:00 2001 From: Wei-Ting Yang Date: Mon, 8 Dec 2025 21:33:02 +0800 Subject: [PATCH] python-urllib3: update to 2.6.1 Fix CVE-2025-66418 and CVE-2025-66471. Full release notes: https://github.com/urllib3/urllib3/releases/tag/2.6.0 https://github.com/urllib3/urllib3/releases/tag/2.6.1 Drop 001-setuptools-scm-upper-limit.patch as upstream now supports setuptools-scm v9.x. Signed-off-by: Wei-Ting Yang (cherry picked from commit 495e4e92874300589304a624b78e0162a0dee46b) --- lang/python/python-urllib3/Makefile | 8 +++---- .../001-setuptools-scm-upper-limit.patch | 24 ------------------- 2 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 lang/python/python-urllib3/patches/001-setuptools-scm-upper-limit.patch diff --git a/lang/python/python-urllib3/Makefile b/lang/python/python-urllib3/Makefile index 9595ae6c1d..d2772022f1 100644 --- a/lang/python/python-urllib3/Makefile +++ b/lang/python/python-urllib3/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2017 OpenWrt.org +# Copyright (C) 2007-2025 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-urllib3 -PKG_VERSION:=2.5.0 -PKG_RELEASE:=2 +PKG_VERSION:=2.6.1 +PKG_RELEASE:=1 PKG_MAINTAINER:=Josef Schlehofer PKG_LICENSE:=MIT @@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=LICENSE.txt PKG_CPE_ID:=cpe:/a:python:urllib3 PYPI_NAME:=urllib3 -PKG_HASH:=3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760 +PKG_HASH:=5379eb6e1aba4088bae84f8242960017ec8d8e3decf30480b3a1abdaa9671a3f PKG_BUILD_DEPENDS:= \ python-hatch-vcs/host \ diff --git a/lang/python/python-urllib3/patches/001-setuptools-scm-upper-limit.patch b/lang/python/python-urllib3/patches/001-setuptools-scm-upper-limit.patch deleted file mode 100644 index d8dd73701e..0000000000 --- a/lang/python/python-urllib3/patches/001-setuptools-scm-upper-limit.patch +++ /dev/null @@ -1,24 +0,0 @@ -From ea61320386d57d5654307fb19314c1bb17ceb0e8 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin -Date: Mon, 22 Sep 2025 10:37:58 -0400 -Subject: [PATCH] pyproject.toml: change setuptools-scm upper limit - -setuptools-scm version 9.2.0 is now available, so change the upper limit -specified in dependencies. - -Signed-off-by: Trevor Gamblin - -Backport to v2.5.0 for OpenWrt - -Signed-off-by: Austin Lane ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -1,7 +1,7 @@ - # This file is protected via CODEOWNERS - - [build-system] --requires = ["hatchling>=1.6.0,<2", "hatch-vcs>=0.4.0,<0.6.0", "setuptools-scm>=8,<9"] -+requires = ["hatchling>=1.6.0,<2", "hatch-vcs>=0.4.0,<0.6.0", "setuptools-scm>=8,<10"] - build-backend = "hatchling.build" - - [project]