From a034b038fddbc01e82b272601d8f244035e117bb Mon Sep 17 00:00:00 2001
From: daniel <daniel@openbsd.org>
Date: Wed, 18 Jan 2023 01:24:39 +0000
Subject: [PATCH] update py-slixmpp to 1.8.3

This update includes a fix for CVE-2022-45197.

ok kmos@ (MAINTAINER)
---
 net/py-slixmpp/Makefile               | 11 ++---
 net/py-slixmpp/distinfo               |  4 +-
 net/py-slixmpp/patches/patch-setup_py |  2 +-
 net/py-slixmpp/pkg/DESCR              |  2 +-
 net/py-slixmpp/pkg/PLIST              | 62 +++++++++++++++++++++++++--
 5 files changed, 69 insertions(+), 12 deletions(-)

diff --git a/net/py-slixmpp/Makefile b/net/py-slixmpp/Makefile
index e1c592472fe..6a6dae1e18d 100644
--- a/net/py-slixmpp/Makefile
+++ b/net/py-slixmpp/Makefile
@@ -1,10 +1,9 @@
 COMMENT =		slixmpp is an elegant Python library for XMPP
 
-MODPY_EGG_VERSION =	1.8.2
+MODPY_EGG_VERSION =	1.8.3
 DISTNAME =		slixmpp-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		net
-REVISION =		0
 
 MAINTAINER =		Kurt Mosiejczuk <kmos@openbsd.org>
 
@@ -13,16 +12,18 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 
-MODPY_PI =		Yes
-MODPY_PYBUILD =		setuptools
-
 FLAVORS =		python3
 FLAVOR =		python3
 
+MODPY_PI =		Yes
+MODPY_PYBUILD =		setuptools
+MODPY_PYTEST =		Yes
+
 RUN_DEPENDS =		devel/py-asn1${MODPY_FLAVOR} \
 			devel/py-asn1-modules${MODPY_FLAVOR} \
 			net/py-aiodns${MODPY_FLAVOR} \
 			www/py-aiohttp${MODPY_FLAVOR}
+
 TEST_DEPENDS =		security/gnupg
 
 .include <bsd.port.mk>
diff --git a/net/py-slixmpp/distinfo b/net/py-slixmpp/distinfo
index 8c0117a66fc..ec35239f55e 100644
--- a/net/py-slixmpp/distinfo
+++ b/net/py-slixmpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (slixmpp-1.8.2.tar.gz) = U7lD2iVy2gS5Ktop4PVKg+cUbIg4MJt+m6tH5aOb1Y4=
-SIZE (slixmpp-1.8.2.tar.gz) = 535672
+SHA256 (slixmpp-1.8.3.tar.gz) = rJtZqq7tZ/VFk4fMpDZYyTQRa1Pokmn2aw6LA+FBGXw=
+SIZE (slixmpp-1.8.3.tar.gz) = 1053891
diff --git a/net/py-slixmpp/patches/patch-setup_py b/net/py-slixmpp/patches/patch-setup_py
index 1bf7a06e261..cc2cb5a2b47 100644
--- a/net/py-slixmpp/patches/patch-setup_py
+++ b/net/py-slixmpp/patches/patch-setup_py
@@ -3,7 +3,7 @@ Disable cython/libidn optional dep.
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -61,7 +61,7 @@ HAS_PYTHON_HEADERS = check_include('python3', 'Python.
+@@ -63,7 +63,7 @@ HAS_PYTHON_HEADERS = check_include('python3', 'Python.
  HAS_STRINGPREP_HEADERS = check_include('libidn', 'stringprep.h')
  
  ext_modules = None
diff --git a/net/py-slixmpp/pkg/DESCR b/net/py-slixmpp/pkg/DESCR
index 50a34dd9ec2..d67494c8568 100644
--- a/net/py-slixmpp/pkg/DESCR
+++ b/net/py-slixmpp/pkg/DESCR
@@ -1,4 +1,4 @@
-Slixmpp is an MIT licensed XMPP library for Python 3.4+. It is a fork of
+Slixmpp is an MIT licensed XMPP library for Python 3.7+. It is a fork of
 SleekXMPP.
 
 Slixmpp's goals is to only rewrite the core of the library (the low level
diff --git a/net/py-slixmpp/pkg/PLIST b/net/py-slixmpp/pkg/PLIST
index 446e38982dc..549153e8320 100644
--- a/net/py-slixmpp/pkg/PLIST
+++ b/net/py-slixmpp/pkg/PLIST
@@ -107,6 +107,40 @@ lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_rosterver/${MO
 lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_rosterver/${MODPY_PYCACHE}stanza.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_rosterver/rosterver.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_rosterver/stanza.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/${MODPY_PYCACHE}mechanisms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/${MODPY_PYCACHE}mechanisms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/mechanisms.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}abort.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}abort.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}challenge.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}challenge.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}failure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}failure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}mechanisms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}mechanisms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}response.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}response.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}success.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/${MODPY_PYCACHE}success.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/abort.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/auth.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/challenge.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/failure.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/mechanisms.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/response.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_sasl2mechanisms/stanza/success.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_session/
 lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_session/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/features/feature_session/${MODPY_PYCACHE}/
