svn commit: r552980 - in branches/2020Q4/sysutils/py-salt: . files

[Kirill Ponomarev]

Author: krion
Date: Thu Oct 22 14:19:09 2020
New Revision: 552980
URL: https://svnweb.freebsd.org/changeset/ports/552980

Log:
  MFH: r552978
  
  Update to 3002
  
  Changes: https://salt.tips/whats-new-in-salt-magnesium
  
  PR:		250519
  Approved by:	maintainer
  
  Approved by:	portmgr (blanket)

Modified:
  branches/2020Q4/sysutils/py-salt/Makefile
  branches/2020Q4/sysutils/py-salt/distinfo
  branches/2020Q4/sysutils/py-salt/files/patch-salt_loader.py
Directory Properties:
  branches/2020Q4/   (props changed)

Modified: branches/2020Q4/sysutils/py-salt/Makefile
==============================================================================
--- branches/2020Q4/sysutils/py-salt/Makefile	Thu Oct 22 14:12:30 2020	(r552979)
+++ branches/2020Q4/sysutils/py-salt/Makefile	Thu Oct 22 14:19:09 2020	(r552980)
@@ -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 at 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: branches/2020Q4/sysutils/py-salt/distinfo
==============================================================================
--- branches/2020Q4/sysutils/py-salt/distinfo	Thu Oct 22 14:12:30 2020	(r552979)
+++ branches/2020Q4/sysutils/py-salt/distinfo	Thu Oct 22 14:19:09 2020	(r552980)
@@ -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: branches/2020Q4/sysutils/py-salt/files/patch-salt_loader.py
==============================================================================
--- branches/2020Q4/sysutils/py-salt/files/patch-salt_loader.py	Thu Oct 22 14:12:30 2020	(r552979)
+++ branches/2020Q4/sysutils/py-salt/files/patch-salt_loader.py	Thu Oct 22 14:19:09 2020	(r552980)
@@ -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