diff options
| author | wiz <wiz@pkgsrc.org> | 2016-02-09 14:23:04 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2016-02-09 14:23:04 +0000 |
| commit | 77bf2d52889c785e9c4db115296d98a30cd5c640 (patch) | |
| tree | 0b108b4faf7c9f7d890f3bca6d369602b70e2591 /sysutils/salt | |
| parent | 215f579a9f78aa27894b4ac2ee23c2cc0964bb27 (diff) | |
| download | pkgsrc-77bf2d52889c785e9c4db115296d98a30cd5c640.tar.gz | |
Add upstream patch fixing problem with cron on Solaris.
From Travis Paul in PR 50567.
Bump PKGREVISION.
Diffstat (limited to 'sysutils/salt')
| -rw-r--r-- | sysutils/salt/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/salt/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/salt/patches/patch-salt_modules_cron.py | 16 |
3 files changed, 20 insertions, 2 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index 295ddff946c..f989163a0a8 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2016/02/07 23:55:01 sevan Exp $ +# $NetBSD: Makefile,v 1.36 2016/02/09 14:23:04 wiz Exp $ DISTNAME= salt-2015.8.5 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo index 27538a4766f..271e211e874 100644 --- a/sysutils/salt/distinfo +++ b/sysutils/salt/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.18 2016/02/07 23:55:01 sevan Exp $ +$NetBSD: distinfo,v 1.19 2016/02/09 14:23:04 wiz 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 diff --git a/sysutils/salt/patches/patch-salt_modules_cron.py b/sysutils/salt/patches/patch-salt_modules_cron.py new file mode 100644 index 00000000000..45cf024654e --- /dev/null +++ b/sysutils/salt/patches/patch-salt_modules_cron.py @@ -0,0 +1,16 @@ +$NetBSD: patch-salt_modules_cron.py,v 1.1 2016/02/09 14:23:04 wiz Exp $ + +Fix for cron on Solaris. +https://github.com/saltstack/salt/pull/29777 + +--- salt/modules/cron.py.orig 2016-02-01 19:40:31.000000000 +0000 ++++ salt/modules/cron.py +@@ -155,7 +155,7 @@ def _get_cron_cmdstr(path, user=None): + ''' + cmd = 'crontab' + +- if user: ++ if user and __grains__.get('os_family') not in ('Solaris', 'AIX'): + cmd += ' -u {0}'.format(user) + + return '{0} {1}'.format(cmd, path) |