. Fixed rc.d script by adding comment_interpreter

. Updated salt to version 0.15.0

From SaltStack website:

Salt 0.15.0 comes with many smaller features and a few larger ones.

The Salt Mine

First there was the peer system, allowing for commands to be executed from a
minion to other minions to gather data live. Then there was the external job
cache for storing and accessing long term data. Now the middle ground is being
filled in with the Salt Mine. The Salt Mine is a system used to execute
functions on a regular basis on minions and then store only the most recent
data from the functions on the master, then the data is looked up via targets.

The mine caches data that is public to all minions, so when a minion posts
data to the mine all other minions can see it.

IPV6 Support

0.13.0 saw the addition of initial IPV6 support but errors were encountered
and it needed to be stripped out. This time the code covers more cases and
must be explicitly enabled. But the support is much more extensive than before.

Copy Files From Minions to the Master

Minions have long been able to copy files down from the master file server,
but until now files could not be easily copied from the minion up to the
master.

A new function called cp.push can push files from the minions up to the master
server. The uploaded files are then cached on the master in the master
cachedir for each minon.

Better Template Debugging

Template errors have long been a burden when writing states and pillar. 0.15.0
will now send the compiled template data to the debug log, this makes tracking
down the intermittent stage templates much easier. So running state.sls or
state.highstate with -l debug will now print out the rendered templates in the
debug information.

State Event Firing

The state system is now more closely tied to the master's event bus. Now when
a state fails the failure will be fired on the master event bus so that the
reactor can respond to it.

Major Syndic Updates

The Syndic system has been basically re-written. Now it runs in a completely
asynchronous way and functions primarily as an event broker. This means that
the events fired on the syndic are now pushed up to the higher level master
instead of the old method used which waited for the client libraries to return.

This makes the syndic much more accurate and powerful, it also means that all
events fired on the syndic master make it up the pipe as well making a reactor
on the higher level master able to react to minions further downstream.

Peer System Updates

The Peer System has been updated to run using the client libraries instead of
firing directly over the publish bus. This makes the peer system much more
consistent and reliable.

Minion Key Revocation

In the past when a minion was decommissioned the key needed to be manually
deleted on the master, but now a function on the minion can be used to revoke
the calling minion's key:

salt-call saltutil.revoke_auth

Function Return Codes

Functions can now be assigned numeric return codes to determine if the
function executed successfully. While not all functions have been given return
codes, many have and it is an ongoing effort to fill out all functions that
might return a non-zero return code.

Functions in Overstate

The overstate system was originally created to just manage the execution of
states, but with the addition of return codes to functions, requisite logic
can now be used with respect to the overstate. This means that an overstate
stage can now run single functions instead of just state executions.

Pillar Error Reporting

Previously if errors surfaced in pillar, then the pillar would consist of only
and empty dict. Now all data that was successfully rendered stays in pillar
and the render error is also made available. If errors are found in the
pillar, states will refuse to run.

Using Cached State Data

Sometimes states are executed purely to maintain a specific state rather than
to update states with new configs. This is grounds for the new cached state
system. By adding cache=True to a state call the state will not be generated
fresh from the master but the last state data to be generated will be used.
If no previous state data is available then fresh data will be generated.

Monitoring States

The new monitoring states system has been started. This is very young but
allows for states to be used to configure monitoring routines. So far only one
monitoring state is available, the disk.status state. As more capabilities are
added to Salt UI the monitoring capabilities of Salt will continue to be
expanded.

5 files changed, 49 insertions, 15 deletions

diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index 622eeece6ab..b3a03518e06 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2013/04/28 09:46:24 imil Exp $
+# $NetBSD: Makefile,v 1.12 2013/05/05 12:26:23 imil Exp $
 #
 
-DISTNAME=	salt-0.14.1
+DISTNAME=	salt-0.15.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://pypi.python.org/packages/source/s/salt/
 
@@ -24,14 +24,18 @@ 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"
 
-PKG_SYSCONFSUBDIR=	salt
+REPLACE_PYTHON+=	salt/modules/munin.py
+REPLACE_PYTHON+=	salt/returners/sentry_return.py
+
+RCD_SCRIPTS+=		salt_master salt_minion
+FILES_SUBST+=		PYTHON=${PYTHONBIN:Q}
 
-EGDIR=		${PREFIX}/share/examples/salt
-INSTALLATION_DIRS+= ${EGDIR}
-CONF_FILES+=	${EGDIR}/master ${PKG_SYSCONFDIR}/master
-CONF_FILES+=	${EGDIR}/minion ${PKG_SYSCONFDIR}/minion
+PKG_SYSCONFSUBDIR=	salt
 