@@ -410,6 +444,17 @@ lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0054/${MODPY_PYCACH
 lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0054/${MODPY_PYCACHE}vcard_temp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0054/stanza.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0054/vcard_temp.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0055/
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0055/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0055/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0055/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0055/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0055/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0055/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0055/${MODPY_PYCACHE}stanza.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0055/${MODPY_PYCACHE}stanza.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0055/search.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0055/stanza.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0059/
 lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0059/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0059/${MODPY_PYCACHE}/
@@ -1348,6 +1393,17 @@ lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0454/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0454/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0454/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0454/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0461/
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0461/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0461/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0461/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0461/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0461/${MODPY_PYCACHE}reply.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0461/${MODPY_PYCACHE}reply.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0461/${MODPY_PYCACHE}stanza.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0461/${MODPY_PYCACHE}stanza.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0461/reply.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/plugins/xep_0461/stanza.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/pluginsdict.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/py.typed
 lib/python${MODPY_VERSION}/site-packages/slixmpp/roster/
@@ -1387,6 +1443,8 @@ lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/${MODPY_PYCACHE}rootstan
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/${MODPY_PYCACHE}rootstanza.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/${MODPY_PYCACHE}roster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/${MODPY_PYCACHE}starttls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/${MODPY_PYCACHE}starttls.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/${MODPY_PYCACHE}stream_error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/${MODPY_PYCACHE}stream_error.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/${MODPY_PYCACHE}stream_features.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1400,6 +1458,7 @@ lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/message.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/presence.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/rootstanza.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/roster.py
+lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/starttls.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/stream_error.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stanza/stream_features.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/stringprep.py
@@ -1427,12 +1486,9 @@ lib/python${MODPY_VERSION}/site-packages/slixmpp/thirdparty/${MODPY_PYCACHE}__in
 lib/python${MODPY_VERSION}/site-packages/slixmpp/thirdparty/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/slixmpp/thirdparty/${MODPY_PYCACHE}gnupg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/slixmpp/thirdparty/${MODPY_PYCACHE}gnupg.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/slixmpp/thirdparty/${MODPY_PYCACHE}mini_dateutil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
-lib/python${MODPY_VERSION}/site-packages/slixmpp/thirdparty/${MODPY_PYCACHE}mini_dateutil.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/slixmpp/thirdparty/${MODPY_PYCACHE}orderedset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/slixmpp/thirdparty/${MODPY_PYCACHE}orderedset.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/slixmpp/thirdparty/gnupg.py
-lib/python${MODPY_VERSION}/site-packages/slixmpp/thirdparty/mini_dateutil.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/thirdparty/orderedset.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/types.py
 lib/python${MODPY_VERSION}/site-packages/slixmpp/util/