diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile index 3eeb0a5ca530..8bf9c989db66 100644 --- a/sysutils/py-salt/Makefile +++ b/sysutils/py-salt/Makefile @@ -1,123 +1,124 @@ PORTNAME= salt -PORTVERSION= 3005 +PORTVERSION= 3005.1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= krion@FreeBSD.org COMMENT= Distributed remote execution and configuration management system WWW= https://pypi.org/project/salt/ 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} \ ${PYTHON_PKGNAMEPREFIX}distro>=1.5.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}yaml>0:devel/py-yaml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyinotify>0:devel/py-pyinotify@${PY_FLAVOR} USES= cpe python:3.6-3.9 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 # Upstream archive contains files with UTF-8 names EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar OPTIONS_DEFINE= AWS BASH FISH TCP ZEROMQ ZSH OPTIONS_DEFAULT= BASH FISH ZEROMQ ZSH AWS_DESC= Install dependencies required for Amazon Web Services 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} 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} BASH_PLIST_FILES= share/bash-completion/completions/salt FISH_PLIST_FILES= share/fish/completions/salt-call.fish \ share/fish/completions/salt-cp.fish \ share/fish/completions/salt-key.fish \ share/fish/completions/salt-master.fish \ share/fish/completions/salt-minion.fish \ share/fish/completions/salt-run.fish \ share/fish/completions/salt-syndic.fish \ share/fish/completions/salt.fish \ share/fish/completions/salt_common.fish ZSH_PLIST_FILES= share/zsh/site-functions/_salt 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 do-install-BASH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions/ ${INSTALL_DATA} ${WRKSRC}/pkg/salt.bash \ ${STAGEDIR}${PREFIX}/share/bash-completion/completions/salt do-install-FISH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/fish/completions/ ${INSTALL_DATA} ${WRKSRC}/pkg/fish-completions/*.fish \ ${STAGEDIR}${PREFIX}/share/fish/completions do-install-ZSH-on: @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions ${INSTALL_DATA} ${WRKSRC}/pkg/salt.zsh \ ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_salt post-install: @${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/conf/master ${STAGEDIR}${ETCDIR}/master.sample ${INSTALL_DATA} ${WRKSRC}/conf/minion ${STAGEDIR}${ETCDIR}/minion.sample .include diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo index a00437778fc5..e9a19972f76b 100644 --- a/sysutils/py-salt/distinfo +++ b/sysutils/py-salt/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1661580885 -SHA256 (salt-3005.tar.gz) = 1d200c45b88046178ea56fb5a75726dc620cc5e51411076a04df80ff52f79cd4 -SIZE (salt-3005.tar.gz) = 17894520 +TIMESTAMP = 1668768917 +SHA256 (salt-3005.1.tar.gz) = fa14c5d873f863b50950121d7e23a2449502745490c7c48c0cf045406cfe57c1 +SIZE (salt-3005.1.tar.gz) = 17914349 diff --git a/sysutils/py-salt/files/patch-disable-distutils-warn.patch b/sysutils/py-salt/files/patch-disable-distutils-warn.patch new file mode 100644 index 000000000000..72e8fb774d9a --- /dev/null +++ b/sysutils/py-salt/files/patch-disable-distutils-warn.patch @@ -0,0 +1,47 @@ +From 1b7fac1599a50c970fdef49abca7151cb11bdcd0 Mon Sep 17 00:00:00 2001 +From: Pedro Algarvio +Date: Tue, 11 Oct 2022 21:19:21 +0100 +Subject: [PATCH] Disable the setuptools user warning "Setuptools is replacing + distutils." + +Once we stop relying on distutils, this filter can be removed. + +Signed-off-by: Pedro Algarvio +--- + salt/__init__.py | 8 ++++++++ + setup.py | 2 ++ + 2 files changed, 10 insertions(+) + +diff --git a/salt/__init__.py b/salt/__init__.py +index ebc54ac8443c..ec551abbc62a 100644 +--- salt/__init__.py ++++ salt/__init__.py +@@ -69,6 +69,14 @@ def load_module(self, name): + append=True, + ) + ++# Filter the setuptools UserWarning until we stop relying on distutils ++warnings.filterwarnings( ++ "ignore", ++ message="Setuptools is replacing distutils.", ++ category=UserWarning, ++ module="_distutils_hack", ++) ++ + + def __define_global_system_encoding_variable__(): + import sys +diff --git a/setup.py b/setup.py +index 0fac50ab4bc6..9d994ac8730c 100755 +--- setup.py ++++ setup.py +@@ -4,6 +4,8 @@ + """ + + # pylint: disable=file-perms,resource-leakage ++import setuptools # isort:skip ++ + import contextlib + import distutils.dist + import glob +