OlrYKffYAEK2LiNGUUJlQBHI8hpKKRyoNLsJlvcLIRU4t2/AyRnEDse3KfGny2HWSSTl67 3ndIHUklg+UxTcNKqQsvBULe4jOxYh5TUAKVQTHHKbvwPkOB5cpkGsA1FNsoLufoFD/eUf 7oEV/zqT7b0uB2saeEIlWtz5bhA8qhOTFotc0JzK2v/jqJ0tMi8uu0XYaHKkxA== 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 4VYTX35Y5TzXFf; Tue, 7 May 2024 06:53:55 +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 4476rtXw016250; Tue, 7 May 2024 06:53:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4476rt92016247; Tue, 7 May 2024 06:53:55 GMT (envelope-from git) Date: Tue, 7 May 2024 06:53:55 GMT Message-Id: <202405070653.4476rt92016247@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: 3a82940fff5c - 2024Q2 - sysutils/py-salt: Fix forgotten patch by previous cherry-pick. 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/2024Q2 X-Git-Reftype: branch X-Git-Commit: 3a82940fff5ccb0e49d196ab195abb5c85259b2f Auto-Submitted: auto-generated The branch 2024Q2 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a82940fff5ccb0e49d196ab195abb5c85259b2f commit 3a82940fff5ccb0e49d196ab195abb5c85259b2f Author: Kirill Ponomarev AuthorDate: 2024-05-07 06:52:53 +0000 Commit: Kirill Ponomarev CommitDate: 2024-05-07 06:52:53 +0000 sysutils/py-salt: Fix forgotten patch by previous cherry-pick. --- sysutils/py-salt/files/patch-requirements_base.txt | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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