From 45570a53faf33252fcf299dac3a8ea16fc40c275 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 16 Jun 2018 15:23:35 +0000 Subject: salt: updated to 2018.3.1 Version 2018.3.1 is a bugfix release for 2018.3.0. --- sysutils/salt/Makefile | 5 ++--- sysutils/salt/PLIST | 14 ++++++++++---- sysutils/salt/distinfo | 11 +++++------ sysutils/salt/patches/patch-salt_grains_core.py | 25 ------------------------- 4 files changed, 17 insertions(+), 38 deletions(-) delete mode 100644 sysutils/salt/patches/patch-salt_grains_core.py (limited to 'sysutils/salt') diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index 3f06a4e64a3..f2f96419458 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.61 2018/06/16 14:17:21 bsiegert Exp $ +# $NetBSD: Makefile,v 1.62 2018/06/16 15:23:35 adam Exp $ -DISTNAME= salt-2018.3.0 -PKGREVISION= 2 +DISTNAME= salt-2018.3.1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST index 7e7b0bd883d..05b42e8c385 100644 --- a/sysutils/salt/PLIST +++ b/sysutils/salt/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.25 2018/04/13 07:58:22 adam Exp $ +@comment $NetBSD: PLIST,v 1.26 2018/06/16 15:23:35 adam Exp $ bin/salt bin/salt-api bin/salt-call @@ -1283,9 +1283,9 @@ ${PYSITELIB}/salt/modules/jboss7.pyo ${PYSITELIB}/salt/modules/jboss7_cli.py ${PYSITELIB}/salt/modules/jboss7_cli.pyc ${PYSITELIB}/salt/modules/jboss7_cli.pyo -${PYSITELIB}/salt/modules/jenkins.py -${PYSITELIB}/salt/modules/jenkins.pyc -${PYSITELIB}/salt/modules/jenkins.pyo +${PYSITELIB}/salt/modules/jenkinsmod.py +${PYSITELIB}/salt/modules/jenkinsmod.pyc +${PYSITELIB}/salt/modules/jenkinsmod.pyo ${PYSITELIB}/salt/modules/junos.py ${PYSITELIB}/salt/modules/junos.pyc ${PYSITELIB}/salt/modules/junos.pyo @@ -4533,6 +4533,9 @@ ${PYSITELIB}/salt/utils/win_functions.pyo ${PYSITELIB}/salt/utils/win_osinfo.py ${PYSITELIB}/salt/utils/win_osinfo.pyc ${PYSITELIB}/salt/utils/win_osinfo.pyo +${PYSITELIB}/salt/utils/win_reg.py +${PYSITELIB}/salt/utils/win_reg.pyc +${PYSITELIB}/salt/utils/win_reg.pyo ${PYSITELIB}/salt/utils/win_runas.py ${PYSITELIB}/salt/utils/win_runas.pyc ${PYSITELIB}/salt/utils/win_runas.pyo @@ -4566,6 +4569,9 @@ ${PYSITELIB}/salt/utils/yast.pyo ${PYSITELIB}/salt/utils/zeromq.py ${PYSITELIB}/salt/utils/zeromq.pyc ${PYSITELIB}/salt/utils/zeromq.pyo +${PYSITELIB}/salt/utils/zfs.py +${PYSITELIB}/salt/utils/zfs.pyc +${PYSITELIB}/salt/utils/zfs.pyo ${PYSITELIB}/salt/version.py ${PYSITELIB}/salt/version.pyc ${PYSITELIB}/salt/version.pyo diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo index c5dce385117..2d22fe7de8b 100644 --- a/sysutils/salt/distinfo +++ b/sysutils/salt/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.35 2018/05/12 11:29:35 maya Exp $ +$NetBSD: distinfo,v 1.36 2018/06/16 15:23:35 adam Exp $ -SHA1 (salt-2018.3.0.tar.gz) = b891aa96775a9675fef7ca98a78073fed304e062 -RMD160 (salt-2018.3.0.tar.gz) = 54ea78736292c97367c4b34b586bce25b434ecce -SHA512 (salt-2018.3.0.tar.gz) = 3d64a4d12d4ff7effe644b682b138d8f49fd00523e9cfe3e80bebff9c944a089fb41cbac92e63139633425f49c1eebeb99145290a0bdd1b4f306da86abe9b2e5 -Size (salt-2018.3.0.tar.gz) = 13448567 bytes -SHA1 (patch-salt_grains_core.py) = 735a71cd9616be34cce6b015da7a70cace08accd +SHA1 (salt-2018.3.1.tar.gz) = 683dc72a84cf3a19dc1a5734837cf5b2dc19ef2a +RMD160 (salt-2018.3.1.tar.gz) = 8cc98668c98b89f9d244a665b5a9b76794754b32 +SHA512 (salt-2018.3.1.tar.gz) = 38af8f1e8673f14e62d4a01bdb734efe8a7c8ca5cde83ce652ea0b1e260fbe7e3df04e27033c915b8d10c2ac49a88e26dae83b7f27798fb6ab53054a1329a840 +Size (salt-2018.3.1.tar.gz) = 12939682 bytes SHA1 (patch-salt_version.py) = 1827dac3609a938fae38ee5dfd2a873c9723dfbd diff --git a/sysutils/salt/patches/patch-salt_grains_core.py b/sysutils/salt/patches/patch-salt_grains_core.py deleted file mode 100644 index f7fa7106768..00000000000 --- a/sysutils/salt/patches/patch-salt_grains_core.py +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-salt_grains_core.py,v 1.3 2018/05/12 11:29:35 maya Exp $ - -Prevent crash on NetBSD and OpenBSD when no swap is configured. -https://github.com/saltstack/salt/pull/47600 - ---- salt/grains/core.py.orig 2018-05-11 13:12:38.000000000 +0000 -+++ salt/grains/core.py -@@ -450,11 +450,13 @@ def _bsd_memdata(osdata): - mem = __salt__['cmd.run']('{0} -n hw.physmem64'.format(sysctl)) - grains['mem_total'] = int(mem) // 1024 // 1024 - -- if osdata['kernel'] == 'OpenBSD': -+ if osdata['kernel'] in ['OpenBSD', 'NetBSD']: - swapctl = salt.utils.path.which('swapctl') -- swap_total = __salt__['cmd.run']('{0} -sk'.format(swapctl)).split(' ')[1] -- else: -- swap_total = __salt__['cmd.run']('{0} -n vm.swap_total'.format(sysctl)) -+ swap_data = __salt__['cmd.run']('{0} -sk'.format(swapctl)) -+ if swap_data == 'no swap devices configured': -+ swap_total = 0 -+ else: -+ swap_total = swap_data.split(' ')[1] - grains['swap_total'] = int(swap_total) // 1024 // 1024 - return grains - -- cgit v1.2.3