Update salt from 0.10.5 to 0.14.1

Major features

. Salt - As a Cloud Controller
. Libvirt State
. New get Functions

Full changelog is available at:

http://docs.saltstack.com/topics/releases/0.14.0.html?highlight=changes

4 files changed, 305 insertions, 49 deletions

diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index c6e8ef738e6..622eeece6ab 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2012/12/06 08:01:21 apb Exp $
+# $NetBSD: Makefile,v 1.11 2013/04/28 09:46:24 imil Exp $
 #
 
-DISTNAME=	salt-0.10.5
+DISTNAME=	salt-0.14.1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://cloud.github.com/downloads/saltstack/salt/
+MASTER_SITES=	http://pypi.python.org/packages/source/s/salt/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://saltstack.org/
@@ -21,20 +21,21 @@ 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"
 
 PKG_SYSCONFSUBDIR=	salt
 
 EGDIR=		${PREFIX}/share/examples/salt
 INSTALLATION_DIRS+= ${EGDIR}
-CONF_FILES+=	${EGDIR}/master.template ${PKG_SYSCONFDIR}/master
-CONF_FILES+=	${EGDIR}/minion.template ${PKG_SYSCONFDIR}/minion
+CONF_FILES+=	${EGDIR}/master ${PKG_SYSCONFDIR}/master
+CONF_FILES+=	${EGDIR}/minion ${PKG_SYSCONFDIR}/minion
 
 RCD_SCRIPTS+=	salt_master salt_minion
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/conf/master.template ${DESTDIR}${EGDIR}/
-	${INSTALL_DATA} ${WRKSRC}/conf/minion.template ${DESTDIR}${EGDIR}/
+	${INSTALL_DATA} ${WRKSRC}/conf/master ${DESTDIR}${EGDIR}/
+	${INSTALL_DATA} ${WRKSRC}/conf/minion ${DESTDIR}${EGDIR}/
 
 # Dependencies are documented at
 # http://docs.saltstack.org/en/latest/topics/installation/index.html#dependencies
