From nobody Thu Jun 22 13:48:14 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Qn1sp6fLgz4g9pB; Thu, 22 Jun 2023 13:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Qn1sp6CXNz49hy; Thu, 22 Jun 2023 13:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687441694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eh4KDjnGDGzc7ZCMGxWcNtuu0x1biOeDd3yZ1oVr5bg=; b=XERHmchsBCJBIKdTPQ6Rdvt3dvVK4dEE8HmHJRsB/ZCKoohQ3gtlMRIu2MhBDl2DCwkLJS 5rlLSdRnfKLN+Bkp+7niVfSLyTw1sgXGyz0O/jsNaAm1YCHwX+oVpo8LnGG8LgReNELp8M QZX085SBGb4lV6s0i5R55+HPL9au84qv6xUPGdw7IcOuKDL4QhUcj5bxOoapP8hB9UQoLx e6rVYYEDWdW6Ny2+Qdm8m05pay0Fd4cqm0kY8KO1loWkh+zpeUI32DxrbiCtg+8iG68yj3 nTAnR8QLNunM95+3JEPIMhw7mgqO9X0AmmVmw5ET1eDYTci+4Xgk+PTkqyjgDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687441694; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Eh4KDjnGDGzc7ZCMGxWcNtuu0x1biOeDd3yZ1oVr5bg=; b=c027Ys977u2qfVRdNRTGKBMXm1puTq6KIA1u4NkoznriHQYq9tWZfJxq0iNtIId7wqt1AY a3CMQ9CvgmI7T4r/r7IvOZdy5wMA8xSmcKwOpuTnJLbiQEpkbpG75bynBK4azikpSUCj/Q 0kiHhhNSE1r/HQvj+4T/HSwio6OlIhMlIgY1zSYq4g9HGAaRdXMp8B0eJNPJyB5Kvlxyha ryVcJnQhPBnnjxWXrolw7nFUs7o4IneE1NzrzJPPrlniARXYh6Ot2d7AL9RbluJaoArnh9 aaCzOvhR1Iib+KK4Z0iY3TW7cgWVax7AYcjG8w+hGcUmGMcaHoGX1nlrFZ1mlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687441694; a=rsa-sha256; cv=none; b=ffmXh+Y3XA9vb9LqJBN7Yt0EUXwFOdiBE85J9vayct3iFuJ9SjDSWUeSHfnIgj+LA2Z4eV cHW/w0Nfyu9UTgnczGeLxph93oTIAQeGRflrnvb/xKUYa8TEJJq5/qDD7BG5pf83LGSkzV ihoEhXhug3LRX76KUUijqO3SBejTP07AJaMUwnDd0f+ziavjj+0xGSCg7s3brQ620ULprL ydcqpUsE5Va5dty0XEG2ZgM1UyG+NOglh2VuEV3wigL+fshTJLFKpubpm0FGdESH3yKUDz FbSPcbcMDNoT1d3XZyHq7zmDuFQm77YZ4GQ28k3VJmvHRRpqPrdNpuD7KzzuCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Qn1sp57pszQYN; Thu, 22 Jun 2023 13:48:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35MDmEDS033173; Thu, 22 Jun 2023 13:48:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35MDmEXr033172; Thu, 22 Jun 2023 13:48:14 GMT (envelope-from git) Date: Thu, 22 Jun 2023 13:48:14 GMT Message-Id: <202306221348.35MDmEXr033172@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: a3d611120fcc - main - devel/py-setuptools{44,58}: fix CVE-2022-40897 backporting a patch List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a3d611120fccf3b51b3dc62ec9246588e7d7a8ac Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=a3d611120fccf3b51b3dc62ec9246588e7d7a8ac commit a3d611120fccf3b51b3dc62ec9246588e7d7a8ac Author: Eugene Grosbein AuthorDate: 2023-06-22 13:45:10 +0000 Commit: Eugene Grosbein CommitDate: 2023-06-22 13:45:10 +0000 devel/py-setuptools{44,58}: fix CVE-2022-40897 backporting a patch Follow recent commit to devel/py-setuptools and fix old versions same way. Reported-by: vishwin --- devel/py-setuptools44/Makefile | 1 + .../py-setuptools44/files/patch-setuptools_package__index.py | 11 +++++++++++ devel/py-setuptools58/Makefile | 2 +- .../py-setuptools58/files/patch-setuptools_package__index.py | 11 +++++++++++ security/vuxml/vuln/2023.xml | 2 ++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/devel/py-setuptools44/Makefile b/devel/py-setuptools44/Makefile index 673af0627c0b..cc1003bdc7f3 100644 --- a/devel/py-setuptools44/Makefile +++ b/devel/py-setuptools44/Makefile @@ -1,5 +1,6 @@ PORTNAME= setuptools PORTVERSION= 44.1.1 +PORTREVISION= 1 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-setuptools44/files/patch-setuptools_package__index.py b/devel/py-setuptools44/files/patch-setuptools_package__index.py new file mode 100644 index 000000000000..85b8319a0b09 --- /dev/null +++ b/devel/py-setuptools44/files/patch-setuptools_package__index.py @@ -0,0 +1,11 @@ +--- setuptools/package_index.py.orig 2022-07-04 02:25:25 UTC ++++ setuptools/package_index.py +@@ -197,7 +197,7 @@ def unique_values(func): + return wrapper + + +-REL = re.compile(r"""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I) ++REL = re.compile(r"""<([^>]*\srel\s{0,10}=\s{0,10}['"]?([^'" >]+)[^>]*)>""", re.I) + # this line is here to fix emacs' cruddy broken syntax highlighting + + diff --git a/devel/py-setuptools58/Makefile b/devel/py-setuptools58/Makefile index c6e1695a54d1..40e9a8c756d6 100644 --- a/devel/py-setuptools58/Makefile +++ b/devel/py-setuptools58/Makefile @@ -1,6 +1,6 @@ PORTNAME= setuptools PORTVERSION= 58.5.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-setuptools58/files/patch-setuptools_package__index.py b/devel/py-setuptools58/files/patch-setuptools_package__index.py new file mode 100644 index 000000000000..85b8319a0b09 --- /dev/null +++ b/devel/py-setuptools58/files/patch-setuptools_package__index.py @@ -0,0 +1,11 @@ +--- setuptools/package_index.py.orig 2022-07-04 02:25:25 UTC ++++ setuptools/package_index.py +@@ -197,7 +197,7 @@ def unique_values(func): + return wrapper + + +-REL = re.compile(r"""<([^>]*\srel\s*=\s*['"]?([^'">]+)[^>]*)>""", re.I) ++REL = re.compile(r"""<([^>]*\srel\s{0,10}=\s{0,10}['"]?([^'" >]+)[^>]*)>""", re.I) + # this line is here to fix emacs' cruddy broken syntax highlighting + + diff --git a/security/vuxml/vuln/2023.xml b/security/vuxml/vuln/2023.xml index 388fb3f656d9..5cd8ec24d829 100644 --- a/security/vuxml/vuln/2023.xml +++ b/security/vuxml/vuln/2023.xml @@ -2833,6 +2833,8 @@ py39-setuptools + 44.1.1 + 57.0.058.5.3_3 63.1.0_1