From nobody Tue Mar 29 20:00:26 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8CFFD1A562C5; Tue, 29 Mar 2022 20:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KSgQy3byYz3C0c; Tue, 29 Mar 2022 20:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648584026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vy9MqJtAZmwszDSZEJl/WVj/5WQUyTElaxd4iAQVYDg=; b=K/9iMZ4ntEzw9OBY4nt+UnDiwjffEuBcGD4hdNY0F7H70r6SSEd8fNbhmGzpLBFOhkRPKk aH5/2kNdeOFZOJOUjEA6Obj2CzhMHLm/gAKTH9iaJhSCyhC4X10aNgVBCEhrPZgbnrXhTB nDFNQft/LjpsxAYBQBP2yg/jG8pm9ujU4UB7ojDzkW8VIbLckOn2qIk76yQxc3gdOV5OMF Sk4Q0vEXVMI5g5SfdS2i5UXi8XyvpnCMN7oh6duwDTozf3/Wj4nSGyYgp94fpUxUQFJwsl B/OuG/ZSbXUX3OnsqqukUoRX1geeuK8pmfivzv65n4bwlyGSmgTKxUC2UQGHlw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5B0BD24E3B; Tue, 29 Mar 2022 20:00:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22TK0QvG006433; Tue, 29 Mar 2022 20:00:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TK0QbX006432; Tue, 29 Mar 2022 20:00:26 GMT (envelope-from git) Date: Tue, 29 Mar 2022 20:00:26 GMT Message-Id: <202203292000.22TK0QbX006432@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kirill Ponomarev Subject: git: adbcbf8a2725 - 2022Q1 - sysutils/py-salt: Fix TCP transport List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: adbcbf8a27257b951a8e2fc30cf2f6027c800180 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648584026; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vy9MqJtAZmwszDSZEJl/WVj/5WQUyTElaxd4iAQVYDg=; b=wRRpqmjH0Ken5zQyKR7gKStEGNxNX++9yBVUkxV6D+zIyhdOyC0zu1rlBtOfHJ72D2yUqo oUqWtwEXnPyXtRErXBsxvks+vc6NpR+f75ilO2Ok27QxsGJ98U+yoT8tD0N4VA1RTk/qNd QDCR2XaXcIVRlXZfB6hshvnwOQHQStEGm2Gil/rGMZR2BrBSF00kHvNSqm+OCRaARrINV9 4/yEg1E2HS/ZqxFCGSivoIZ2zqDNPpuMZmutzA953M8Zx8enbQxsb3Ykb/xtYe0+lJmVBt 9VO7gm+ojqOzStQHE4Prz0k2BKyU7s2WCVXc9cmqcbh/bCPc75t1oEdaKYNayg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648584026; a=rsa-sha256; cv=none; b=bH/UmPwOJEENF52ZXFuA16PYJK7n4XguzYPhg4Zr95hstohw01l8fe6EbV1W+JSxyeRuAI oYA89eqwljQcGtRQEXkpDhmbuj6QcCGE3vZCjOvbc52lnt70+CMh8Hqc1q5crOMJOhFysX Cd9CIrR1ctxb8zxZFQifWd1HYAttsUfeaSsDaYAT3QLUKT6N0pINcKsG+OHsvPyIkUe9ix sreagUzTxxj12ba7aMWeme79HU8YH1E/8UoxWqluhZmty21Xc16moCcieQAeGwM6cX+nO7 3mcjal2IzPYT0/br/YIupjDHSIwaOSHriWolnWRNw357UCRuuCdA7GS/fh7ARg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=adbcbf8a27257b951a8e2fc30cf2f6027c800180 commit adbcbf8a27257b951a8e2fc30cf2f6027c800180 Author: Kirill Ponomarev AuthorDate: 2022-03-29 19:52:51 +0000 Commit: Kirill Ponomarev CommitDate: 2022-03-29 20:00:22 +0000 sysutils/py-salt: Fix TCP transport (cherry picked from commit d56492275f038123ccf335b2ab45e9bc9195ebe2) --- sysutils/py-salt/Makefile | 1 + sysutils/py-salt/files/patch-salt_transport_tcp.py | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index aa6ace075b5a..75276e5b1491 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -2,6 +2,7 @@ PORTNAME= salt PORTVERSION= 3004.1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/py-salt/files/patch-salt_transport_tcp.py b/sysutils/py-salt/files/patch-salt_transport_tcp.py new file mode 100644 index 000000000000..e2f15a049619 --- /dev/null +++ b/sysutils/py-salt/files/patch-salt_transport_tcp.py @@ -0,0 +1,11 @@ +--- 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 = []