diff --git a/sysutils/salt/PLIST b/sysutils/salt/PLIST
index 3db136d2e43..4a91d82986a 100644
--- a/sysutils/salt/PLIST
+++ b/sysutils/salt/PLIST
@@ -1,4 +1,12 @@
-@comment $NetBSD: PLIST,v 1.3 2012/12/06 08:01:21 apb Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/04/28 09:46:24 imil Exp $
+bin/salt
+bin/salt-call
+bin/salt-cp
+bin/salt-key
+bin/salt-master
+bin/salt-minion
+bin/salt-run
+bin/salt-syndic
 ${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/salt/__init__.py
 ${PYSITELIB}/salt/__init__.pyc
@@ -6,9 +14,15 @@ ${PYSITELIB}/salt/__init__.pyo
 ${PYSITELIB}/salt/_compat.py
 ${PYSITELIB}/salt/_compat.pyc
 ${PYSITELIB}/salt/_compat.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/keystone.py
+${PYSITELIB}/salt/auth/keystone.pyc
+${PYSITELIB}/salt/auth/keystone.pyo
 ${PYSITELIB}/salt/auth/ldap.py
 ${PYSITELIB}/salt/auth/ldap.pyc
 ${PYSITELIB}/salt/auth/ldap.pyo
@@ -45,6 +59,15 @@ ${PYSITELIB}/salt/ext/__init__.pyo
 ${PYSITELIB}/salt/fileclient.py
 ${PYSITELIB}/salt/fileclient.pyc
 ${PYSITELIB}/salt/fileclient.pyo
+${PYSITELIB}/salt/fileserver/__init__.py
+${PYSITELIB}/salt/fileserver/__init__.pyc
+${PYSITELIB}/salt/fileserver/__init__.pyo
+${PYSITELIB}/salt/fileserver/gitfs.py
+${PYSITELIB}/salt/fileserver/gitfs.pyc
+${PYSITELIB}/salt/fileserver/gitfs.pyo
+${PYSITELIB}/salt/fileserver/roots.py
+${PYSITELIB}/salt/fileserver/roots.pyc
+${PYSITELIB}/salt/fileserver/roots.pyo
 ${PYSITELIB}/salt/grains/__init__.py
 ${PYSITELIB}/salt/grains/__init__.pyc
 ${PYSITELIB}/salt/grains/__init__.pyo
@@ -78,6 +101,9 @@ ${PYSITELIB}/salt/modules/__init__.pyo
 ${PYSITELIB}/salt/modules/aliases.py
 ${PYSITELIB}/salt/modules/aliases.pyc
 ${PYSITELIB}/salt/modules/aliases.pyo
+${PYSITELIB}/salt/modules/alternatives.py
+${PYSITELIB}/salt/modules/alternatives.pyc
+${PYSITELIB}/salt/modules/alternatives.pyo
 ${PYSITELIB}/salt/modules/apache.py
 ${PYSITELIB}/salt/modules/apache.pyc
 ${PYSITELIB}/salt/modules/apache.pyo
@@ -105,9 +131,6 @@ ${PYSITELIB}/salt/modules/butterkvm.pyo
 ${PYSITELIB}/salt/modules/cassandra.py
 ${PYSITELIB}/salt/modules/cassandra.pyc
 ${PYSITELIB}/salt/modules/cassandra.pyo
-${PYSITELIB}/salt/modules/cluster.py
-${PYSITELIB}/salt/modules/cluster.pyc
-${PYSITELIB}/salt/modules/cluster.pyo
 ${PYSITELIB}/salt/modules/cmdmod.py
 ${PYSITELIB}/salt/modules/cmdmod.pyc
 ${PYSITELIB}/salt/modules/cmdmod.pyo
@@ -138,12 +161,27 @@ ${PYSITELIB}/salt/modules/disk.pyo
 ${PYSITELIB}/salt/modules/djangomod.py
 ${PYSITELIB}/salt/modules/djangomod.pyc
 ${PYSITELIB}/salt/modules/djangomod.pyo
+${PYSITELIB}/salt/modules/dnsmasq.py
+${PYSITELIB}/salt/modules/dnsmasq.pyc
+${PYSITELIB}/salt/modules/dnsmasq.pyo
+${PYSITELIB}/salt/modules/dnsutil.py
+${PYSITELIB}/salt/modules/dnsutil.pyc
+${PYSITELIB}/salt/modules/dnsutil.pyo
+${PYSITELIB}/salt/modules/dpkg.py
+${PYSITELIB}/salt/modules/dpkg.pyc
+${PYSITELIB}/salt/modules/dpkg.pyo
 ${PYSITELIB}/salt/modules/ebuild.py
 ${PYSITELIB}/salt/modules/ebuild.pyc
 ${PYSITELIB}/salt/modules/ebuild.pyo
+${PYSITELIB}/salt/modules/eix.py
+${PYSITELIB}/salt/modules/eix.pyc
+${PYSITELIB}/salt/modules/eix.pyo
 ${PYSITELIB}/salt/modules/event.py
 ${PYSITELIB}/salt/modules/event.pyc
 ${PYSITELIB}/salt/modules/event.pyo
+${PYSITELIB}/salt/modules/extfs.py
+${PYSITELIB}/salt/modules/extfs.pyc
+${PYSITELIB}/salt/modules/extfs.pyo
 ${PYSITELIB}/salt/modules/file.py
 ${PYSITELIB}/salt/modules/file.pyc
 ${PYSITELIB}/salt/modules/file.pyo
@@ -168,6 +206,9 @@ ${PYSITELIB}/salt/modules/gem.pyo
 ${PYSITELIB}/salt/modules/gentoo_service.py
 ${PYSITELIB}/salt/modules/gentoo_service.pyc
 ${PYSITELIB}/salt/modules/gentoo_service.pyo
+${PYSITELIB}/salt/modules/gentoolkitmod.py
+${PYSITELIB}/salt/modules/gentoolkitmod.pyc
+${PYSITELIB}/salt/modules/gentoolkitmod.pyo
 ${PYSITELIB}/salt/modules/git.py
 ${PYSITELIB}/salt/modules/git.pyc
 ${PYSITELIB}/salt/modules/git.pyo
@@ -180,15 +221,30 @@ ${PYSITELIB}/salt/modules/grains.pyo
 ${PYSITELIB}/salt/modules/groupadd.py
 ${PYSITELIB}/salt/modules/groupadd.pyc
 ${PYSITELIB}/salt/modules/groupadd.pyo
-${PYSITELIB}/salt/modules/grub.py
-${PYSITELIB}/salt/modules/grub.pyc
-${PYSITELIB}/salt/modules/grub.pyo
+${PYSITELIB}/salt/modules/grub_legacy.py
+${PYSITELIB}/salt/modules/grub_legacy.pyc
+${PYSITELIB}/salt/modules/grub_legacy.pyo
+${PYSITELIB}/salt/modules/guestfs.py
+${PYSITELIB}/salt/modules/guestfs.pyc
+${PYSITELIB}/salt/modules/guestfs.pyo
 ${PYSITELIB}/salt/modules/hg.py
 ${PYSITELIB}/salt/modules/hg.pyc
 ${PYSITELIB}/salt/modules/hg.pyo
 ${PYSITELIB}/salt/modules/hosts.py
 ${PYSITELIB}/salt/modules/hosts.pyc
 ${PYSITELIB}/salt/modules/hosts.pyo
+${PYSITELIB}/salt/modules/img.py
+${PYSITELIB}/salt/modules/img.pyc
+${PYSITELIB}/salt/modules/img.pyo
+${PYSITELIB}/salt/modules/iptables.py
+${PYSITELIB}/salt/modules/iptables.pyc
+${PYSITELIB}/salt/modules/iptables.pyo
+${PYSITELIB}/salt/modules/key.py
+${PYSITELIB}/salt/modules/key.pyc
+${PYSITELIB}/salt/modules/key.pyo
+${PYSITELIB}/salt/modules/keyboard.py
+${PYSITELIB}/salt/modules/keyboard.pyc
+${PYSITELIB}/salt/modules/keyboard.pyo
 ${PYSITELIB}/salt/modules/keystone.py
 ${PYSITELIB}/salt/modules/keystone.pyc
 ${PYSITELIB}/salt/modules/keystone.pyo
@@ -201,12 +257,33 @@ ${PYSITELIB}/salt/modules/kvm_hyper.pyo
 ${PYSITELIB}/salt/modules/launchctl.py
 ${PYSITELIB}/salt/modules/launchctl.pyc
 ${PYSITELIB}/salt/modules/launchctl.pyo
+${PYSITELIB}/salt/modules/layman.py
+${PYSITELIB}/salt/modules/layman.pyc
+${PYSITELIB}/salt/modules/layman.pyo
 ${PYSITELIB}/salt/modules/ldapmod.py
 ${PYSITELIB}/salt/modules/ldapmod.pyc
 ${PYSITELIB}/salt/modules/ldapmod.pyo
+${PYSITELIB}/salt/modules/linux_acl.py
+${PYSITELIB}/salt/modules/linux_acl.pyc
+${PYSITELIB}/salt/modules/linux_acl.pyo
+${PYSITELIB}/salt/modules/linux_lvm.py
+${PYSITELIB}/salt/modules/linux_lvm.pyc
+${PYSITELIB}/salt/modules/linux_lvm.pyo
 ${PYSITELIB}/salt/modules/linux_sysctl.py
 ${PYSITELIB}/salt/modules/linux_sysctl.pyc
 ${PYSITELIB}/salt/modules/linux_sysctl.pyo
+${PYSITELIB}/salt/modules/locale.py
+${PYSITELIB}/salt/modules/locale.pyc
+${PYSITELIB}/salt/modules/locale.pyo
+${PYSITELIB}/salt/modules/locate.py
+${PYSITELIB}/salt/modules/locate.pyc
+${PYSITELIB}/salt/modules/locate.pyo
+${PYSITELIB}/salt/modules/logrotate.py
+${PYSITELIB}/salt/modules/logrotate.pyc
+${PYSITELIB}/salt/modules/logrotate.pyo
+${PYSITELIB}/salt/modules/makeconf.py
+${PYSITELIB}/salt/modules/makeconf.pyc
+${PYSITELIB}/salt/modules/makeconf.pyo
 ${PYSITELIB}/salt/modules/mdadm.py
 ${PYSITELIB}/salt/modules/mdadm.pyc
 ${PYSITELIB}/salt/modules/mdadm.pyo
@@ -222,18 +299,27 @@ ${PYSITELIB}/salt/modules/moosefs.pyo
 ${PYSITELIB}/salt/modules/mount.py
 ${PYSITELIB}/salt/modules/mount.pyc
 ${PYSITELIB}/salt/modules/mount.pyo
+${PYSITELIB}/salt/modules/munin.py
+${PYSITELIB}/salt/modules/munin.pyc
+${PYSITELIB}/salt/modules/munin.pyo
 ${PYSITELIB}/salt/modules/mysql.py
 ${PYSITELIB}/salt/modules/mysql.pyc
 ${PYSITELIB}/salt/modules/mysql.pyo
 ${PYSITELIB}/salt/modules/network.py
 ${PYSITELIB}/salt/modules/network.pyc
 ${PYSITELIB}/salt/modules/network.pyo
+${PYSITELIB}/salt/modules/nfs3.py
+${PYSITELIB}/salt/modules/nfs3.pyc
+${PYSITELIB}/salt/modules/nfs3.pyo
 ${PYSITELIB}/salt/modules/nginx.py
 ${PYSITELIB}/salt/modules/nginx.pyc
 ${PYSITELIB}/salt/modules/nginx.pyo
 ${PYSITELIB}/salt/modules/nova.py
 ${PYSITELIB}/salt/modules/nova.pyc
 ${PYSITELIB}/salt/modules/nova.pyo
+${PYSITELIB}/salt/modules/npm.py
+${PYSITELIB}/salt/modules/npm.pyc
+${PYSITELIB}/salt/modules/npm.pyo
 ${PYSITELIB}/salt/modules/nzbget.py
 ${PYSITELIB}/salt/modules/nzbget.pyc
 ${PYSITELIB}/salt/modules/nzbget.pyo
@@ -249,6 +335,12 @@ ${PYSITELIB}/salt/modules/osxdesktop.pyo
 ${PYSITELIB}/salt/modules/pacman.py
 ${PYSITELIB}/salt/modules/pacman.pyc
 ${PYSITELIB}/salt/modules/pacman.pyo
+${PYSITELIB}/salt/modules/pam.py
+${PYSITELIB}/salt/modules/pam.pyc
+${PYSITELIB}/salt/modules/pam.pyo
+${PYSITELIB}/salt/modules/parted.py
+${PYSITELIB}/salt/modules/parted.pyc
+${PYSITELIB}/salt/modules/parted.pyo
 ${PYSITELIB}/salt/modules/pecl.py
 ${PYSITELIB}/salt/modules/pecl.pyc
 ${PYSITELIB}/salt/modules/pecl.pyo
@@ -258,6 +350,9 @@ ${PYSITELIB}/salt/modules/pillar.pyo
 ${PYSITELIB}/salt/modules/pip.py
 ${PYSITELIB}/salt/modules/pip.pyc
 ${PYSITELIB}/salt/modules/pip.pyo
+${PYSITELIB}/salt/modules/pkg_resource.py
+${PYSITELIB}/salt/modules/pkg_resource.pyc
+${PYSITELIB}/salt/modules/pkg_resource.pyo
 ${PYSITELIB}/salt/modules/pkgng.py
 ${PYSITELIB}/salt/modules/pkgng.pyc
 ${PYSITELIB}/salt/modules/pkgng.pyo
@@ -285,6 +380,15 @@ ${PYSITELIB}/salt/modules/pw_group.pyo
 ${PYSITELIB}/salt/modules/pw_user.py
 ${PYSITELIB}/salt/modules/pw_user.pyc
 ${PYSITELIB}/salt/modules/pw_user.pyo
+${PYSITELIB}/salt/modules/qemu_img.py
+${PYSITELIB}/salt/modules/qemu_img.pyc
+${PYSITELIB}/salt/modules/qemu_img.pyo
+${PYSITELIB}/salt/modules/qemu_nbd.py
+${PYSITELIB}/salt/modules/qemu_nbd.pyc
+${PYSITELIB}/salt/modules/qemu_nbd.pyo
+${PYSITELIB}/salt/modules/quota.py
+${PYSITELIB}/salt/modules/quota.pyc
+${PYSITELIB}/salt/modules/quota.pyo
 ${PYSITELIB}/salt/modules/rabbitmq.py
 ${PYSITELIB}/salt/modules/rabbitmq.pyc
 ${PYSITELIB}/salt/modules/rabbitmq.pyo
@@ -304,9 +408,15 @@ ${PYSITELIB}/salt/modules/rh_ip/rh6_eth.jinja
 ${PYSITELIB}/salt/modules/rh_service.py
 ${PYSITELIB}/salt/modules/rh_service.pyc
 ${PYSITELIB}/salt/modules/rh_service.pyo
+${PYSITELIB}/salt/modules/rpm.py
+${PYSITELIB}/salt/modules/rpm.pyc
+${PYSITELIB}/salt/modules/rpm.pyo
 ${PYSITELIB}/salt/modules/rvm.py
 ${PYSITELIB}/salt/modules/rvm.pyc
 ${PYSITELIB}/salt/modules/rvm.pyo
+${PYSITELIB}/salt/modules/s3.py
+${PYSITELIB}/salt/modules/s3.pyc
+${PYSITELIB}/salt/modules/s3.pyo
 ${PYSITELIB}/salt/modules/saltutil.py
 ${PYSITELIB}/salt/modules/saltutil.pyc
 ${PYSITELIB}/salt/modules/saltutil.pyo
@@ -355,12 +465,24 @@ ${PYSITELIB}/salt/modules/supervisord.pyo
 ${PYSITELIB}/salt/modules/svn.py
 ${PYSITELIB}/salt/modules/svn.pyc
 ${PYSITELIB}/salt/modules/svn.pyo
+${PYSITELIB}/salt/modules/sysbench.py
+${PYSITELIB}/salt/modules/sysbench.pyc
+${PYSITELIB}/salt/modules/sysbench.pyo
+${PYSITELIB}/salt/modules/sysmod.py
+${PYSITELIB}/salt/modules/sysmod.pyc
+${PYSITELIB}/salt/modules/sysmod.pyo
+${PYSITELIB}/salt/modules/system.py
+${PYSITELIB}/salt/modules/system.pyc
+${PYSITELIB}/salt/modules/system.pyo
 ${PYSITELIB}/salt/modules/systemd.py
 ${PYSITELIB}/salt/modules/systemd.pyc
 ${PYSITELIB}/salt/modules/systemd.pyo
 ${PYSITELIB}/salt/modules/test.py
 ${PYSITELIB}/salt/modules/test.pyc
 ${PYSITELIB}/salt/modules/test.pyo
+${PYSITELIB}/salt/modules/timezone.py
+${PYSITELIB}/salt/modules/timezone.pyc
+${PYSITELIB}/salt/modules/timezone.pyo
 ${PYSITELIB}/salt/modules/tls.py
 ${PYSITELIB}/salt/modules/tls.pyc
 ${PYSITELIB}/salt/modules/tls.pyo
@@ -400,6 +522,9 @@ ${PYSITELIB}/salt/modules/win_service.pyo
 ${PYSITELIB}/salt/modules/win_shadow.py
 ${PYSITELIB}/salt/modules/win_shadow.pyc
 ${PYSITELIB}/salt/modules/win_shadow.pyo
+${PYSITELIB}/salt/modules/win_status.py
+${PYSITELIB}/salt/modules/win_status.pyc
+${PYSITELIB}/salt/modules/win_status.pyo
 ${PYSITELIB}/salt/modules/win_useradd.py
 ${PYSITELIB}/salt/modules/win_useradd.pyc
 ${PYSITELIB}/salt/modules/win_useradd.pyo
@@ -418,6 +543,9 @@ ${PYSITELIB}/salt/modules/zypper.pyo
 ${PYSITELIB}/salt/output/__init__.py
 ${PYSITELIB}/salt/output/__init__.pyc
 ${PYSITELIB}/salt/output/__init__.pyo
+${PYSITELIB}/salt/output/grains.py
+${PYSITELIB}/salt/output/grains.pyc
+${PYSITELIB}/salt/output/grains.pyo
 ${PYSITELIB}/salt/output/highstate.py
 ${PYSITELIB}/salt/output/highstate.pyc
 ${PYSITELIB}/salt/output/highstate.pyo
@@ -427,6 +555,18 @@ ${PYSITELIB}/salt/output/json_out.pyo
 ${PYSITELIB}/salt/output/key.py
 ${PYSITELIB}/salt/output/key.pyc
 ${PYSITELIB}/salt/output/key.pyo
+${PYSITELIB}/salt/output/nested.py
+${PYSITELIB}/salt/output/nested.pyc
+${PYSITELIB}/salt/output/nested.pyo
+${PYSITELIB}/salt/output/no_out.py
+${PYSITELIB}/salt/output/no_out.pyc
+${PYSITELIB}/salt/output/no_out.pyo
+${PYSITELIB}/salt/output/no_return.py
+${PYSITELIB}/salt/output/no_return.pyc
+${PYSITELIB}/salt/output/no_return.pyo
+${PYSITELIB}/salt/output/overstatestage.py
+${PYSITELIB}/salt/output/overstatestage.pyc
+${PYSITELIB}/salt/output/overstatestage.pyo
 ${PYSITELIB}/salt/output/pprint_out.py
 ${PYSITELIB}/salt/output/pprint_out.pyc
 ${PYSITELIB}/salt/output/pprint_out.pyo
@@ -436,9 +576,15 @@ ${PYSITELIB}/salt/output/raw.pyo
 ${PYSITELIB}/salt/output/txt.py
 ${PYSITELIB}/salt/output/txt.pyc
 ${PYSITELIB}/salt/output/txt.pyo
+${PYSITELIB}/salt/output/virt_query.py
+${PYSITELIB}/salt/output/virt_query.pyc
+${PYSITELIB}/salt/output/virt_query.pyo
 ${PYSITELIB}/salt/output/yaml_out.py
 ${PYSITELIB}/salt/output/yaml_out.pyc
 ${PYSITELIB}/salt/output/yaml_out.pyo
+${PYSITELIB}/salt/overstate.py
+${PYSITELIB}/salt/overstate.pyc
+${PYSITELIB}/salt/overstate.pyo
 ${PYSITELIB}/salt/payload.py
 ${PYSITELIB}/salt/payload.pyc
 ${PYSITELIB}/salt/payload.pyo
@@ -451,15 +597,24 @@ ${PYSITELIB}/salt/pillar/cmd_json.pyo
 ${PYSITELIB}/salt/pillar/cmd_yaml.py
 ${PYSITELIB}/salt/pillar/cmd_yaml.pyc
 ${PYSITELIB}/salt/pillar/cmd_yaml.pyo
+${PYSITELIB}/salt/pillar/cobbler.py
+${PYSITELIB}/salt/pillar/cobbler.pyc
+${PYSITELIB}/salt/pillar/cobbler.pyo
 ${PYSITELIB}/salt/pillar/hiera.py
 ${PYSITELIB}/salt/pillar/hiera.pyc
 ${PYSITELIB}/salt/pillar/hiera.pyo
+${PYSITELIB}/salt/pillar/libvirt.py
+${PYSITELIB}/salt/pillar/libvirt.pyc
+${PYSITELIB}/salt/pillar/libvirt.pyo
 ${PYSITELIB}/salt/pillar/mongo.py
 ${PYSITELIB}/salt/pillar/mongo.pyc
 ${PYSITELIB}/salt/pillar/mongo.pyo
 ${PYSITELIB}/salt/pillar/pillar_ldap.py
 ${PYSITELIB}/salt/pillar/pillar_ldap.pyc
 ${PYSITELIB}/salt/pillar/pillar_ldap.pyo
+${PYSITELIB}/salt/pillar/puppet.py
+${PYSITELIB}/salt/pillar/puppet.pyc
+${PYSITELIB}/salt/pillar/puppet.pyo
 ${PYSITELIB}/salt/renderers/__init__.py
 ${PYSITELIB}/salt/renderers/__init__.pyc
 ${PYSITELIB}/salt/renderers/__init__.pyo
@@ -475,6 +630,9 @@ ${PYSITELIB}/salt/renderers/mako.pyo
 ${PYSITELIB}/salt/renderers/py.py
 ${PYSITELIB}/salt/renderers/py.pyc
 ${PYSITELIB}/salt/renderers/py.pyo
+${PYSITELIB}/salt/renderers/pydsl.py
+${PYSITELIB}/salt/renderers/pydsl.pyc
+${PYSITELIB}/salt/renderers/pydsl.pyo
 ${PYSITELIB}/salt/renderers/stateconf.py
 ${PYSITELIB}/salt/renderers/stateconf.pyc
 ${PYSITELIB}/salt/renderers/stateconf.pyo
@@ -487,6 +645,9 @@ ${PYSITELIB}/salt/renderers/yaml.pyo
 ${PYSITELIB}/salt/returners/__init__.py
 ${PYSITELIB}/salt/returners/__init__.pyc
 ${PYSITELIB}/salt/returners/__init__.pyo
+${PYSITELIB}/salt/returners/carbon_return.py
+${PYSITELIB}/salt/returners/carbon_return.pyc
+${PYSITELIB}/salt/returners/carbon_return.pyo
 ${PYSITELIB}/salt/returners/cassandra_return.py
 ${PYSITELIB}/salt/returners/cassandra_return.pyc
 ${PYSITELIB}/salt/returners/cassandra_return.pyo
@@ -499,9 +660,21 @@ ${PYSITELIB}/salt/returners/mongo_future_return.pyo
 ${PYSITELIB}/salt/returners/mongo_return.py
 ${PYSITELIB}/salt/returners/mongo_return.pyc
 ${PYSITELIB}/salt/returners/mongo_return.pyo
+${PYSITELIB}/salt/returners/mysql.py
+${PYSITELIB}/salt/returners/mysql.pyc
+${PYSITELIB}/salt/returners/mysql.pyo
+${PYSITELIB}/salt/returners/postgres.py
+${PYSITELIB}/salt/returners/postgres.pyc
+${PYSITELIB}/salt/returners/postgres.pyo
 ${PYSITELIB}/salt/returners/redis_return.py
 ${PYSITELIB}/salt/returners/redis_return.pyc
 ${PYSITELIB}/salt/returners/redis_return.pyo
+${PYSITELIB}/salt/returners/sentry_return.py
+${PYSITELIB}/salt/returners/sentry_return.pyc
+${PYSITELIB}/salt/returners/sentry_return.pyo
+${PYSITELIB}/salt/returners/smtp_return.py
+${PYSITELIB}/salt/returners/smtp_return.pyc
+${PYSITELIB}/salt/returners/smtp_return.pyo
 ${PYSITELIB}/salt/returners/syslog_return.py
 ${PYSITELIB}/salt/returners/syslog_return.pyc
 ${PYSITELIB}/salt/returners/syslog_return.pyo
@@ -511,6 +684,15 @@ ${PYSITELIB}/salt/runner.pyo
 ${PYSITELIB}/salt/runners/__init__.py
 ${PYSITELIB}/salt/runners/__init__.pyc
 ${PYSITELIB}/salt/runners/__init__.pyo
+${PYSITELIB}/salt/runners/cache.py
+${PYSITELIB}/salt/runners/cache.pyc
+${PYSITELIB}/salt/runners/cache.pyo
+${PYSITELIB}/salt/runners/doc.py
+${PYSITELIB}/salt/runners/doc.pyc
+${PYSITELIB}/salt/runners/doc.pyo
+${PYSITELIB}/salt/runners/fileserver.py
+${PYSITELIB}/salt/runners/fileserver.pyc
+${PYSITELIB}/salt/runners/fileserver.pyo
 ${PYSITELIB}/salt/runners/jobs.py
 ${PYSITELIB}/salt/runners/jobs.pyc
 ${PYSITELIB}/salt/runners/jobs.pyo
@@ -523,9 +705,27 @@ ${PYSITELIB}/salt/runners/manage.pyo
 ${PYSITELIB}/salt/runners/network.py
 ${PYSITELIB}/salt/runners/network.pyc
 ${PYSITELIB}/salt/runners/network.pyo
+${PYSITELIB}/salt/runners/search.py
+${PYSITELIB}/salt/runners/search.pyc
+${PYSITELIB}/salt/runners/search.pyo
+${PYSITELIB}/salt/runners/state.py
+${PYSITELIB}/salt/runners/state.pyc
+${PYSITELIB}/salt/runners/state.pyo
+${PYSITELIB}/salt/runners/virt.py
+${PYSITELIB}/salt/runners/virt.pyc
+${PYSITELIB}/salt/runners/virt.pyo
+${PYSITELIB}/salt/runners/winrepo.py
+${PYSITELIB}/salt/runners/winrepo.pyc
+${PYSITELIB}/salt/runners/winrepo.pyo
 ${PYSITELIB}/salt/scripts.py
 ${PYSITELIB}/salt/scripts.pyc
 ${PYSITELIB}/salt/scripts.pyo
+${PYSITELIB}/salt/search/__init__.py
+${PYSITELIB}/salt/search/__init__.pyc
+${PYSITELIB}/salt/search/__init__.pyo
+${PYSITELIB}/salt/search/whoosh_search.py
+${PYSITELIB}/salt/search/whoosh_search.pyc
+${PYSITELIB}/salt/search/whoosh_search.pyo
 ${PYSITELIB}/salt/state.py
 ${PYSITELIB}/salt/state.pyc
 ${PYSITELIB}/salt/state.pyo
@@ -535,12 +735,18 @@ ${PYSITELIB}/salt/states/__init__.pyo
 ${PYSITELIB}/salt/states/alias.py
 ${PYSITELIB}/salt/states/alias.pyc
 ${PYSITELIB}/salt/states/alias.pyo
+${PYSITELIB}/salt/states/alternatives.py
+${PYSITELIB}/salt/states/alternatives.pyc
+${PYSITELIB}/salt/states/alternatives.pyo
 ${PYSITELIB}/salt/states/cmd.py
 ${PYSITELIB}/salt/states/cmd.pyc
 ${PYSITELIB}/salt/states/cmd.pyo
 ${PYSITELIB}/salt/states/cron.py
 ${PYSITELIB}/salt/states/cron.pyc
 ${PYSITELIB}/salt/states/cron.pyo
+${PYSITELIB}/salt/states/debconfmod.py
+${PYSITELIB}/salt/states/debconfmod.pyc
+${PYSITELIB}/salt/states/debconfmod.pyo
 ${PYSITELIB}/salt/states/file.py
 ${PYSITELIB}/salt/states/file.pyc
 ${PYSITELIB}/salt/states/file.pyo
@@ -550,6 +756,9 @@ ${PYSITELIB}/salt/states/gem.pyo
 ${PYSITELIB}/salt/states/git.py
 ${PYSITELIB}/salt/states/git.pyc
 ${PYSITELIB}/salt/states/git.pyo
+${PYSITELIB}/salt/states/grains.py
+${PYSITELIB}/salt/states/grains.pyc
+${PYSITELIB}/salt/states/grains.pyo
 ${PYSITELIB}/salt/states/group.py
 ${PYSITELIB}/salt/states/group.pyc
 ${PYSITELIB}/salt/states/group.pyo
@@ -559,9 +768,24 @@ ${PYSITELIB}/salt/states/hg.pyo
 ${PYSITELIB}/salt/states/host.py
 ${PYSITELIB}/salt/states/host.pyc
 ${PYSITELIB}/salt/states/host.pyo
+${PYSITELIB}/salt/states/keyboard.py
+${PYSITELIB}/salt/states/keyboard.pyc
+${PYSITELIB}/salt/states/keyboard.pyo
 ${PYSITELIB}/salt/states/kmod.py
 ${PYSITELIB}/salt/states/kmod.pyc
 ${PYSITELIB}/salt/states/kmod.pyo
+${PYSITELIB}/salt/states/layman.py
+${PYSITELIB}/salt/states/layman.pyc
+${PYSITELIB}/salt/states/layman.pyo
+${PYSITELIB}/salt/states/libvirt.py
+${PYSITELIB}/salt/states/libvirt.pyc
+${PYSITELIB}/salt/states/libvirt.pyo
+${PYSITELIB}/salt/states/locale.py
+${PYSITELIB}/salt/states/locale.pyc
+${PYSITELIB}/salt/states/locale.pyo
+${PYSITELIB}/salt/states/makeconf.py
+${PYSITELIB}/salt/states/makeconf.pyc
+${PYSITELIB}/salt/states/makeconf.pyo
 ${PYSITELIB}/salt/states/module.py
 ${PYSITELIB}/salt/states/module.pyc
 ${PYSITELIB}/salt/states/module.pyo
@@ -586,6 +810,9 @@ ${PYSITELIB}/salt/states/mysql_user.pyo
 ${PYSITELIB}/salt/states/network.py
 ${PYSITELIB}/salt/states/network.pyc
 ${PYSITELIB}/salt/states/network.pyo
+${PYSITELIB}/salt/states/npm.py
+${PYSITELIB}/salt/states/npm.pyc
+${PYSITELIB}/salt/states/npm.pyo
 ${PYSITELIB}/salt/states/pecl.py
 ${PYSITELIB}/salt/states/pecl.pyc
 ${PYSITELIB}/salt/states/pecl.pyo
@@ -598,9 +825,15 @@ ${PYSITELIB}/salt/states/pkg.pyo
 ${PYSITELIB}/salt/states/pkgng.py
 ${PYSITELIB}/salt/states/pkgng.pyc
 ${PYSITELIB}/salt/states/pkgng.pyo
+${PYSITELIB}/salt/states/pkgrepo.py
+${PYSITELIB}/salt/states/pkgrepo.pyc
+${PYSITELIB}/salt/states/pkgrepo.pyo
 ${PYSITELIB}/salt/states/postgres_database.py
 ${PYSITELIB}/salt/states/postgres_database.pyc
 ${PYSITELIB}/salt/states/postgres_database.pyo
+${PYSITELIB}/salt/states/postgres_group.py
+${PYSITELIB}/salt/states/postgres_group.pyc
+${PYSITELIB}/salt/states/postgres_group.pyo
 ${PYSITELIB}/salt/states/postgres_user.py
 ${PYSITELIB}/salt/states/postgres_user.pyc
 ${PYSITELIB}/salt/states/postgres_user.pyo
@@ -637,6 +870,12 @@ ${PYSITELIB}/salt/states/svn.pyo
 ${PYSITELIB}/salt/states/sysctl.py
 ${PYSITELIB}/salt/states/sysctl.pyc
 ${PYSITELIB}/salt/states/sysctl.pyo
+${PYSITELIB}/salt/states/timezone.py
+${PYSITELIB}/salt/states/timezone.pyc
+${PYSITELIB}/salt/states/timezone.pyo
+${PYSITELIB}/salt/states/tomcat.py
+${PYSITELIB}/salt/states/tomcat.pyc
+${PYSITELIB}/salt/states/tomcat.pyo
 ${PYSITELIB}/salt/states/user.py
 ${PYSITELIB}/salt/states/user.pyc
 ${PYSITELIB}/salt/states/user.pyo
@@ -649,9 +888,15 @@ ${PYSITELIB}/salt/template.pyo
 ${PYSITELIB}/salt/tops/__init__.py
 ${PYSITELIB}/salt/tops/__init__.pyc
 ${PYSITELIB}/salt/tops/__init__.pyo
+${PYSITELIB}/salt/tops/cobbler.py
+${PYSITELIB}/salt/tops/cobbler.pyc
+${PYSITELIB}/salt/tops/cobbler.pyo
 ${PYSITELIB}/salt/tops/ext_nodes.py
 ${PYSITELIB}/salt/tops/ext_nodes.pyc
 ${PYSITELIB}/salt/tops/ext_nodes.pyo
+${PYSITELIB}/salt/tops/mongo.py
+${PYSITELIB}/salt/tops/mongo.pyc
+${PYSITELIB}/salt/tops/mongo.pyo
 ${PYSITELIB}/salt/utils/__init__.py
 ${PYSITELIB}/salt/utils/__init__.pyc
 ${PYSITELIB}/salt/utils/__init__.pyo
@@ -682,6 +927,9 @@ ${PYSITELIB}/salt/utils/jinja.pyo
 ${PYSITELIB}/salt/utils/mako.py
 ${PYSITELIB}/salt/utils/mako.pyc
 ${PYSITELIB}/salt/utils/mako.pyo
+${PYSITELIB}/salt/utils/migrations.py
+${PYSITELIB}/salt/utils/migrations.pyc
+${PYSITELIB}/salt/utils/migrations.pyo
 ${PYSITELIB}/salt/utils/minions.py
 ${PYSITELIB}/salt/utils/minions.pyc
 ${PYSITELIB}/salt/utils/minions.pyo
@@ -691,9 +939,18 @@ ${PYSITELIB}/salt/utils/parsers.pyo
 ${PYSITELIB}/salt/utils/process.py
 ${PYSITELIB}/salt/utils/process.pyc
 ${PYSITELIB}/salt/utils/process.pyo
+${PYSITELIB}/salt/utils/pydsl.py
+${PYSITELIB}/salt/utils/pydsl.pyc
+${PYSITELIB}/salt/utils/pydsl.pyo
+${PYSITELIB}/salt/utils/s3.py
+${PYSITELIB}/salt/utils/s3.pyc
+${PYSITELIB}/salt/utils/s3.pyo
 ${PYSITELIB}/salt/utils/saltminionservice.py
 ${PYSITELIB}/salt/utils/saltminionservice.pyc
 ${PYSITELIB}/salt/utils/saltminionservice.pyo
+${PYSITELIB}/salt/utils/schedule.py
+${PYSITELIB}/salt/utils/schedule.pyc
+${PYSITELIB}/salt/utils/schedule.pyo
 ${PYSITELIB}/salt/utils/socket_util.py
 ${PYSITELIB}/salt/utils/socket_util.pyc
 ${PYSITELIB}/salt/utils/socket_util.pyo
@@ -703,12 +960,18 @@ ${PYSITELIB}/salt/utils/templates.pyo
 ${PYSITELIB}/salt/utils/verify.py
 ${PYSITELIB}/salt/utils/verify.pyc
 ${PYSITELIB}/salt/utils/verify.pyo
+${PYSITELIB}/salt/utils/winapi.py
+${PYSITELIB}/salt/utils/winapi.pyc
+${PYSITELIB}/salt/utils/winapi.pyo
 ${PYSITELIB}/salt/utils/winservice.py
 ${PYSITELIB}/salt/utils/winservice.pyc
 ${PYSITELIB}/salt/utils/winservice.pyo
-${PYSITELIB}/salt/utils/yaml.py
-${PYSITELIB}/salt/utils/yaml.pyc
-${PYSITELIB}/salt/utils/yaml.pyo
+${PYSITELIB}/salt/utils/xmlutil.py
+${PYSITELIB}/salt/utils/xmlutil.pyc
+${PYSITELIB}/salt/utils/xmlutil.pyo
+${PYSITELIB}/salt/utils/yamlloader.py
+${PYSITELIB}/salt/utils/yamlloader.pyc
+${PYSITELIB}/salt/utils/yamlloader.pyo
 ${PYSITELIB}/salt/version.py
 ${PYSITELIB}/salt/version.pyc
 ${PYSITELIB}/salt/version.pyo
@@ -727,24 +990,16 @@ ${PYSITELIB}/salt/wheel/key.pyo
 ${PYSITELIB}/salt/wheel/pillar_roots.py
 ${PYSITELIB}/salt/wheel/pillar_roots.pyc
 ${PYSITELIB}/salt/wheel/pillar_roots.pyo
-bin/salt
-bin/salt-call
-bin/salt-cp
-bin/salt-key
-bin/salt-master
-bin/salt-minion
-bin/salt-run
-bin/salt-syndic
+man/man1/salt-call.1
+man/man1/salt-cp.1
+man/man1/salt-key.1
+man/man1/salt-master.1
+man/man1/salt-minion.1
+man/man1/salt-run.1
+man/man1/salt-syndic.1
+man/man1/salt.1
+man/man7/salt.7
 share/examples/rc.d/salt_master
 share/examples/rc.d/salt_minion
-share/examples/salt/master.template
-share/examples/salt/minion.template
-${PKGMANDIR}/man1/salt-call.1
-${PKGMANDIR}/man1/salt-cp.1
-${PKGMANDIR}/man1/salt-key.1
-${PKGMANDIR}/man1/salt-master.1
-${PKGMANDIR}/man1/salt-minion.1
-${PKGMANDIR}/man1/salt-run.1
-${PKGMANDIR}/man1/salt-syndic.1
-${PKGMANDIR}/man1/salt.1
-${PKGMANDIR}/man7/salt.7
+share/examples/salt/master
+share/examples/salt/minion
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
index 8fbe4567fa7..d806c28fce1 100644
--- a/sysutils/salt/distinfo
+++ b/sysutils/salt/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2012/12/06 08:01:21 apb Exp $
+$NetBSD: distinfo,v 1.3 2013/04/28 09:46:24 imil Exp $
 
-SHA1 (salt-0.10.5.tar.gz) = 42796c7299e0000c250af2b3164fa77ef4f5e460
-RMD160 (salt-0.10.5.tar.gz) = a5de72481b458a2eb909a249e52e2edc354c2a61
-Size (salt-0.10.5.tar.gz) = 793582 bytes
-SHA1 (patch-setup.py) = b9b6c9ef19ad72caa65c1439ae73d40832f35977
+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 (patch-setup.py) = 15907268df5ee1d06e1c932dc84fd7701156519d
diff --git a/sysutils/salt/patches/patch-setup.py b/sysutils/salt/patches/patch-setup.py
index a2b2c9f27d0..e16e2f89955 100644
--- a/sysutils/salt/patches/patch-setup.py
+++ b/sysutils/salt/patches/patch-setup.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-setup.py,v 1.2 2012/12/06 08:01:21 apb Exp $
+$NetBSD: patch-setup.py,v 1.3 2013/04/28 09:46:25 imil Exp $
 
 * Remove unused example_path and template_path;
 * Set etc_path to the directory where configfiles will be
@@ -7,9 +7,9 @@ $NetBSD: patch-setup.py,v 1.2 2012/12/06 08:01:21 apb Exp $
   via the CONFIG_FILES setting in the pkgsrc Makefile.
 * Install man pages in PKGMANDIR, not PREFIX/share/man.
 
---- setup.py.orig	2012-11-15 01:20:54.000000000 +0000
+--- setup.py.orig	2013-03-29 00:06:49.000000000 +0000
 +++ setup.py
-@@ -87,13 +87,15 @@ DESC = ('Portable, distributed, remote e
+@@ -151,13 +151,15 @@ DESC = ('Portable, distributed, remote e
          'configuration management system')
  mod_path = os.path.join(get_python_lib(), 'salt/modules')
  doc_path = os.path.join(PREFIX, 'share/doc', NAME + '-' + VER)
@@ -28,9 +28,9 @@ $NetBSD: patch-setup.py,v 1.2 2012/12/06 08:01:21 apb Exp $
 -    etc_path = os.path.join(os.path.dirname(PREFIX), 'etc')
 +    man_path = os.path.join(os.path.dirname(PREFIX), 'share/man')
  
- libraries = ['ws2_32'] if sys.platform == 'win32' else []
- 
-@@ -141,7 +143,7 @@ setup_kwargs = {'name': NAME,
+ with open(salt_reqs) as f:
+     lines = f.read().split('\n')
+@@ -210,7 +212,7 @@ setup_kwargs = {'name': NAME,
                               'salt.utils',
                               ],
                  'package_data': {'salt.modules': ['rh_ip/*.jinja']},
@@ -39,7 +39,7 @@ $NetBSD: patch-setup.py,v 1.2 2012/12/06 08:01:21 apb Exp $
                                  ['doc/man/salt-master.1',
                                   'doc/man/salt-key.1',
                                   'doc/man/salt.1',
-@@ -151,7 +153,8 @@ setup_kwargs = {'name': NAME,
+@@ -220,7 +222,8 @@ setup_kwargs = {'name': NAME,
                                   'doc/man/salt-run.1',
                                   'doc/man/salt-minion.1',
                                   ]),
@@ -47,5 +47,5 @@ $NetBSD: patch-setup.py,v 1.2 2012/12/06 08:01:21 apb Exp $
 +                               (os.path.join(man_path, 'man7'),
 +                                ['doc/man/salt.7']),
                                 ],
+                 # Required for esky builds
                  'install_requires': requirements,
-                 # The dynamic module loading in salt.modules makes this