Index: Makefile =================================================================== --- Makefile (revision 415937) +++ Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= ansible PORTVERSION?= 2.1.0.0 +PORTREVISION?= 1 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ @@ -17,6 +18,8 @@ ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 +EXTRA_PATCHES?= ${FILESDIR}/extra-patch-b5e012b + NO_ARCH= yes USES= cpe python:2 shebangfix USE_PYTHON= autoplist distutils Index: files/extra-patch-b5e012b =================================================================== --- files/extra-patch-b5e012b (nonexistent) +++ files/extra-patch-b5e012b (working copy) @@ -0,0 +1,29 @@ +commit b5e012b47fa9e242a38c3f66678aa2f47946a9c9 +Author: Dmitry Marakasov +Date: Thu May 26 17:37:28 2016 +0300 + + Fix crontab argument order for writing + + Currently, when writing user's crontab, ansible calls + + crontab -u + + This is incorrect according to crontab(1) on both FreeBSD and Linux, + which suggest that file argument should be the last. + + At least on FreeBSD, this leads to incorrect cron module bahavior which + writes to root's crontab instead of users's + +diff --git system/cron.py system/cron.py +index ab97606..b9f0940 100644 +--- lib/ansible/modules/core/system/cron.py ++++ lib/ansible/modules/core/system/cron.py +@@ -488,7 +488,7 @@ class CronTab(object): + return "chown %s %s ; su '%s' -c '%s %s'" % (pipes.quote(self.user), pipes.quote(path), pipes.quote(self.user), CRONCMD, pipes.quote(path)) + else: + user = '-u %s' % pipes.quote(self.user) +- return "%s %s %s" % (CRONCMD , pipes.quote(path), user) ++ return "%s %s %s" % (CRONCMD , user, pipes.quote(path)) + + + Property changes on: files/extra-patch-b5e012b ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property