From nobody Tue Oct 19 07:35:58 2021 X-Original-To: dev-commits-ports-branches@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 8ABFC17F083C; Tue, 19 Oct 2021 07:35:58 +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 4HYQXG3YNkz3Cyx; Tue, 19 Oct 2021 07:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 566387D56; Tue, 19 Oct 2021 07:35:58 +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 19J7ZwNt067730; Tue, 19 Oct 2021 07:35:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19J7Zwf4067729; Tue, 19 Oct 2021 07:35:58 GMT (envelope-from git) Date: Tue, 19 Oct 2021 07:35:58 GMT Message-Id: <202110190735.19J7Zwf4067729@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: 5931511bfeaf - 2021Q4 - sysutils/py-salt: update to 3004 release. List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 5931511bfeaf52e1b01e78b9ee2766c2b1e3f1d0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=5931511bfeaf52e1b01e78b9ee2766c2b1e3f1d0 commit 5931511bfeaf52e1b01e78b9ee2766c2b1e3f1d0 Author: Kirill Ponomarev AuthorDate: 2021-10-18 19:08:45 +0000 Commit: Kirill Ponomarev CommitDate: 2021-10-19 07:35:52 +0000 sysutils/py-salt: update to 3004 release. Approved by: maintainer (cherry picked from commit 040897be23753441c4e58d52b02818dd9c6d8ee9) --- sysutils/py-salt/Makefile | 5 ++--- sysutils/py-salt/distinfo | 6 +++--- .../files/{patch-salt_loader.py => patch-salt_loader_lazy.py} | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index b4238e374f3c..eb09188b9c2c 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -1,8 +1,7 @@ # Created by: Christer Edwards PORTNAME= salt -PORTVERSION= 3003.3 -PORTREVISION= 1 +PORTVERSION= 3004 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -114,7 +113,7 @@ do-install-FISH-on: do-install-ZSH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions - ${INSTALL_DATA} ${WRKSRC}/pkg/zsh_completion.zsh \ + ${INSTALL_DATA} ${WRKSRC}/pkg/salt.zsh \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_salt post-install: diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo index dd7c6014846f..ecaa7761efc3 100644 --- a/sysutils/py-salt/distinfo +++ b/sysutils/py-salt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630999559 -SHA256 (salt-3003.3.tar.gz) = a6f9c8c8b5e2600ea8620b4a67371de17611beb4f8d97e4bb9b0b308a37ed1e2 -SIZE (salt-3003.3.tar.gz) = 16017984 +TIMESTAMP = 1634581120 +SHA256 (salt-3004.tar.gz) = 3d53561bc86e014dca2ec3dc981079be04d55ea047890cabde25e5b10bfa5b13 +SIZE (salt-3004.tar.gz) = 17663985 diff --git a/sysutils/py-salt/files/patch-salt_loader.py b/sysutils/py-salt/files/patch-salt_loader_lazy.py similarity index 74% rename from sysutils/py-salt/files/patch-salt_loader.py rename to sysutils/py-salt/files/patch-salt_loader_lazy.py index 85d8b86a799f..f5d66afdcd99 100644 --- a/sysutils/py-salt/files/patch-salt_loader.py +++ b/sysutils/py-salt/files/patch-salt_loader_lazy.py @@ -1,6 +1,6 @@ ---- salt/loader.py.orig 2020-10-22 05:33:25 UTC -+++ salt/loader.py -@@ -1468,7 +1468,7 @@ class LazyLoader(salt.utils.lazy.LazyDict): +--- salt/loader/lazy.py.orig 2021-09-27 17:31:38 UTC ++++ salt/loader/lazy.py +@@ -447,7 +447,7 @@ class LazyLoader(salt.utils.lazy.LazyDict): try: pycache_files = [ os.path.join("__pycache__", x)