diff options
author | adam <adam@pkgsrc.org> | 2017-05-20 11:30:27 +0000 |
---|---|---|
committer | adam <adam@pkgsrc.org> | 2017-05-20 11:30:27 +0000 |
commit | c83e83023c24f2253d71031c0eea7d0f8b5e1c14 (patch) | |
tree | b6870b4c8579e3b2359f1e1aa721f540f05914ee /sysutils/salt | |
parent | 606cea26455daaf78c42a43aab32842ac5c9738c (diff) | |
download | pkgsrc-c83e83023c24f2253d71031c0eea7d0f8b5e1c14.tar.gz |
Salt 2016.11.5:
Due to the critical nature of issue 41230 we have decided to patch the 2016.11.5 packages with P.R.41244. This issue affects all calls to a salt-minion if there is an ipv6 nameserver set on the minion's host. The patched packages on repo.saltstack.com will divert from the v2016.11.5 tag and pypi packages due to the additional PR applied to the packages.
Bug fixes.
Diffstat (limited to 'sysutils/salt')
-rw-r--r-- | sysutils/salt/Makefile | 38 | ||||
-rw-r--r-- | sysutils/salt/PLIST | 11 | ||||
-rw-r--r-- | sysutils/salt/distinfo | 10 |
3 files changed, 26 insertions, 33 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index 01448becad5..6ace2624ad0 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.50 2017/05/05 15:24:59 jperkin Exp $ +# $NetBSD: Makefile,v 1.51 2017/05/20 11:30:27 adam Exp $ -DISTNAME= salt-2016.11.4 +DISTNAME= salt-2016.11.5 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} @@ -9,29 +9,31 @@ HOMEPAGE= http://saltstack.org/ COMMENT= Remote execution and configuration management system LICENSE= apache-2.0 -DEPENDS+= zeromq>=2.1.9:../../net/zeromq -DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq -DEPENDS+= ${PYPKGPREFIX}-m2crypto-[0-9]*:../../security/py-m2crypto -DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto -DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack -DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml -DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 -DEPENDS+= ${PYPKGPREFIX}-apache-libcloud>=0.14.1:../../net/py-apache-libcloud -DEPENDS+= ${PYPKGPREFIX}-requests>=2.5.0:../../devel/py-requests -DEPENDS+= ${PYPKGPREFIX}-tornado>=4.3:../../www/py-tornado +DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2 +DEPENDS+= ${PYPKGPREFIX}-markupsafe-[0-9]*:../../textproc/py-markupsafe +DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack +DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml +DEPENDS+= ${PYPKGPREFIX}-requests>=2.5.0:../../devel/py-requests +DEPENDS+= ${PYPKGPREFIX}-tornado>=4.3:../../www/py-tornado +# zeromq transport requirements +DEPENDS+= ${PYPKGPREFIX}-crypto-[0-9]*:../../security/py-crypto +DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq -BUILD_DEFS+= VARBASE +.include "../../lang/python/pyversion.mk" +.if "${PYPKGPREFIX}" == "py27" +DEPENDS+= ${PYPKGPREFIX}-futures-[0-9]*:../../devel/py-futures +.endif -PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-m2crypto +BUILD_DEFS+= VARBASE -PYSETUPARGS+= --salt-config-dir=${PKG_SYSCONFDIR} -PYSETUPARGS+= --salt-cache-dir=${VARBASE}/cache/salt -PYSETUPARGS+= --salt-sock-dir=${VARBASE}/run/salt PYSETUPARGS+= --salt-base-file-roots-dir=${VARBASE}/salt/file-roots PYSETUPARGS+= --salt-base-pillar-roots-dir=${VARBASE}/salt/pillar-roots PYSETUPARGS+= --salt-base-master-roots-dir=${VARBASE}/salt/master-roots +PYSETUPARGS+= --salt-cache-dir=${VARBASE}/cache/salt +PYSETUPARGS+= --salt-config-dir=${PKG_SYSCONFDIR} PYSETUPARGS+= --salt-logs-dir=${VARBASE}/log/salt PYSETUPARGS+= --salt-pidfile-dir=${VARBASE}/run +PYSETUPARGS+= --salt-sock-dir=${VARBASE}/run/salt REPLACE_PYTHON= *.py */*.py */*/*.py REPLACE_SH= salt/templates/git/ssh-id-wrapper @@ -43,7 +45,7 @@ FILES_SUBST+= PYTHON=${PYTHONBIN:Q} PKG_SYSCONFSUBDIR= salt EGDIR= ${PREFIX}/share/examples/salt -INSTALLATION_DIRS+= ${EGDIR} +INSTALLATION_DIRS+= ${EGDIR} CONF_FILES+= ${EGDIR}/master ${PKG_SYSCONFDIR}/master CONF_FILES+= ${EGDIR}/minion ${PKG_SYSCONFDIR}/minion diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST index 07bee3cc2f9..7dcb7268677 100644 --- a/sysutils/salt/PLIST +++ b/sysutils/salt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2017/05/03 08:24:57 sborrill Exp $ +@comment $NetBSD: PLIST,v 1.20 2017/05/20 11:30:27 adam Exp $ bin/salt bin/salt-api bin/salt-call @@ -302,9 +302,6 @@ ${PYSITELIB}/salt/cloud/clouds/pyrax.pyo ${PYSITELIB}/salt/cloud/clouds/qingcloud.py ${PYSITELIB}/salt/cloud/clouds/qingcloud.pyc ${PYSITELIB}/salt/cloud/clouds/qingcloud.pyo -${PYSITELIB}/salt/cloud/clouds/rackspace.py -${PYSITELIB}/salt/cloud/clouds/rackspace.pyc -${PYSITELIB}/salt/cloud/clouds/rackspace.pyo ${PYSITELIB}/salt/cloud/clouds/saltify.py ${PYSITELIB}/salt/cloud/clouds/saltify.pyc ${PYSITELIB}/salt/cloud/clouds/saltify.pyo @@ -3681,9 +3678,6 @@ ${PYSITELIB}/salt/utils/rsax931.pyo ${PYSITELIB}/salt/utils/s3.py ${PYSITELIB}/salt/utils/s3.pyc ${PYSITELIB}/salt/utils/s3.pyo -${PYSITELIB}/salt/utils/saltminionservice.py -${PYSITELIB}/salt/utils/saltminionservice.pyc -${PYSITELIB}/salt/utils/saltminionservice.pyo ${PYSITELIB}/salt/utils/sanitizers.py ${PYSITELIB}/salt/utils/sanitizers.pyc ${PYSITELIB}/salt/utils/sanitizers.pyo @@ -3774,9 +3768,6 @@ ${PYSITELIB}/salt/utils/win_runas.pyo ${PYSITELIB}/salt/utils/winapi.py ${PYSITELIB}/salt/utils/winapi.pyc ${PYSITELIB}/salt/utils/winapi.pyo -${PYSITELIB}/salt/utils/winservice.py -${PYSITELIB}/salt/utils/winservice.pyc -${PYSITELIB}/salt/utils/winservice.pyo ${PYSITELIB}/salt/utils/xdg.py ${PYSITELIB}/salt/utils/xdg.pyc ${PYSITELIB}/salt/utils/xdg.pyo diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo index a84cfe056ec..65c4992777b 100644 --- a/sysutils/salt/distinfo +++ b/sysutils/salt/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.26 2017/05/03 08:24:57 sborrill Exp $ +$NetBSD: distinfo,v 1.27 2017/05/20 11:30:27 adam Exp $ -SHA1 (salt-2016.11.4.tar.gz) = 3bc69ef7ef81d6e654a3de81e5b20957cd7757fa -RMD160 (salt-2016.11.4.tar.gz) = d5f5ddd7f7741e4dc163319fdc287e685a042962 -SHA512 (salt-2016.11.4.tar.gz) = ba928b61766d34774ce2e623fa79a46f6d373295c55b336e1b451e6a4afb0d547d78ceb9e466b64d8ba8bdbf2e750cbb77d008bc76308602729ae08241b8d346 -Size (salt-2016.11.4.tar.gz) = 9360198 bytes +SHA1 (salt-2016.11.5.tar.gz) = 0c12b9ab2f313d0ffa9da624461da4ad567dbee2 +RMD160 (salt-2016.11.5.tar.gz) = a2790d715a972f88a96ac42421c53cfa5764b054 +SHA512 (salt-2016.11.5.tar.gz) = 9afb40dbd3a508eacc43500566660763e2b219817d7de25ccf2d61d7f74b857238922ea40cc4c6372fd520bc6f524d84fb0a2d65f9890bedd79d0fc6c177edf9 +Size (salt-2016.11.5.tar.gz) = 9246550 bytes |