diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 2f9b2d783712..c7627f3be5ab 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -1,8 +1,7 @@ # Created by: Christer Edwards PORTNAME= salt -PORTVERSION= 3004.1 -PORTREVISION= 1 +PORTVERSION= 3004.2 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo index 0d0238a1ca40..962f2fa82aea 100644 --- a/sysutils/py-salt/distinfo +++ b/sysutils/py-salt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1648497978 -SHA256 (salt-3004.1.tar.gz) = 7f344a2432648a4f078daa5accc68dcdffe1095cea13ec21e50413560f04c298 -SIZE (salt-3004.1.tar.gz) = 17685649 +TIMESTAMP = 1655840123 +SHA256 (salt-3004.2.tar.gz) = 2fa644f6200d4e36b55846cb372b6e67b6ca0fbec0697f1d8d73e771b665ed70 +SIZE (salt-3004.2.tar.gz) = 17685127 diff --git a/sysutils/py-salt/files/patch-salt_transport_tcp.py b/sysutils/py-salt/files/patch-salt_transport_tcp.py deleted file mode 100644 index e2f15a049619..000000000000 --- a/sysutils/py-salt/files/patch-salt_transport_tcp.py +++ /dev/null @@ -1,11 +0,0 @@ ---- salt/transport/tcp.py.orig 2022-03-29 19:46:48 UTC -+++ salt/transport/tcp.py -@@ -1561,7 +1561,7 @@ class PubServer(salt.ext.tornado.tcpserver.TCPServer): - @salt.ext.tornado.gen.coroutine - def publish_payload(self, package, _): - log.debug("TCP PubServer sending payload: %s", package) -- payload = self.pack_publish(package) -+ package = self.pack_publish(package) - payload = salt.transport.frame.frame_msg(package["payload"]) - - to_remove = []