pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/salt Updated salt to 2014.1.1, numerous bug a...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d3bafb044c60
branches:  trunk
changeset: 632458:d3bafb044c60
user:      imil <imil%pkgsrc.org@localhost>
date:      Sun Mar 30 12:31:17 2014 +0000

description:
Updated salt to 2014.1.1, numerous bug and security fixes

Details:

  * http://docs.saltstack.com/en/latest/topics/releases/0.16.4.html
  * http://docs.saltstack.com/en/latest/topics/releases/0.17.0.html
  * http://docs.saltstack.com/en/latest/topics/releases/0.17.1.html
  * http://docs.saltstack.com/en/latest/topics/releases/0.17.2.html
  * http://docs.saltstack.com/en/latest/topics/releases/0.17.3.html
  * http://docs.saltstack.com/en/latest/topics/releases/0.17.4.html
  * http://docs.saltstack.com/en/latest/topics/releases/0.17.5.html
  * http://docs.saltstack.com/en/latest/topics/releases/2014.1.1.html

diffstat:

 sysutils/salt/Makefile               |   45 +-
 sysutils/salt/PLIST                  |  585 +++++++++++++++++++++++++++++++++-
 sysutils/salt/distinfo               |   10 +-
 sysutils/salt/patches/patch-setup.py |   58 +--
 4 files changed, 599 insertions(+), 99 deletions(-)

diffs (truncated from 1255 to 300 lines):

diff -r 2ab0d6dbbffe -r d3bafb044c60 sysutils/salt/Makefile
--- a/sysutils/salt/Makefile    Sun Mar 30 10:32:34 2014 +0000
+++ b/sysutils/salt/Makefile    Sun Mar 30 12:31:17 2014 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2014/01/27 18:41:15 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2014/03/30 12:31:17 imil Exp $
 
-DISTNAME=      salt-0.16.3
+DISTNAME=      salt-2014.1.1
 CATEGORIES=    sysutils
 MASTER_SITES=  https://pypi.python.org/packages/source/s/salt/
 
@@ -17,24 +17,21 @@
 DEPENDS+= ${PYPKGPREFIX}-yaml-[0-9]*:../../textproc/py-yaml
 DEPENDS+= ${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
 
+BUILD_DEFS+=   VARBASE
+
 PYTHON_VERSIONS_INCOMPATIBLE=  33 # py-m2crypto
 
-SUBST_CLASSES+=                fix-paths
-SUBST_STAGE.fix-paths= post-patch
-SUBST_MESSAGE.fix-paths=Fixing directory paths.
-SUBST_FILES.fix-paths+=        conf/*
-SUBST_FILES.fix-paths+=        doc/man/*
-SUBST_FILES.fix-paths+=        salt/client.py
-SUBST_FILES.fix-paths+=        salt/config.py
-SUBST_FILES.fix-paths+=        salt/modules/mysql.py
-SUBST_FILES.fix-paths+=        salt/modules/postgres.py
-SUBST_FILES.fix-paths+=        salt/modules/tls.py
-SUBST_FILES.fix-paths+=        salt/utils/parsers.py
-SUBST_FILES.fix-paths+=        salt/utils/migrations.py
-SUBST_SED.fix-paths+=  -e "s|/etc/salt|${PKG_SYSCONFDIR}|g"
+PYSETUPINSTALLARGS+=   --salt-root-dir=${PREFIX}
+PYSETUPINSTALLARGS+=   --salt-config-dir=${PKG_SYSCONFDIR}
+PYSETUPINSTALLARGS+=   --salt-cache-dir=${VARBASE}/cache/salt
+PYSETUPINSTALLARGS+=   --salt-sock-dir==${VARBASE}/run/salt
+PYSETUPINSTALLARGS+=   --salt-base-file-roots-dir=${PKG_SYSCONFDIR}/states
+PYSETUPINSTALLARGS+=   --salt-base-pillar-roots-dir=${PKG_SYSCONFDIR}/pillar
+PYSETUPINSTALLARGS+=   --salt-base-master-roots-dir=${PKG_SYSCONFDIR}/salt-master
+PYSETUPINSTALLARGS+=   --salt-logs-dir=${VARBASE}/log/salt
+PYSETUPINSTALLARGS+=   --salt-pidfile-dir=${VARBASE}/run
 
-REPLACE_PYTHON+=       salt/modules/munin.py
-REPLACE_PYTHON+=       salt/returners/sentry_return.py
+REPLACE_PYTHON=        *.py */*.py */*/*.py
 
 RCD_SCRIPTS+=          salt_master salt_minion
 FILES_SUBST+=          PYTHON=${PYTHONBIN:Q}
@@ -46,6 +43,20 @@
 CONF_FILES+=           ${EGDIR}/master ${PKG_SYSCONFDIR}/master
 CONF_FILES+=           ${EGDIR}/minion ${PKG_SYSCONFDIR}/minion
 
+OWN_DIRS+=             ${PKG_SYSCONFDIR}/states ${PKG_SYSCONFDIR}/pillar
+OWN_DIRS+=             ${PKG_SYSCONFDIR}/salt-master
+OWN_DIRS+=             ${VARBASE}/cache/salt ${VARBASE}/run/salt
+OWN_DIRS+=             ${VARBASE}/log/salt
+
+SUBST_CLASSES+=                fix-paths
+SUBST_STAGE.fix-paths= pre-configure
+SUBST_MESSAGE.fix-paths=Fixing hardcoded paths
+SUBST_FILES.fix-paths= conf/*
+SUBST_FILES.fix-paths+=        doc/man/*
+SUBST_SED.fix-paths=   -e 's,/etc/salt,${PKG_SYSCONFDIR},g'
+SUBST_SED.fix-paths+=  -e 's,/srv/salt,${PKG_SYSCONFDIR}/states,g'
+SUBST_SED.fix-paths+=  -e 's,/srv/pillar,${PKG_SYSCONFDIR}/pillar,g'
+
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/conf/master ${DESTDIR}${EGDIR}/
        ${INSTALL_DATA} ${WRKSRC}/conf/minion ${DESTDIR}${EGDIR}/
diff -r 2ab0d6dbbffe -r d3bafb044c60 sysutils/salt/PLIST
--- a/sysutils/salt/PLIST       Sun Mar 30 10:32:34 2014 +0000
+++ b/sysutils/salt/PLIST       Sun Mar 30 12:31:17 2014 +0000
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.8 2014/03/11 14:05:16 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.9 2014/03/30 12:31:17 imil Exp $
 bin/salt
 bin/salt-call
+bin/salt-cloud
 bin/salt-cp
 bin/salt-key
 bin/salt-master
 bin/salt-minion
 bin/salt-run
+bin/salt-ssh
 bin/salt-syndic
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/salt/__init__.py
@@ -14,12 +16,18 @@
 ${PYSITELIB}/salt/_compat.py
 ${PYSITELIB}/salt/_compat.pyc
 ${PYSITELIB}/salt/_compat.pyo
+${PYSITELIB}/salt/_syspaths.py
+${PYSITELIB}/salt/_syspaths.pyc
+${PYSITELIB}/salt/_syspaths.pyo
 ${PYSITELIB}/salt/_version.py
 ${PYSITELIB}/salt/_version.pyc
 ${PYSITELIB}/salt/_version.pyo
 ${PYSITELIB}/salt/auth/__init__.py
 ${PYSITELIB}/salt/auth/__init__.pyc
 ${PYSITELIB}/salt/auth/__init__.pyo
+${PYSITELIB}/salt/auth/auto.py
+${PYSITELIB}/salt/auth/auto.pyc
+${PYSITELIB}/salt/auth/auto.pyo
 ${PYSITELIB}/salt/auth/keystone.py
 ${PYSITELIB}/salt/auth/keystone.pyc
 ${PYSITELIB}/salt/auth/keystone.pyo
@@ -29,6 +37,9 @@
 ${PYSITELIB}/salt/auth/pam.py
 ${PYSITELIB}/salt/auth/pam.pyc
 ${PYSITELIB}/salt/auth/pam.pyo
+${PYSITELIB}/salt/auth/stormpath_mod.py
+${PYSITELIB}/salt/auth/stormpath_mod.pyc
+${PYSITELIB}/salt/auth/stormpath_mod.pyo
 ${PYSITELIB}/salt/cli/__init__.py
 ${PYSITELIB}/salt/cli/__init__.pyc
 ${PYSITELIB}/salt/cli/__init__.pyo
@@ -41,9 +52,127 @@
 ${PYSITELIB}/salt/cli/cp.py
 ${PYSITELIB}/salt/cli/cp.pyc
 ${PYSITELIB}/salt/cli/cp.pyo
-${PYSITELIB}/salt/client.py
-${PYSITELIB}/salt/client.pyc
-${PYSITELIB}/salt/client.pyo
+${PYSITELIB}/salt/client/__init__.py
+${PYSITELIB}/salt/client/__init__.pyc
+${PYSITELIB}/salt/client/__init__.pyo
+${PYSITELIB}/salt/client/api.py
+${PYSITELIB}/salt/client/api.pyc
+${PYSITELIB}/salt/client/api.pyo
+${PYSITELIB}/salt/client/ssh/__init__.py
+${PYSITELIB}/salt/client/ssh/__init__.pyc
+${PYSITELIB}/salt/client/ssh/__init__.pyo
+${PYSITELIB}/salt/client/ssh/shell.py
+${PYSITELIB}/salt/client/ssh/shell.pyc
+${PYSITELIB}/salt/client/ssh/shell.pyo
+${PYSITELIB}/salt/client/ssh/state.py
+${PYSITELIB}/salt/client/ssh/state.pyc
+${PYSITELIB}/salt/client/ssh/state.pyo
+${PYSITELIB}/salt/client/ssh/wrapper/__init__.py
+${PYSITELIB}/salt/client/ssh/wrapper/__init__.pyc
+${PYSITELIB}/salt/client/ssh/wrapper/__init__.pyo
+${PYSITELIB}/salt/client/ssh/wrapper/config.py
+${PYSITELIB}/salt/client/ssh/wrapper/config.pyc
+${PYSITELIB}/salt/client/ssh/wrapper/config.pyo
+${PYSITELIB}/salt/client/ssh/wrapper/grains.py
+${PYSITELIB}/salt/client/ssh/wrapper/grains.pyc
+${PYSITELIB}/salt/client/ssh/wrapper/grains.pyo
+${PYSITELIB}/salt/client/ssh/wrapper/pillar.py
+${PYSITELIB}/salt/client/ssh/wrapper/pillar.pyc
+${PYSITELIB}/salt/client/ssh/wrapper/pillar.pyo
+${PYSITELIB}/salt/client/ssh/wrapper/state.py
+${PYSITELIB}/salt/client/ssh/wrapper/state.pyc
+${PYSITELIB}/salt/client/ssh/wrapper/state.pyo
+${PYSITELIB}/salt/cloud/__init__.py
+${PYSITELIB}/salt/cloud/__init__.pyc
+${PYSITELIB}/salt/cloud/__init__.pyo
+${PYSITELIB}/salt/cloud/cli.py
+${PYSITELIB}/salt/cloud/cli.pyc
+${PYSITELIB}/salt/cloud/cli.pyo
+${PYSITELIB}/salt/cloud/clouds/__init__.py
+${PYSITELIB}/salt/cloud/clouds/__init__.pyc
+${PYSITELIB}/salt/cloud/clouds/__init__.pyo
+${PYSITELIB}/salt/cloud/clouds/botocore_aws.py
+${PYSITELIB}/salt/cloud/clouds/botocore_aws.pyc
+${PYSITELIB}/salt/cloud/clouds/botocore_aws.pyo
+${PYSITELIB}/salt/cloud/clouds/cloudstack.py
+${PYSITELIB}/salt/cloud/clouds/cloudstack.pyc
+${PYSITELIB}/salt/cloud/clouds/cloudstack.pyo
+${PYSITELIB}/salt/cloud/clouds/digital_ocean.py
+${PYSITELIB}/salt/cloud/clouds/digital_ocean.pyc
+${PYSITELIB}/salt/cloud/clouds/digital_ocean.pyo
+${PYSITELIB}/salt/cloud/clouds/ec2.py
+${PYSITELIB}/salt/cloud/clouds/ec2.pyc
+${PYSITELIB}/salt/cloud/clouds/ec2.pyo
+${PYSITELIB}/salt/cloud/clouds/gce.py
+${PYSITELIB}/salt/cloud/clouds/gce.pyc
+${PYSITELIB}/salt/cloud/clouds/gce.pyo
+${PYSITELIB}/salt/cloud/clouds/gogrid.py
+${PYSITELIB}/salt/cloud/clouds/gogrid.pyc
+${PYSITELIB}/salt/cloud/clouds/gogrid.pyo
+${PYSITELIB}/salt/cloud/clouds/ibmsce.py
+${PYSITELIB}/salt/cloud/clouds/ibmsce.pyc
+${PYSITELIB}/salt/cloud/clouds/ibmsce.pyo
+${PYSITELIB}/salt/cloud/clouds/joyent.py
+${PYSITELIB}/salt/cloud/clouds/joyent.pyc
+${PYSITELIB}/salt/cloud/clouds/joyent.pyo
+${PYSITELIB}/salt/cloud/clouds/libcloud_aws.py
+${PYSITELIB}/salt/cloud/clouds/libcloud_aws.pyc
+${PYSITELIB}/salt/cloud/clouds/libcloud_aws.pyo
+${PYSITELIB}/salt/cloud/clouds/linode.py
+${PYSITELIB}/salt/cloud/clouds/linode.pyc
+${PYSITELIB}/salt/cloud/clouds/linode.pyo
+${PYSITELIB}/salt/cloud/clouds/msazure.py
+${PYSITELIB}/salt/cloud/clouds/msazure.pyc
+${PYSITELIB}/salt/cloud/clouds/msazure.pyo
+${PYSITELIB}/salt/cloud/clouds/nova.py
+${PYSITELIB}/salt/cloud/clouds/nova.pyc
+${PYSITELIB}/salt/cloud/clouds/nova.pyo
+${PYSITELIB}/salt/cloud/clouds/openstack.py
+${PYSITELIB}/salt/cloud/clouds/openstack.pyc
+${PYSITELIB}/salt/cloud/clouds/openstack.pyo
+${PYSITELIB}/salt/cloud/clouds/parallels.py
+${PYSITELIB}/salt/cloud/clouds/parallels.pyc
+${PYSITELIB}/salt/cloud/clouds/parallels.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
+${PYSITELIB}/salt/cloud/clouds/softlayer.py
+${PYSITELIB}/salt/cloud/clouds/softlayer.pyc
+${PYSITELIB}/salt/cloud/clouds/softlayer.pyo
+${PYSITELIB}/salt/cloud/clouds/softlayer_hw.py
+${PYSITELIB}/salt/cloud/clouds/softlayer_hw.pyc
+${PYSITELIB}/salt/cloud/clouds/softlayer_hw.pyo
+${PYSITELIB}/salt/cloud/deploy/Arch-git.sh
+${PYSITELIB}/salt/cloud/deploy/Arch.sh
+${PYSITELIB}/salt/cloud/deploy/Debian-git.sh
+${PYSITELIB}/salt/cloud/deploy/Debian.sh
+${PYSITELIB}/salt/cloud/deploy/Fedora-git.sh
+${PYSITELIB}/salt/cloud/deploy/Fedora.sh
+${PYSITELIB}/salt/cloud/deploy/FreeBSD-git.sh
+${PYSITELIB}/salt/cloud/deploy/FreeBSD.sh
+${PYSITELIB}/salt/cloud/deploy/None.sh
+${PYSITELIB}/salt/cloud/deploy/RHEL5-git.sh
+${PYSITELIB}/salt/cloud/deploy/RHEL5.sh
+${PYSITELIB}/salt/cloud/deploy/RHEL6-git.sh
+${PYSITELIB}/salt/cloud/deploy/RHEL6.sh
+${PYSITELIB}/salt/cloud/deploy/SmartOS.sh
+${PYSITELIB}/salt/cloud/deploy/Ubuntu-git.sh
+${PYSITELIB}/salt/cloud/deploy/Ubuntu.sh
+${PYSITELIB}/salt/cloud/deploy/bootstrap-salt.sh
+${PYSITELIB}/salt/cloud/deploy/curl-bootstrap-git.sh
+${PYSITELIB}/salt/cloud/deploy/curl-bootstrap.sh
+${PYSITELIB}/salt/cloud/deploy/python-bootstrap.sh
+${PYSITELIB}/salt/cloud/deploy/wget-bootstrap-nocert.sh
+${PYSITELIB}/salt/cloud/deploy/wget-bootstrap.sh
+${PYSITELIB}/salt/cloud/exceptions.py
+${PYSITELIB}/salt/cloud/exceptions.pyc
+${PYSITELIB}/salt/cloud/exceptions.pyo
+${PYSITELIB}/salt/cloud/libcloudfuncs.py
+${PYSITELIB}/salt/cloud/libcloudfuncs.pyc
+${PYSITELIB}/salt/cloud/libcloudfuncs.pyo
 ${PYSITELIB}/salt/config.py
 ${PYSITELIB}/salt/config.pyc
 ${PYSITELIB}/salt/config.pyo
@@ -65,33 +194,66 @@
 ${PYSITELIB}/salt/fileserver/gitfs.py
 ${PYSITELIB}/salt/fileserver/gitfs.pyc
 ${PYSITELIB}/salt/fileserver/gitfs.pyo
+${PYSITELIB}/salt/fileserver/hgfs.py
+${PYSITELIB}/salt/fileserver/hgfs.pyc
+${PYSITELIB}/salt/fileserver/hgfs.pyo
+${PYSITELIB}/salt/fileserver/minionfs.py
+${PYSITELIB}/salt/fileserver/minionfs.pyc
+${PYSITELIB}/salt/fileserver/minionfs.pyo
 ${PYSITELIB}/salt/fileserver/roots.py
 ${PYSITELIB}/salt/fileserver/roots.pyc
 ${PYSITELIB}/salt/fileserver/roots.pyo
 ${PYSITELIB}/salt/fileserver/s3fs.py
 ${PYSITELIB}/salt/fileserver/s3fs.pyc
 ${PYSITELIB}/salt/fileserver/s3fs.pyo
+${PYSITELIB}/salt/fileserver/svnfs.py
+${PYSITELIB}/salt/fileserver/svnfs.pyc
+${PYSITELIB}/salt/fileserver/svnfs.pyo
 ${PYSITELIB}/salt/grains/__init__.py
 ${PYSITELIB}/salt/grains/__init__.pyc
 ${PYSITELIB}/salt/grains/__init__.pyo
 ${PYSITELIB}/salt/grains/core.py
 ${PYSITELIB}/salt/grains/core.pyc
 ${PYSITELIB}/salt/grains/core.pyo
+${PYSITELIB}/salt/grains/external_ip.py
+${PYSITELIB}/salt/grains/external_ip.pyc
+${PYSITELIB}/salt/grains/external_ip.pyo
 ${PYSITELIB}/salt/grains/extra.py
 ${PYSITELIB}/salt/grains/extra.pyc
 ${PYSITELIB}/salt/grains/extra.pyo
+${PYSITELIB}/salt/grains/junos.py
+${PYSITELIB}/salt/grains/junos.pyc
+${PYSITELIB}/salt/grains/junos.pyo
 ${PYSITELIB}/salt/grains/opts.py
 ${PYSITELIB}/salt/grains/opts.pyc
 ${PYSITELIB}/salt/grains/opts.pyo
+${PYSITELIB}/salt/grains/rest_sample.py
+${PYSITELIB}/salt/grains/rest_sample.pyc
+${PYSITELIB}/salt/grains/rest_sample.pyo
 ${PYSITELIB}/salt/key.py
 ${PYSITELIB}/salt/key.pyc
 ${PYSITELIB}/salt/key.pyo
 ${PYSITELIB}/salt/loader.py
 ${PYSITELIB}/salt/loader.pyc
 ${PYSITELIB}/salt/loader.pyo
-${PYSITELIB}/salt/log.py
-${PYSITELIB}/salt/log.pyc
-${PYSITELIB}/salt/log.pyo
+${PYSITELIB}/salt/log/__init__.py
+${PYSITELIB}/salt/log/__init__.pyc
+${PYSITELIB}/salt/log/__init__.pyo



Home | Main Index | Thread Index | Old Index