Index: head/sysutils/py-salt/Makefile =================================================================== --- head/sysutils/py-salt/Makefile (revision 552977) +++ head/sysutils/py-salt/Makefile (revision 552978) @@ -1,107 +1,98 @@ # Created by: Christer Edwards # $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 LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}MarkupSafe>0:textproc/py-MarkupSafe@${PY_FLAVOR} \ ${PY_ENUM34} \ ${PY_FUTURES} \ ${PYTHON_PKGNAMEPREFIX}distro>1.4.0:sysutils/py-distro@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}libcloud>=0.14.0:net/py-libcloud@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}msgpack>=0.3:devel/py-msgpack@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}progressbar>0:misc/py-progressbar@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}psutil>=0.3.0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=1.0.0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tornado4>=4.2.1:www/py-tornado4@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} USES= cpe python:3.6-3.7 CPE_VENDOR= saltstack CPE_PRODUCT= salt USE_PYTHON= autoplist distutils NO_ARCH= yes CONFLICTS= py[0-9]*-salt-2019* # we must pass these options before the target name, and python.mk has no # early-arguments variable, so we have to manipulate the target PYDISTUTILS_INSTALL_TARGET=\ --salt-root-dir=/ \ --salt-config-dir=${ETCDIR} \ --salt-cache-dir=/var/cache/salt \ --salt-sock-dir=/var/run/salt \ --salt-srv-root-dir=${ETCDIR} \ --salt-base-file-roots-dir=${ETCDIR}/states \ --salt-base-pillar-roots-dir=${ETCDIR}/pillar \ --salt-base-master-roots-dir=${ETCDIR}/salt-master \ --salt-logs-dir=/var/log/salt \ --salt-pidfile-dir=/var/run \ install USE_RC_SUBR= salt_api \ salt_master \ salt_minion \ salt_proxy \ salt_syndic 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 # AWS dependencies (Note: the devel/py-botocore port is updated very frequently) 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} ZEROMQ_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR} ZEROMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyzmq>=2.2.0:net/py-pyzmq@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.9.7:security/py-pycryptodomex@${PY_FLAVOR} post-patch: .for file in conf/minion conf/master doc/man/salt-key.1 \ doc/man/salt-cp.1 doc/man/salt-minion.1 doc/man/salt-syndic.1 \ doc/man/salt-master.1 doc/man/salt-run.1 doc/man/salt.7 doc/man/salt.1 \ doc/man/salt-call.1 salt/modules/mysql.py salt/modules/tls.py salt/modules/postgres.py @${REINPLACE_CMD} -e 's|/etc/salt|${ETCDIR}|' \ -e 's|/srv/salt|${ETCDIR}/states|' \ -e 's|/srv/pillar|${ETCDIR}/pillar|' ${WRKSRC}/${file} .endfor @${REINPLACE_CMD} -e 's|yumpkg5|pkgng|' ${WRKSRC}/conf/minion post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample ${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample .include Index: head/sysutils/py-salt/distinfo =================================================================== --- head/sysutils/py-salt/distinfo (revision 552977) +++ head/sysutils/py-salt/distinfo (revision 552978) @@ -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 Index: head/sysutils/py-salt/files/patch-salt_loader.py =================================================================== --- head/sysutils/py-salt/files/patch-salt_loader.py (revision 552977) +++ head/sysutils/py-salt/files/patch-salt_loader.py (revision 552978) @@ -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