From owner-svn-ports-all@freebsd.org Thu Oct 22 14:00:37 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2D156449C08; Thu, 22 Oct 2020 14:00:37 +0000 (UTC) (envelope-from krion@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CH8C90Rmkz3fqD; Thu, 22 Oct 2020 14:00:37 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E6BE817BC1; Thu, 22 Oct 2020 14:00:36 +0000 (UTC) (envelope-from krion@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09ME0aX9006743; Thu, 22 Oct 2020 14:00:36 GMT (envelope-from krion@FreeBSD.org) Received: (from krion@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09ME0aDF006740; Thu, 22 Oct 2020 14:00:36 GMT (envelope-from krion@FreeBSD.org) Message-Id: <202010221400.09ME0aDF006740@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: krion set sender to krion@FreeBSD.org using -f From: Kirill Ponomarev Date: Thu, 22 Oct 2020 14:00:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552978 - in head/sysutils/py-salt: . files X-SVN-Group: ports-head X-SVN-Commit-Author: krion X-SVN-Commit-Paths: in head/sysutils/py-salt: . files X-SVN-Commit-Revision: 552978 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Oct 2020 14:00:37 -0000 Author: krion Date: Thu Oct 22 14:00:36 2020 New Revision: 552978 URL: https://svnweb.freebsd.org/changeset/ports/552978 Log: Update to 3002 Changes: https://salt.tips/whats-new-in-salt-magnesium PR: 250519 Approved by: maintainer Modified: head/sysutils/py-salt/Makefile head/sysutils/py-salt/distinfo head/sysutils/py-salt/files/patch-salt_loader.py Modified: head/sysutils/py-salt/Makefile ============================================================================== --- head/sysutils/py-salt/Makefile Thu Oct 22 13:41:31 2020 (r552977) +++ head/sysutils/py-salt/Makefile Thu Oct 22 14:00:36 2020 (r552978) @@ -2,17 +2,11 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 3001.1 +PORTVERSION= 3002 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -# Unbreak the sysctl state. -# https://github.com/saltstack/salt/issues/57826 -# https://github.com/saltstack/salt/pull/57839 -PATCH_SITES= https://github.com/saltstack/salt/commit/ -PATCHFILES+= 1fa77bc846856d3a9a9d80e7643fb2f46febf827.patch:-p1 - MAINTAINER= christer.edwards@gmail.com COMMENT= Distributed remote execution and configuration management system @@ -67,11 +61,10 @@ SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} SUB_FILES= pkg-message -OPTIONS_DEFINE= AWS RAET TCP ZEROMQ +OPTIONS_DEFINE= AWS TCP ZEROMQ OPTIONS_DEFAULT=ZEROMQ AWS_DESC= Install dependencies required for Amazon Web Services -RAET_DESC= Install dependencies required for RAET transport TCP_DESC= Install dependencies required for TCP transport ZEROMQ_DESC= Install dependencies required for ZeroMQ transport @@ -79,8 +72,6 @@ ZEROMQ_DESC= Install dependencies required for ZeroMQ AWS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}boto>=2.32.1:devel/py-boto@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}botocore>0:devel/py-botocore@${PY_FLAVOR} - -RAET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}libnacl>=1.0.0:security/py-libnacl@${PY_FLAVOR} TCP_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR} Modified: head/sysutils/py-salt/distinfo ============================================================================== --- head/sysutils/py-salt/distinfo Thu Oct 22 13:41:31 2020 (r552977) +++ head/sysutils/py-salt/distinfo Thu Oct 22 14:00:36 2020 (r552978) @@ -1,5 +1,3 @@ -TIMESTAMP = 1597171484 -SHA256 (salt-3001.1.tar.gz) = e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc -SIZE (salt-3001.1.tar.gz) = 14556156 -SHA256 (1fa77bc846856d3a9a9d80e7643fb2f46febf827.patch) = 36977a22f504cd383efb97b5ae6c34a4712f5843fb295af2dd8047afc17823cf -SIZE (1fa77bc846856d3a9a9d80e7643fb2f46febf827.patch) = 9298 +TIMESTAMP = 1603344549 +SHA256 (salt-3002.tar.gz) = b622c9de9fde571db96bfd659a183bea553dd26e71cac85659387e937221aae6 +SIZE (salt-3002.tar.gz) = 15741439 Modified: head/sysutils/py-salt/files/patch-salt_loader.py ============================================================================== --- head/sysutils/py-salt/files/patch-salt_loader.py Thu Oct 22 13:41:31 2020 (r552977) +++ head/sysutils/py-salt/files/patch-salt_loader.py Thu Oct 22 14:00:36 2020 (r552978) @@ -1,13 +1,11 @@ ---- salt/loader.py.orig 2020-06-18 07:20:08 UTC +--- salt/loader.py.orig 2020-10-22 05:33:25 UTC +++ salt/loader.py -@@ -1383,9 +1383,7 @@ class LazyLoader(salt.utils.lazy.LazyDict): - try: - pycache_files = [ - os.path.join("__pycache__", x) -- for x in sorted( -- os.listdir(os.path.join(mod_dir, "__pycache__")) -- ) -+ for x in sorted(os.listdir(os.path.join(mod_dir, '__pycache__'))) if not x.endswith('opt-1.pyc') and not x.endswith('opt-2.pyc') - ] - except OSError: - pass +@@ -1468,7 +1468,7 @@ class LazyLoader(salt.utils.lazy.LazyDict): + try: + pycache_files = [ + os.path.join("__pycache__", x) +- for x in sorted(os.listdir(os.path.join(mod_dir, "__pycache__"))) ++ for x in sorted(os.listdir(os.path.join(mod_dir, '__pycache__'))) if not x.endswith('opt-1.pyc') and not x.endswith('opt-2.pyc') + ] + except OSError: + pass