Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id C44C07A200 for ; Sat, 20 May 2017 11:30:28 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 6924784DF4; Sat, 20 May 2017 11:30:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id EE83C84DEC for ; Sat, 20 May 2017 11:30:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id O81KWlot8MhS for ; Sat, 20 May 2017 11:30:27 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4B6DE84CE2 for ; Sat, 20 May 2017 11:30:27 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 46488FBE4; Sat, 20 May 2017 11:30:27 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1495279827267410" MIME-Version: 1.0 Date: Sat, 20 May 2017 11:30:27 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/sysutils/salt To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20170520113027.46488FBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1495279827267410 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sat May 20 11:30:27 UTC 2017 Modified Files: pkgsrc/sysutils/salt: Makefile PLIST distinfo Log Message: 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. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 pkgsrc/sysutils/salt/Makefile cvs rdiff -u -r1.19 -r1.20 pkgsrc/sysutils/salt/PLIST cvs rdiff -u -r1.26 -r1.27 pkgsrc/sysutils/salt/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1495279827267410 Content-Disposition: inline Content-Length: 5821 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/salt/Makefile diff -u pkgsrc/sysutils/salt/Makefile:1.50 pkgsrc/sysutils/salt/Makefile:1.51 --- pkgsrc/sysutils/salt/Makefile:1.50 Fri May 5 15:24:59 2017 +++ pkgsrc/sysutils/salt/Makefile Sat May 20 11:30:27 2017 @@ -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 + +.include "../../lang/python/pyversion.mk" +.if "${PYPKGPREFIX}" == "py27" +DEPENDS+= ${PYPKGPREFIX}-futures-[0-9]*:../../devel/py-futures +.endif BUILD_DEFS+= VARBASE -PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # py-m2crypto - -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 Index: pkgsrc/sysutils/salt/PLIST diff -u pkgsrc/sysutils/salt/PLIST:1.19 pkgsrc/sysutils/salt/PLIST:1.20 --- pkgsrc/sysutils/salt/PLIST:1.19 Wed May 3 08:24:57 2017 +++ pkgsrc/sysutils/salt/PLIST Sat May 20 11:30:27 2017 @@ -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 Index: pkgsrc/sysutils/salt/distinfo diff -u pkgsrc/sysutils/salt/distinfo:1.26 pkgsrc/sysutils/salt/distinfo:1.27 --- pkgsrc/sysutils/salt/distinfo:1.26 Wed May 3 08:24:57 2017 +++ pkgsrc/sysutils/salt/distinfo Sat May 20 11:30:27 2017 @@ -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 --_----------=_1495279827267410--