sysutils/salt: update to 2015.8.12

Based on joyent/pkgsrc#407 by Filip Chabik.
TritonDataCenter · Sep 13, 2016 · a301822 · a301822
1 parent 0064532
commit a301822
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 28 deletions.
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.33.2.1 2016/02/20 21:24:10 spz Exp $
 
-DISTNAME=	salt-2015.8.5
-PKGREVISION=	1
+DISTNAME=	salt-2015.8.12
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_PYPI:=s/salt/}
+MASTER_SITES=	https://pypi.python.org/packages/d1/9b/6f36ebb9533538157950329cb8ce52240607b6fbd4ee1399caabd7922a9a/
 
 MAINTAINER=	[email protected]
 HOMEPAGE=	http://saltstack.org/
@@ -36,6 +35,7 @@ PYSETUPINSTALLARGS+=	--salt-logs-dir=${VARBASE}/log/salt
 PYSETUPINSTALLARGS+=	--salt-pidfile-dir=${VARBASE}/run
 
 REPLACE_PYTHON=	*.py */*.py */*/*.py
+REPLACE_SH=		salt/templates/git/ssh-id-wrapper
 
 RCD_SCRIPTS+=		salt_master salt_minion
 SMF_INSTANCES=		master minion

diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST
@@ -1208,6 +1208,9 @@ ${PYSITELIB}/salt/modules/reg.pyo
 ${PYSITELIB}/salt/modules/rest_package.py
 ${PYSITELIB}/salt/modules/rest_package.pyc
 ${PYSITELIB}/salt/modules/rest_package.pyo
+${PYSITELIB}/salt/modules/rest_sample_utils.py
+${PYSITELIB}/salt/modules/rest_sample_utils.pyc
+${PYSITELIB}/salt/modules/rest_sample_utils.pyo
 ${PYSITELIB}/salt/modules/rest_service.py
 ${PYSITELIB}/salt/modules/rest_service.pyc
 ${PYSITELIB}/salt/modules/rest_service.pyo
@@ -3051,6 +3054,7 @@ man/man1/salt-run.1
 man/man1/salt-ssh.1
 man/man1/salt-syndic.1
 man/man1/salt-unity.1
+man/man1/spm.1
 man/man7/salt.7
 share/examples/salt/master
 share/examples/salt/minion
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
@@ -1,8 +1,7 @@
 $NetBSD: distinfo,v 1.16.2.1 2016/02/20 21:24:10 spz Exp $
 
-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
+SHA1 (salt-2015.8.12.tar.gz) = 994a3d121c604f5ac1fe7984a46596f7554f4387
+RMD160 (salt-2015.8.12.tar.gz) = ed83e8a7bc6d4971be57c67ff5b9a0974ecf5939
+SHA512 (salt-2015.8.12.tar.gz) = 8ce940a413c740bd82c6c96103d48b376a47cb8161a5d72ece3f4bf6b39134bd722787a427249726dc137064d032fa913c7f6c6db22d0808ba1a829d4f25e9ec
+Size (salt-2015.8.12.tar.gz) = 7033938 bytes
+SHA1 (patch-salt_modules_status.py) = 91b05403e1dd3792a0aeec7c6b1561ef84324684
diff --git a/sysutils/salt/patches/patch-salt_modules_cron.py b/sysutils/salt/patches/patch-salt_modules_cron.py
diff --git a/sysutils/salt/patches/patch-salt_modules_status.py b/sysutils/salt/patches/patch-salt_modules_status.py
@@ -2,10 +2,10 @@
 
 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.orig	2016-08-24 16:25:25.000000000 +0000
 +++ salt/modules/status.py
-@@ -443,6 +443,8 @@ def diskusage(*args):
-             ifile = salt.utils.fopen(procf, 'r').readlines()
+@@ -504,6 +504,8 @@ def diskusage(*args):
+                 return {}
          elif __grains__['kernel'] == 'FreeBSD':
              ifile = __salt__['cmd.run']('mount -p').splitlines()
 +        else: