5 files changed, 6 insertions, 45 deletions

diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index ab9817daddf0..3d446cfd4cc0 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	salt
-PORTVERSION=	2016.3.1
-PORTREVISION=	1
+PORTVERSION=	2016.3.2
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-salt/distinfo b/sysutils/py-salt/distinfo
index fef3f74b0278..4ca9930d4d48 100644
--- a/sysutils/py-salt/distinfo
+++ b/sysutils/py-salt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466111476
-SHA256 (salt-2016.3.1.tar.gz) = e6bdba4693116430c2af57497eb63399e3a139ac0a7016fa0870b49fbe987f75
-SIZE (salt-2016.3.1.tar.gz) = 7932479
+TIMESTAMP = 1470165080
+SHA256 (salt-2016.3.2.tar.gz) = 6a84b724d02b0dba438dea57650724064675d82620e66749bd2fe8f21da71be0
+SIZE (salt-2016.3.2.tar.gz) = 8014793
diff --git a/sysutils/py-salt/files/patch-salt_grains_core.py b/sysutils/py-salt/files/patch-salt_grains_core.py
deleted file mode 100644
index 04794a04deff..000000000000
--- a/sysutils/py-salt/files/patch-salt_grains_core.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Issue #33608
-# https://github.com/saltstack/salt/issues/33608
---- salt/grains/core.py.orig	2016-05-25 22:30:31 UTC
-+++ salt/grains/core.py
-@@ -1422,6 +1422,7 @@ def os_data():
-     else:
-         grains['os'] = grains['kernel']
-     if grains['kernel'] == 'FreeBSD':
-+        grains.update(_bsd_cpudata(grains))
-         try:
-             grains['osrelease'] = __salt__['cmd.run']('freebsd-version -u').split('-')[0]
-         except salt.exceptions.CommandExecutionError:
diff --git a/sysutils/py-salt/files/patch-salt_states_cron.py b/sysutils/py-salt/files/patch-salt_states_cron.py
deleted file mode 100644
index 325f446d7f18..000000000000
--- a/sysutils/py-salt/files/patch-salt_states_cron.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Fixes cron.file from upstream issue #34094/#34095 [1].  This will be in
-# 2016.3.2.
-# https://github.com/saltstack/salt/issues/34094
-# https://github.com/saltstack/salt/pull/34095
---- salt/states/cron.py.orig    2016-06-13 22:17:50 UTC
-+++ salt/states/cron.py
-@@ -540,6 +540,7 @@ def file(name,
-             __env__,
-             context,
-             defaults,
-+            False,        # skip_verify
-             **kwargs
-         )
-     except Exception as exc:
-@@ -573,12 +574,12 @@ def file(name,
-         ret['comment'] = 'Unable to manage file: {0}'.format(exc)
-         return ret
- 
-+    cron_ret = None
-     if ret['changes']:
-         cron_ret = __salt__['cron.write_cron_file_verbose'](user, cron_path)
-         ret['changes'] = {'diff': ret['changes']['diff']}
-         ret['comment'] = 'Crontab for user {0} was updated'.format(user)
-     elif ret['result']:
--        cron_ret = None
-         ret['comment'] = 'Crontab for user {0} is in the correct ' \
-                          'state'.format(user)
- 
diff --git a/sysutils/py-salt/pkg-plist b/sysutils/py-salt/pkg-plist
index 56d56f04dda6..2f1712971b1f 100644
--- a/sysutils/py-salt/pkg-plist
+++ b/sysutils/py-salt/pkg-plist
@@ -655,6 +655,8 @@
 %%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/dbhandle.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/exceptions.py
 %%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/kiwiproc.py
+%%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/kiwiproc.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/query.py
 %%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/query.pyc
 %%PYTHON_SITELIBDIR%%/salt/modules/introspect.py