-RCD_SCRIPTS+=	salt_master salt_minion
+EGDIR=			${PREFIX}/share/examples/salt
+INSTALLATION_DIRS+= 	${EGDIR}
+CONF_FILES+=		${EGDIR}/master ${PKG_SYSCONFDIR}/master
+CONF_FILES+=		${EGDIR}/minion ${PKG_SYSCONFDIR}/minion
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/conf/master ${DESTDIR}${EGDIR}/
@@ -45,6 +49,7 @@ post-install:
 # There's also an optional dependency on gcc, for Cython support, but
 # we don't bother with that here.
 #
+.include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
 DEPENDS+= zeromq>=2.1.9:../../net/zeromq
 DEPENDS+= ${PYPKGPREFIX}-zmq>=2.1.9:../../net/py-zmq
diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST
index 4a91d82986a..31824351efe 100644
--- a/sysutils/salt/PLIST
+++ b/sysutils/salt/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/04/28 09:46:24 imil Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/05/05 12:26:23 imil Exp $
 bin/salt
 bin/salt-call
 bin/salt-cp
@@ -146,6 +146,9 @@ ${PYSITELIB}/salt/modules/cron.pyo
 ${PYSITELIB}/salt/modules/daemontools.py
 ${PYSITELIB}/salt/modules/daemontools.pyc
 ${PYSITELIB}/salt/modules/daemontools.pyo
+${PYSITELIB}/salt/modules/darwin_sysctl.py
+${PYSITELIB}/salt/modules/darwin_sysctl.pyc
+${PYSITELIB}/salt/modules/darwin_sysctl.pyo
 ${PYSITELIB}/salt/modules/data.py
 ${PYSITELIB}/salt/modules/data.pyc
 ${PYSITELIB}/salt/modules/data.pyo
@@ -284,9 +287,15 @@ ${PYSITELIB}/salt/modules/logrotate.pyo
 ${PYSITELIB}/salt/modules/makeconf.py
 ${PYSITELIB}/salt/modules/makeconf.pyc
 ${PYSITELIB}/salt/modules/makeconf.pyo
+${PYSITELIB}/salt/modules/match.py
+${PYSITELIB}/salt/modules/match.pyc
+${PYSITELIB}/salt/modules/match.pyo
 ${PYSITELIB}/salt/modules/mdadm.py
 ${PYSITELIB}/salt/modules/mdadm.pyc
 ${PYSITELIB}/salt/modules/mdadm.pyo
+${PYSITELIB}/salt/modules/mine.py
+${PYSITELIB}/salt/modules/mine.pyc
+${PYSITELIB}/salt/modules/mine.pyo
 ${PYSITELIB}/salt/modules/mongodb.py
 ${PYSITELIB}/salt/modules/mongodb.pyc
 ${PYSITELIB}/salt/modules/mongodb.pyo
@@ -654,6 +663,9 @@ ${PYSITELIB}/salt/returners/cassandra_return.pyo
 ${PYSITELIB}/salt/returners/local.py
 ${PYSITELIB}/salt/returners/local.pyc
 ${PYSITELIB}/salt/returners/local.pyo
+${PYSITELIB}/salt/returners/memcache_return.py
+${PYSITELIB}/salt/returners/memcache_return.pyc
+${PYSITELIB}/salt/returners/memcache_return.pyo
 ${PYSITELIB}/salt/returners/mongo_future_return.py
 ${PYSITELIB}/salt/returners/mongo_future_return.pyc
 ${PYSITELIB}/salt/returners/mongo_future_return.pyo
@@ -747,6 +759,9 @@ ${PYSITELIB}/salt/states/cron.pyo
 ${PYSITELIB}/salt/states/debconfmod.py
 ${PYSITELIB}/salt/states/debconfmod.pyc
 ${PYSITELIB}/salt/states/debconfmod.pyo
+${PYSITELIB}/salt/states/disk.py
+${PYSITELIB}/salt/states/disk.pyc
+${PYSITELIB}/salt/states/disk.pyo
 ${PYSITELIB}/salt/states/file.py
 ${PYSITELIB}/salt/states/file.pyc
 ${PYSITELIB}/salt/states/file.pyo
@@ -783,9 +798,15 @@ ${PYSITELIB}/salt/states/libvirt.pyo
 ${PYSITELIB}/salt/states/locale.py
 ${PYSITELIB}/salt/states/locale.pyc
 ${PYSITELIB}/salt/states/locale.pyo
