From nobody Tue Mar 29 19:53:07 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 1D31A1A541BC; Tue, 29 Mar 2022 19:53:08 +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 4KSgGX0F9Rz58wW; Tue, 29 Mar 2022 19:53:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648583588; 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=qtUNY+eEQ8s5W0gWI/QFa7nNEM1P/2I4oeqVX0YTPK4=; b=xkGBizRrRezQsjCb6JNAyht8XwEoNo9sa9c63L1G/bufsoxZxXoK/8Q4J/xitcK3QHneFF QGNAWZIYh14DosCDS9FDDvkBkmMSo6oM1vYOIjHVUWntjFsv2J/RgLHtBUObqfpZiK9xvb uLtbUg+uD2ZQkPgz59/L4JbApPFGN1zTyVGIlC1QCLzyLpsQ2KcTSfoLOuuJS/yHlgss23 viQqx0ze2y6zqzjMZ2cIdGgNoLnL72H+XynS4edrfYL3Q8Z+LWdYzQkMlf5DwNr0t6gYYm lFKA4Ateo73hr1S5BdMraqcw2bly8MOtWMyPcyCUT4t9pzlosalaWcVRXFMj0w== 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 DC36E24C5A; Tue, 29 Mar 2022 19:53:07 +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 22TJr7xd096608; Tue, 29 Mar 2022 19:53:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TJr7gA096607; Tue, 29 Mar 2022 19:53:07 GMT (envelope-from git) Date: Tue, 29 Mar 2022 19:53:07 GMT Message-Id: <202203291953.22TJr7gA096607@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kirill Ponomarev Subject: git: d56492275f03 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d56492275f038123ccf335b2ab45e9bc9195ebe2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648583588; 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=qtUNY+eEQ8s5W0gWI/QFa7nNEM1P/2I4oeqVX0YTPK4=; b=rWF5xgIurle94UZPTJTpVOLrzLC4zHR2cnjumEUm0nQ2MXglqHXhQ/3owC65Jl1Mi6OdKI 6DXKdhEYcKEmdLUKUc1k6ace1AmpJFRR5vZ99kuzmM4PHroYvVTw8XKRITNdgB3Eg5tu5f e9atMFesCdZB/AHfyy+KP/knNPHEHXvZgZkeGLCAjfUAfgvKaRrwsoyIqij7LSo4NfC2qx 60tzrlNLhZzqs5/myGzUqMD8NOJpM1GuoEfsUilO9BvshhZqNn/lsoSvdomAFuZ7yuqF+c g/JoXZMYh1LVRJKVoMxrkOot7PudWdrU57eF8AWvzWBCLh9Tm2rsjV6PKW7UBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648583588; a=rsa-sha256; cv=none; b=Wl3q8Sy8G/yQCUXxtnlcsJ0AZ9aXG+nNgvX+h1RjOVzlyibaXL8j5u++kLTusIg5j+DGDs D3ldXQe1fs1OB8yg2VsWcZrVKyb4zBQj45mmx6knpu1E0s+IzWbttG36ciHBQCScbs34JX Fo5xbSOreLHbTunuhYRmK3RpvfODSK3xhdDfWDKLJp7wW0hwxtcMbreaH3oS1sArUlNwRi SJJ8RgSsY4wkGKFIwLNGqM4SbUCC+0ZxZ++gj2mjIDS3Q03fh1/s4hKtX0g1mCj6KYuk6w 9ih+b054P34Cs6TidF46UnHPOsWOEUqYQnfN8BQlYEGmqCP0NDpueKNS/d7eeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=d56492275f038123ccf335b2ab45e9bc9195ebe2 commit d56492275f038123ccf335b2ab45e9bc9195ebe2 Author: Kirill Ponomarev AuthorDate: 2022-03-29 19:52:51 +0000 Commit: Kirill Ponomarev CommitDate: 2022-03-29 19:52:51 +0000 sysutils/py-salt: Fix TCP transport --- 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 26319fd9ef53..2f9b2d783712 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 = []