diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index e06151c93cdde..7c9e38290e164 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -1,5 +1,6 @@ PORTNAME= salt -PORTVERSION= 3007.0 +PORTVERSION= 3006.7 +PORTREVISION= 2 CATEGORIES= sysutils python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo index 46f1e39327f58..bc2a237236abb 100644 --- a/sysutils/py-salt/distinfo +++ b/sysutils/py-salt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1711901921 -SHA256 (salt-3007.0.tar.gz) = 41bf84e71fc655bf8a4b52eb440d0621ae961096a086d20e132e1512e2eddff8 -SIZE (salt-3007.0.tar.gz) = 20304228 +TIMESTAMP = 1708611593 +SHA256 (salt-3006.7.tar.gz) = ed92d21b84eb9d479f93ba89468453408117e0dc1010614214999e8d0c210afd +SIZE (salt-3006.7.tar.gz) = 20562663 diff --git a/sysutils/py-salt/files/patch-requirements_base.txt b/sysutils/py-salt/files/patch-requirements_base.txt index 39918449c5029..bce755a71c509 100644 --- a/sysutils/py-salt/files/patch-requirements_base.txt +++ b/sysutils/py-salt/files/patch-requirements_base.txt @@ -1,10 +1,8 @@ ---- requirements/base.txt.orig 2024-03-31 16:19:43 UTC +--- requirements/base.txt.orig 2023-11-26 11:34:24 UTC +++ requirements/base.txt -@@ -15,7 +15,6 @@ aiohttp>=3.9.0 - - # We need contextvars for salt-ssh. - # Even on python versions which ships with contextvars in the standard library! +@@ -8,5 +8,3 @@ looseversion + psutil>=5.0.0 + packaging>=21.3 + looseversion +-# We need contextvars for salt-ssh -contextvars - - setproctitle>=1.2.3 - timelib>=0.2.5 diff --git a/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py b/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py new file mode 100644 index 0000000000000..4a163d2494749 --- /dev/null +++ b/sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py @@ -0,0 +1,10 @@ +--- salt/ext/tornado/iostream.py.orig 2023-05-16 11:50:28 UTC ++++ salt/ext/tornado/iostream.py +@@ -1116,6 +1116,7 @@ class IOStream(BaseIOStream): + future = self._connect_future = TracebackFuture() + try: + self.socket.connect(address) ++ self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 524288) + except socket.error as e: + # In non-blocking mode we expect connect() to raise an + # exception with EINPROGRESS or EWOULDBLOCK.