+${PYSITELIB}/salt/states/lvm.py
+${PYSITELIB}/salt/states/lvm.pyc
+${PYSITELIB}/salt/states/lvm.pyo
 ${PYSITELIB}/salt/states/makeconf.py
 ${PYSITELIB}/salt/states/makeconf.pyc
 ${PYSITELIB}/salt/states/makeconf.pyo
+${PYSITELIB}/salt/states/mdadm.py
+${PYSITELIB}/salt/states/mdadm.pyc
+${PYSITELIB}/salt/states/mdadm.pyo
 ${PYSITELIB}/salt/states/module.py
 ${PYSITELIB}/salt/states/module.pyc
 ${PYSITELIB}/salt/states/module.pyo
@@ -837,6 +858,9 @@ ${PYSITELIB}/salt/states/postgres_group.pyo
 ${PYSITELIB}/salt/states/postgres_user.py
 ${PYSITELIB}/salt/states/postgres_user.pyc
 ${PYSITELIB}/salt/states/postgres_user.pyo
+${PYSITELIB}/salt/states/quota.py
+${PYSITELIB}/salt/states/quota.pyc
+${PYSITELIB}/salt/states/quota.pyo
 ${PYSITELIB}/salt/states/rabbitmq_user.py
 ${PYSITELIB}/salt/states/rabbitmq_user.pyc
 ${PYSITELIB}/salt/states/rabbitmq_user.pyo
@@ -933,6 +957,9 @@ ${PYSITELIB}/salt/utils/migrations.pyo
 ${PYSITELIB}/salt/utils/minions.py
 ${PYSITELIB}/salt/utils/minions.pyc
 ${PYSITELIB}/salt/utils/minions.pyo
+${PYSITELIB}/salt/utils/odict.py
+${PYSITELIB}/salt/utils/odict.pyc
+${PYSITELIB}/salt/utils/odict.pyo
 ${PYSITELIB}/salt/utils/parsers.py
 ${PYSITELIB}/salt/utils/parsers.pyc
 ${PYSITELIB}/salt/utils/parsers.pyo
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
index d806c28fce1..836924d59bb 100644
--- a/sysutils/salt/distinfo
+++ b/sysutils/salt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2013/04/28 09:46:24 imil Exp $
+$NetBSD: distinfo,v 1.4 2013/05/05 12:26:23 imil Exp $
 
-SHA1 (salt-0.14.1.tar.gz) = 3fe6bfd0a97a7f9bc5e9297f4fdf1b566ad4ae97
-RMD160 (salt-0.14.1.tar.gz) = b68985fff2d12f97cc3640ac4299c36ea3c5d5df
-Size (salt-0.14.1.tar.gz) = 3366334 bytes
+SHA1 (salt-0.15.0.tar.gz) = 2369b6b9a931c80ff6a09b38f94ee27fe5a36593
+RMD160 (salt-0.15.0.tar.gz) = 27d027c4243abfd636d59769714784fc39aec78b
+Size (salt-0.15.0.tar.gz) = 3411308 bytes
 SHA1 (patch-setup.py) = 15907268df5ee1d06e1c932dc84fd7701156519d
diff --git a/sysutils/salt/files/salt_master.sh b/sysutils/salt/files/salt_master.sh
index a040bf2c7a9..7bed26d118c 100644
--- a/sysutils/salt/files/salt_master.sh
+++ b/sysutils/salt/files/salt_master.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: salt_master.sh,v 1.1 2012/01/21 20:26:58 apb Exp $
+# $NetBSD: salt_master.sh,v 1.2 2013/05/05 12:26:23 imil Exp $
 #
 
 # PROVIDE: salt_master
@@ -13,6 +13,7 @@ name="salt_master"
 rcvar=$name
 command="@PREFIX@/bin/salt-master"
 command_args="-d"
+command_interpreter=@PYTHON@
 required_files="@PKG_SYSCONFDIR@/master"
 
 load_rc_config $name
diff --git a/sysutils/salt/files/salt_minion.sh b/sysutils/salt/files/salt_minion.sh
index b1a64c6790f..f6ffc5eee30 100644
--- a/sysutils/salt/files/salt_minion.sh
+++ b/sysutils/salt/files/salt_minion.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: salt_minion.sh,v 1.1 2012/01/21 20:26:58 apb Exp $
+# $NetBSD: salt_minion.sh,v 1.2 2013/05/05 12:26:23 imil Exp $
 #
 
 # PROVIDE: salt_minion
@@ -13,6 +13,7 @@ name="salt_minion"
 rcvar=$name
 command="@PREFIX@/bin/salt-minion"
 command_args="-d"
+command_interpreter=@PYTHON@
 required_files="@PKG_SYSCONFDIR@/minion"
 
 load_rc_config $name