From nobody Sun Apr 28 07:17:41 2024 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 4VRyTf2JSwz5J8jD; Sun, 28 Apr 2024 07:17:42 +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 4VRyTf1pnyz45TQ; Sun, 28 Apr 2024 07:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714288662; 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=hFYl3r8nRtJewhDbDFkusRKkoEqkSgLHZnxGRMVj464=; b=yuN0IzxX8Yni/CyYGISoxlBopDMAxC2YehPw/zD9CeEkkZyA/jMbbVa8wzZYw7KQMGLQIm OosPNosVMBIw4IPPmtYbP9ingpsk6/LvCG/DbnNjvBvfm+q4Yg2T5CsjJn1pldY5zEBvOt eNNK7X5ndqd0Ti1im7ReGkZCoF7wDOClrfbSDGY6k+ejXWagcgubNYEqI4WDm1g1bVGKMl OHwy788rggxwssf+jmGPXQFhg2e5lHGQE9eSrKowCCYBBz0U0gmocbjC+PstNndWPQa0dT l35ET70Uqv3cHhJR/0qnseJBCKdIDDDMf+Alx8vJqm8NAAJHuDeHeNHHsOZtjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714288662; a=rsa-sha256; cv=none; b=iDrbUIk2tR5ZeaF94E0OcwbIAPTYdcXAr6YHZl9/3SStnst7BKOA4tosS88tKSBZFgsIQL JJz8cW5BwtPFFyQxLRP3pFnyBX12j6kIE8fuo9ziVChnUeOOy9q7+FjXqH6KFd2bo2tQer Q4jrxyIimDBfe/UwwtJ1eMN5vf11ZKoF1WEdGe3NpigU4XtYaZFWRmpj9xm+YceYkLiY20 ++3Hmkmt8Vu8arQ+5RDPA57IIK4otmERlfm9s/Sx8vjZLUQa2GEZIpOuAeyiVssXu8qygJ l7WHunkvnmz8vYOnp5lM+2hybsvcZ7Ae9j6bDSlS6PVupSwkXJYafoNcZydgyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714288662; 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=hFYl3r8nRtJewhDbDFkusRKkoEqkSgLHZnxGRMVj464=; b=TRjL98jiaLxdD3OPxTVLpFEm8xnO6YgFJ8A0oWchw0uCRumYlN1LY6uTHBgHx01gXGF6Q+ jPhfoMCseW3U2S5Z3Y6jKb16jIDv53KFORKcDZtqv1roh6lqz907/xZ//t3T0/OlHu4FR4 prbEmbjDIwcmVcY5zbGwg2wXIxnKvSpbneeVAddGvn6q3s/SCGNqX8xgcrOgnfQR164tJp 2vUC3Oej6sgDP/tqb8cbMVSEupbE/6d2gIr1zjhW14UdX7GEe9yf1EPsfZLrlf1BctOT1D mT1Asyeazm03ZBbt3QxCSbg1j4td7e2UXXVXikzxJ2BjXjbeLoq9jdngLc56Lg== 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 4VRyTf112lzFCs; Sun, 28 Apr 2024 07:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43S7HfHg091175; Sun, 28 Apr 2024 07:17:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S7Hfbu091172; Sun, 28 Apr 2024 07:17:41 GMT (envelope-from git) Date: Sun, 28 Apr 2024 07:17:41 GMT Message-Id: <202404280717.43S7Hfbu091172@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: 3f709481d44a - main - Revert "sysutils/py-salt: Update to 3007" 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-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: 3f709481d44af0b679e8688bfb6cde49728276e4 Auto-Submitted: auto-generated The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f709481d44af0b679e8688bfb6cde49728276e4 commit 3f709481d44af0b679e8688bfb6cde49728276e4 Author: Kirill Ponomarev AuthorDate: 2024-04-28 07:10:51 +0000 Commit: Kirill Ponomarev 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.