diff --git a/devel/py-configobj/Makefile b/devel/py-configobj/Makefile index 699f677cbc10..12071bb1e1e9 100644 --- a/devel/py-configobj/Makefile +++ b/devel/py-configobj/Makefile @@ -1,24 +1,23 @@ PORTNAME= configobj -PORTVERSION= 5.0.8 -PORTREVISION= 1 +PORTVERSION= 5.0.9 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= nivit@FreeBSD.org COMMENT= Simple but powerful config file reader and writer WWW= https://github.com/DiffSK/configobj/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>=0.40.0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} USES= python USE_PYTHON= autoplist pep517 NO_ARCH= yes .include diff --git a/devel/py-configobj/distinfo b/devel/py-configobj/distinfo index 0d44f2f716c8..9026735fceea 100644 --- a/devel/py-configobj/distinfo +++ b/devel/py-configobj/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681224723 -SHA256 (configobj-5.0.8.tar.gz) = 6f704434a07dc4f4dc7c9a745172c1cad449feb548febd9f7fe362629c627a97 -SIZE (configobj-5.0.8.tar.gz) = 38012 +TIMESTAMP = 1727008065 +SHA256 (configobj-5.0.9.tar.gz) = 03c881bbf23aa07bccf1b837005975993c4ab4427ba57f959afdd9d1a2386848 +SIZE (configobj-5.0.9.tar.gz) = 101518 diff --git a/devel/py-configobj/files/patch-src_configobj_validate.py b/devel/py-configobj/files/patch-src_configobj_validate.py deleted file mode 100644 index 72eb31a15105..000000000000 --- a/devel/py-configobj/files/patch-src_configobj_validate.py +++ /dev/null @@ -1,16 +0,0 @@ -From: cdcadman -Date: Wed, 17 May 2023 03:57:08 -0700 -Subject: Address CVE-2023-26112 ReDoS - -Origin: https://github.com/DiffSK/configobj/pull/236 ---- src/configobj/validate.py.orig 2023-01-18 22:28:31 UTC -+++ src/configobj/validate.py -@@ -541,7 +541,7 @@ class Validator(object): - """ - - # this regex does the initial parsing of the checks -- _func_re = re.compile(r'(.+?)\((.*)\)', re.DOTALL) -+ _func_re = re.compile(r'([^\(\)]+?)\((.*)\)', re.DOTALL) - - # this regex takes apart keyword arguments - _key_arg = re.compile(r'^([a-zA-Z_][a-zA-Z0-9_]*)\s*=\s*(.*)$', re.DOTALL)