MFH: r418455

sysutils/py-salt: add patches to handle runtime regressions in 2016.3.x

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

Restore patch for upstream issue #33608. This was patched in 2016.3.0 but
removed in the maintainer update to 2016.3.1 in r417508. However the patch
has yet to be merged upstream. [2]
- https://github.com/saltstack/salt/issues/33608

PR:		210627 [1], 210395 [2]
Reported by:	Andres Montalban <amontalban@gmail.com>
Approved by:	Christer Edwards <christer.edwards@gmail.com> (maintainer)
Approved by:	ports-secteam (with hat)

3 files changed, 41 insertions, 0 deletions

diff --git a/sysutils/py-salt/Makefile b/sysutils/py-salt/Makefile
index 479d050a..ab9817d 100644
--- a/sysutils/py-salt/Makefile
+++ b/sysutils/py-salt/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	salt
 PORTVERSION=	2016.3.1
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-salt/files/patch-salt_grains_core.py b/sysutils/py-salt/files/patch-salt_grains_core.py
new file mode 100644
index 0000000..04794a0
--- /dev/null
+++ b/sysutils/py-salt/files/patch-salt_grains_core.py
@@ -0,0 +1,12 @@
+# 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
new file mode 100644
index 0000000..325f446
--- /dev/null
+++ b/sysutils/py-salt/files/patch-salt_states_cron.py
@@ -0,0 +1,28 @@
+# 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)
+