python3-packaging: 21.0 -> 21.2

4 files changed, 51 insertions, 20 deletions

diff --git a/python3-packaging/.footprint b/python3-packaging/.footprint
index 99d7cf93c..913db43da 100644
--- a/python3-packaging/.footprint
+++ b/python3-packaging/.footprint
@@ -2,15 +2,18 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.9/
 drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/packaging-21.0-py3.9.egg-info/
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging-21.0-py3.9.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging-21.0-py3.9.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging-21.0-py3.9.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging-21.0-py3.9.egg-info/requires.txt
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging-21.0-py3.9.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/packaging/
+drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/packaging-21.2-py3.9.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging-21.2-py3.9.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging-21.2-py3.9.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging-21.2-py3.9.egg-info/requires.txt
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging-21.2-py3.9.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging-21.2-py3.9.egg-info/top_level.txt
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__about__.py
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__init__.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/_manylinux.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/markers.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/_musllinux.py
 drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/__about__.cpython-39.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/__about__.cpython-39.pyc
@@ -18,29 +21,26 @@ drwxr-xr-x	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/__init__.cpython-39.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/_manylinux.cpython-39.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/_manylinux.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/_musllinux.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/_musllinux.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/_structures.cpython-39.opt-1.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/_structures.cpython-39.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/markers.cpython-39.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/markers.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/_musllinux.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/_musllinux.cpython-39.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/requirements.cpython-39.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/requirements.cpython-39.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/specifiers.cpython-39.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/specifiers.cpython-39.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/_structures.cpython-39.opt-1.pyc
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/_structures.cpython-39.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/tags.cpython-39.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/tags.cpython-39.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/utils.cpython-39.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/utils.cpython-39.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/version.cpython-39.opt-1.pyc
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/__pycache__/version.cpython-39.pyc
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/_manylinux.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/_musllinux.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/_structures.py
--rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/markers.py
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/py.typed (EMPTY)
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/requirements.py
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/specifiers.py
+-rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/_structures.py
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/tags.py
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/utils.py
 -rw-r--r--	root/root	usr/lib/python3.9/site-packages/packaging/version.py
diff --git a/python3-packaging/.signature b/python3-packaging/.signature
index 9f0160457..b500c4f57 100644
--- a/python3-packaging/.signature
+++ b/python3-packaging/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/RL8DI3GyPIujTyeh2GAvMXzdqELqVOeCjMCEGdNqnmroFFK85K/GlII1gcRnHCSqXDB4a4szaMGTjBduhIrZQ4=
-SHA256 (Pkgfile) = 047908e46c79542139683e810adb23a149945841446d62dde83387e237007cd5
-SHA256 (.footprint) = e4d9b779d4d2ec061d6e49ab808fbca9938a252a0286a1357d63356facceb47c
-SHA256 (packaging-21.0.tar.gz) = 7dc96269f53a4ccec5c0670940a4281106dd0bb343f47b7471f779df49c2fbe7
+RWSE3ohX2g5d/ZrjaKjYIz5t1sdl6niF6gBOWPUy7NLn1XsfjyLSv2B/o812MB6+TPwyRPb27wn5fwcolAc0uEiLMPNk9fnMVAQ=
+SHA256 (Pkgfile) = 2a099bf94014bfe02cce45af8aadbd2482df9495f6afdd9f54bba7563c8804a6
+SHA256 (.footprint) = 7acda6c507c0058e7b3a1dd9a4f42881399e847e78ba445e91bd7a74613e37f3
+SHA256 (packaging-21.2.tar.gz) = 096d689d78ca690e4cd8a89568ba06d07ca097e3306a4381635073ca91479966
+SHA256 (487.patch) = 16341e64b4d1f032c4e0eabfb976211bac3e0c4540948851bc8dfa7e5e60f94b
diff --git a/python3-packaging/487.patch b/python3-packaging/487.patch
new file mode 100644
index 000000000..372fed555
--- /dev/null
+++ b/python3-packaging/487.patch
@@ -0,0 +1,27 @@
+From 7547b3eb11c1df040b04d72fb27ac5156b2f2c42 Mon Sep 17 00:00:00 2001
+From: Rebecca Turner <rturner@starry.com>
+Date: Tue, 9 Nov 2021 11:48:44 -0500
+Subject: [PATCH] Fix marker parsing with pyparsing 3.0.5
+
+Closes #486
+
+Context in pyparsing: https://github.com/pyparsing/pyparsing/issues/110#issuecomment-963167729
+---
+ packaging/requirements.py | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/packaging/requirements.py b/packaging/requirements.py
+index 53f9a3aa..d7d7dd42 100644
+--- a/packaging/requirements.py
++++ b/packaging/requirements.py
+@@ -67,9 +67,7 @@ class InvalidRequirement(ValueError):
+ VERSION_SPEC.setParseAction(lambda s, l, t: t[1])
+ 
+ MARKER_EXPR = originalTextFor(MARKER_EXPR())("marker")
+-MARKER_EXPR.setParseAction(
+-    lambda s, l, t: Marker(s[t._original_start : t._original_end])
+-)
++MARKER_EXPR.addParseAction(lambda s, l, t: Marker(t[0]))
+ MARKER_SEPARATOR = SEMICOLON
+ MARKER = MARKER_SEPARATOR + MARKER_EXPR
+ 
diff --git a/python3-packaging/Pkgfile b/python3-packaging/Pkgfile
index ea8ff2bfa..1794a7d52 100644
--- a/python3-packaging/Pkgfile
+++ b/python3-packaging/Pkgfile
@@ -4,13 +4,16 @@
 # Depends on: python3-pyparsing python3-six
 
 name=python3-packaging
-version=21.0
+version=21.2
 release=1
-source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.tar.gz)
+source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.tar.gz
+	487.patch)
 
 build() {
 	cd ${name#*-}-$version
 
+	patch -Np1 -i $SRC/487.patch
+
 	/usr/bin/python3 setup.py build
 
 	/usr/bin/python3 setup.py install \