git: 3f709481d44a - main - Revert "sysutils/py-salt: Update to 3007"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 28 Apr 2024 07:17:41 UTC
The branch main has been updated by krion:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3f709481d44af0b679e8688bfb6cde49728276e4
commit 3f709481d44af0b679e8688bfb6cde49728276e4
Author: Kirill Ponomarev <krion@FreeBSD.org>
AuthorDate: 2024-04-28 07:10:51 +0000
Commit: Kirill Ponomarev <krion@FreeBSD.org>
CommitDate: 2024-04-28 07:14:36 +0000
Revert "sysutils/py-salt: Update to 3007"
This reverts commit 4eb79f15c612dc1b91ae4156e75f95387136a806.
---
sysutils/py-salt/Makefile | 3 ++-
sysutils/py-salt/distinfo | 6 +++---
sysutils/py-salt/files/patch-requirements_base.txt | 14 ++++++--------
sysutils/py-salt/files/patch-salt_ext_tornado_iostream.py | 10 ++++++++++
4 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index e06151c93cdd..7c9e38290e16 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 46f1e39327f5..bc2a237236ab 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 39918449c502..bce755a71c50 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 000000000000..4a163d249474
--- /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.