Skip to content

Instantly share code, notes, and snippets.

@travispaul
Created December 16, 2015 23:32
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save travispaul/dcd03f09213a53b73f22 to your computer and use it in GitHub Desktop.
Save travispaul/dcd03f09213a53b73f22 to your computer and use it in GitHub Desktop.
salt.patch
commit ba76062950095850ec165be0be3584624da2046f
Author: Travis Paul <Tr@validusa.com>
Date: Wed Dec 16 23:20:36 2015 +0000
sysutils/salt: Fix cron module for SmartOS
Upstream PR sent: https://github.com/saltstack/salt/pull/29777
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile
index 2cd7c5a..67cdc71 100644
--- a/sysutils/salt/Makefile
+++ b/sysutils/salt/Makefile
@@ -3,6 +3,7 @@
DISTNAME= salt-2015.8.3
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/}
+PKGREVISION= 1
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://saltstack.org/
diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo
index d64a7c8..0ac5803 100644
--- a/sysutils/salt/distinfo
+++ b/sysutils/salt/distinfo
@@ -4,3 +4,4 @@ SHA1 (salt-2015.8.3.tar.gz) = 0457866d5619febc3cdf3b27b2e736b0c4ae3623
RMD160 (salt-2015.8.3.tar.gz) = 607db5d35545cfb6c4e8676482133a1560f3e896
SHA512 (salt-2015.8.3.tar.gz) = 18a2c63d5e54d09468189450557974e47f87d8b7dde52beaae678120da1da1e7aecfff18cf0fdfb63a11cd5f6bab102c229462f0afe5e3e858c0c467761c7121
Size (salt-2015.8.3.tar.gz) = 6757678 bytes
+SHA1 (patch-salt_modules_cron.py) = e271bfc252c5c9263d9029f2334ba742cc1be199
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 0000000..4e5f389
--- /dev/null
+++ b/sysutils/salt/patches/patch-salt_modules_cron.py
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- salt/modules/cron.py.orig 2015-12-15 22:38:23.793040947 +0000
++++ salt/modules/cron.py
+@@ -150,7 +150,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)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment