diff options
| -rw-r--r-- | sysutils/salt/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/salt/PLIST | 23 | ||||
| -rw-r--r-- | sysutils/salt/distinfo | 12 | ||||
| -rw-r--r-- | sysutils/salt/patches/patch-salt_modules_cron.py | 16 | ||||
| -rw-r--r-- | sysutils/salt/patches/patch-salt_modules_status.py | 15 |
5 files changed, 63 insertions, 8 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index 2cd7c5a0323..fbcfbcb5a3d 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2015/12/11 00:27:06 wiz Exp $ +# $NetBSD: Makefile,v 1.33.2.1 2016/02/20 21:24:10 spz Exp $ -DISTNAME= salt-2015.8.3 +DISTNAME= salt-2015.8.5 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST index aeba20a4421..db70a5b73ba 100644 --- a/sysutils/salt/PLIST +++ b/sysutils/salt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2015/12/11 00:27:06 wiz Exp $ +@comment $NetBSD: PLIST,v 1.14.2.1 2016/02/20 21:24:10 spz Exp $ bin/salt bin/salt-api bin/salt-call @@ -458,6 +458,9 @@ ${PYSITELIB}/salt/grains/core.pyo ${PYSITELIB}/salt/grains/disks.py ${PYSITELIB}/salt/grains/disks.pyc ${PYSITELIB}/salt/grains/disks.pyo +${PYSITELIB}/salt/grains/esxi.py +${PYSITELIB}/salt/grains/esxi.pyc +${PYSITELIB}/salt/grains/esxi.pyo ${PYSITELIB}/salt/grains/external_ip.py ${PYSITELIB}/salt/grains/external_ip.pyc ${PYSITELIB}/salt/grains/external_ip.pyo @@ -764,6 +767,9 @@ ${PYSITELIB}/salt/modules/environ.pyo ${PYSITELIB}/salt/modules/eselect.py ${PYSITELIB}/salt/modules/eselect.pyc ${PYSITELIB}/salt/modules/eselect.pyo +${PYSITELIB}/salt/modules/esxi.py +${PYSITELIB}/salt/modules/esxi.pyc +${PYSITELIB}/salt/modules/esxi.pyo ${PYSITELIB}/salt/modules/etcd_mod.py ${PYSITELIB}/salt/modules/etcd_mod.pyc ${PYSITELIB}/salt/modules/etcd_mod.pyo @@ -1271,6 +1277,9 @@ ${PYSITELIB}/salt/modules/shadow.pyo ${PYSITELIB}/salt/modules/slack_notify.py ${PYSITELIB}/salt/modules/slack_notify.pyc ${PYSITELIB}/salt/modules/slack_notify.pyo +${PYSITELIB}/salt/modules/slsutil.py +${PYSITELIB}/salt/modules/slsutil.pyc +${PYSITELIB}/salt/modules/slsutil.pyo ${PYSITELIB}/salt/modules/smartos_imgadm.py ${PYSITELIB}/salt/modules/smartos_imgadm.pyc ${PYSITELIB}/salt/modules/smartos_imgadm.pyo @@ -1427,6 +1436,9 @@ ${PYSITELIB}/salt/modules/virt.pyo ${PYSITELIB}/salt/modules/virtualenv_mod.py ${PYSITELIB}/salt/modules/virtualenv_mod.pyc ${PYSITELIB}/salt/modules/virtualenv_mod.pyo +${PYSITELIB}/salt/modules/vsphere.py +${PYSITELIB}/salt/modules/vsphere.pyc +${PYSITELIB}/salt/modules/vsphere.pyo ${PYSITELIB}/salt/modules/win_autoruns.py ${PYSITELIB}/salt/modules/win_autoruns.pyc ${PYSITELIB}/salt/modules/win_autoruns.pyo @@ -1712,6 +1724,9 @@ ${PYSITELIB}/salt/proxy/__init__.pyo ${PYSITELIB}/salt/proxy/chronos.py ${PYSITELIB}/salt/proxy/chronos.pyc ${PYSITELIB}/salt/proxy/chronos.pyo +${PYSITELIB}/salt/proxy/esxi.py +${PYSITELIB}/salt/proxy/esxi.pyc +${PYSITELIB}/salt/proxy/esxi.pyo ${PYSITELIB}/salt/proxy/fx2.py ${PYSITELIB}/salt/proxy/fx2.pyc ${PYSITELIB}/salt/proxy/fx2.pyo @@ -1901,6 +1916,9 @@ ${PYSITELIB}/salt/roster/clustershell.pyo ${PYSITELIB}/salt/roster/flat.py ${PYSITELIB}/salt/roster/flat.pyc ${PYSITELIB}/salt/roster/flat.pyo +${PYSITELIB}/salt/roster/range.py +${PYSITELIB}/salt/roster/range.pyc +${PYSITELIB}/salt/roster/range.pyo ${PYSITELIB}/salt/roster/scan.py ${PYSITELIB}/salt/roster/scan.pyc ${PYSITELIB}/salt/roster/scan.pyo @@ -2213,6 +2231,9 @@ ${PYSITELIB}/salt/states/environ.pyo ${PYSITELIB}/salt/states/eselect.py ${PYSITELIB}/salt/states/eselect.pyc ${PYSITELIB}/salt/states/eselect.pyo +${PYSITELIB}/salt/states/esxi.py +${PYSITELIB}/salt/states/esxi.pyc +${PYSITELIB}/salt/states/esxi.pyo ${PYSITELIB}/salt/states/etcd_mod.py ${PYSITELIB}/salt/states/etcd_mod.pyc ${PYSITELIB}/salt/states/etcd_mod.pyo diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo index d64a7c8536f..dfc61da9417 100644 --- a/sysutils/salt/distinfo +++ b/sysutils/salt/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.16 2015/12/11 00:27:06 wiz Exp $ +$NetBSD: distinfo,v 1.16.2.1 2016/02/20 21:24:10 spz Exp $ -SHA1 (salt-2015.8.3.tar.gz) = 0457866d5619febc3cdf3b27b2e736b0c4ae3623 -RMD160 (salt-2015.8.3.tar.gz) = 607db5d35545cfb6c4e8676482133a1560f3e896 -SHA512 (salt-2015.8.3.tar.gz) = 18a2c63d5e54d09468189450557974e47f87d8b7dde52beaae678120da1da1e7aecfff18cf0fdfb63a11cd5f6bab102c229462f0afe5e3e858c0c467761c7121 -Size (salt-2015.8.3.tar.gz) = 6757678 bytes +SHA1 (salt-2015.8.5.tar.gz) = f9d2b2dbb0fefc8d9b0b5a762f61f0f1d8998c47 +RMD160 (salt-2015.8.5.tar.gz) = 8b17e20f53ff201f135f0bfefeca937828289a01 +SHA512 (salt-2015.8.5.tar.gz) = 715709798fd1f4410ef204545a84e34d3ecc0f080905b7ae29ce19d273c1ed6865f56e025e59d2506301970ad05081ff119caec0ced03dcbe5803f9f00eb64f8 +Size (salt-2015.8.5.tar.gz) = 6877624 bytes +SHA1 (patch-salt_modules_cron.py) = 2b459a3db4f5370d56b59842b903ef0ebde04c5d +SHA1 (patch-salt_modules_status.py) = 5253782b046c2f7b809682f52ce4d04dab1c81ac diff --git a/sysutils/salt/patches/patch-salt_modules_cron.py b/sysutils/salt/patches/patch-salt_modules_cron.py new file mode 100644 index 00000000000..972dcd0dc72 --- /dev/null +++ b/sysutils/salt/patches/patch-salt_modules_cron.py @@ -0,0 +1,16 @@ +$NetBSD: patch-salt_modules_cron.py,v 1.1.2.2 2016/02/20 21:24:10 spz Exp $ + +Fix for cron on Solaris. +https://github.com/saltstack/salt/pull/29777 + +--- salt/modules/cron.py.orig 2016-02-01 19:40:31.000000000 +0000 ++++ salt/modules/cron.py +@@ -155,7 +155,7 @@ def _get_cron_cmdstr(path, user=None): + ''' + cmd = 'crontab' + +- if user: ++ if user and __grains__.get('os_family') not in ('Solaris', 'AIX'): + cmd += ' -u {0}'.format(user) + + return '{0} {1}'.format(cmd, path) diff --git a/sysutils/salt/patches/patch-salt_modules_status.py b/sysutils/salt/patches/patch-salt_modules_status.py new file mode 100644 index 00000000000..34bc3d26b3f --- /dev/null +++ b/sysutils/salt/patches/patch-salt_modules_status.py @@ -0,0 +1,15 @@ +$NetBSD: patch-salt_modules_status.py,v 1.2.2.2 2016/02/20 21:24:10 spz Exp $ + +Avoid a crash in "status.diskusage" when not on Linux or FreeBSD + +--- salt/modules/status.py.orig 2016-02-04 21:56:06.000000000 +0000 ++++ salt/modules/status.py +@@ -443,6 +443,8 @@ def diskusage(*args): + ifile = salt.utils.fopen(procf, 'r').readlines() + elif __grains__['kernel'] == 'FreeBSD': + ifile = __salt__['cmd.run']('mount -p').splitlines() ++ else: ++ ifile = [] + + for line in ifile: + comps = line.split() |