python-twisted: Update to 22.10.0

Includes fix for CVE-2022-39348 (NameVirtualHost Host header injection).

This adds a build dependency that will be required for
pyproject.toml-based builds.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit 56b10770fc0741c79b697e9954b27090a4560a9a)

diff --git a/lang/python/python-twisted/Makefile b/lang/python/python-twisted/Makefile
index 8c78b028452bfcb43ddb9dfc2324bffe07e7c4a6..1b54cb0c47d7969f8227fccace0a81551298cb43 100644 (file)
--- a/lang/python/python-twisted/Makefile
+++ b/lang/python/python-twisted/Makefile
@@ -1,5 +1,6 @@
 #
-# Copyright (C) 2006-2011, 2015-2018 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2015-2016, 2018-2023 Jeffery To
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,11 +9,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=python-twisted
-PKG_VERSION:=22.4.0
+PKG_VERSION:=22.10.0
 PKG_RELEASE:=1
 
 PYPI_NAME:=Twisted
-PKG_HASH:=a047990f57dfae1e0bd2b7df2526d4f16dcdc843774dc108b78c52f2a5f13680
+PKG_HASH:=32acbd40a94f5f46e7b42c109bfae2b302250945561783a8b7a059048f2d4d31
 
 PKG_BUILD_DEPENDS:=libtirpc
 
@@ -21,6 +22,8 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
 PKG_CPE_ID:=cpe:/a:twistedmatrix:twisted
 
+PKG_BUILD_DEPENDS:=python-incremental/host
+
 include ../pypi.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python3-package.mk
@@ -39,9 +42,9 @@ define Package/python3-twisted
       +python3-bcrypt \
       +python3-constantly \
       +python3-cryptography \
+      +python3-hyperlink \
       +python3-idna \
       +python3-incremental \
-      +python3-hyperlink \
       +python3-pkg-resources \
       +python3-pyasn1 \
       +python3-pyopenssl \

diff --git a/lang/python/python-twisted/patches/001-omit-tkconch.patch b/lang/python/python-twisted/patches/001-omit-tkconch.patch
index 2a913ece9d9d3acf9a3655de07488df2cc34a5db..a1a37771b226ad24147c49c3675c2deb7f1a413b 100644 (file)
--- a/lang/python/python-twisted/patches/001-omit-tkconch.patch
+++ b/lang/python/python-twisted/patches/001-omit-tkconch.patch
@@ -1,6 +1,6 @@
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -112,7 +112,6 @@ console_scripts =
+@@ -115,7 +115,6 @@ console_scripts =
        conch = twisted.conch.scripts.conch:run
        mailmail = twisted.mail.scripts.mailmail:run
        pyhtmlizer = twisted.scripts.htmlizer:run

diff --git a/lang/python/python-twisted/patches/002-omit-tests.patch b/lang/python/python-twisted/patches/002-omit-tests.patch
index 08507c3909f609500c28b74976fb6417818c2c59..3ec59fd484b88eb47050377834c7349fc516ed5c 100644 (file)
--- a/lang/python/python-twisted/patches/002-omit-tests.patch
+++ b/lang/python/python-twisted/patches/002-omit-tests.patch
@@ -1,6 +1,6 @@
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -104,6 +104,9 @@ mypy =
+@@ -107,6 +107,9 @@ mypy =
  
  [options.packages.find]
  where = src
@@ -10,7 +10,7 @@
  
  [options.entry_points]
  console_scripts = 
-@@ -123,6 +126,7 @@ console_scripts =
+@@ -126,6 +129,7 @@ console_scripts =
        *.pxi
        *.pyx
        build.bat