Date: Sat, 11 Jun 2016 00:49:52 +0000 (UTC) From: Brad Davis <brd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416699 - in head/sysutils/ansible: . files Message-ID: <201606110049.u5B0nqGf070928@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brd Date: Sat Jun 11 00:49:52 2016 New Revision: 416699 URL: https://svnweb.freebsd.org/changeset/ports/416699 Log: sysutils/ansible: add patch to fix cron module PR: 209789 Submitted by: Dmitry Marakasov <amdmi3@FreeBSD.org> Submitted by: Nikolai Lifanov <lifanov@mail.lifanov.com> (maintainer) Approved by: bdrewery (implicit, mentor) Added: head/sysutils/ansible/files/extra-patch-b5e012b (contents, props changed) Modified: head/sysutils/ansible/Makefile Modified: head/sysutils/ansible/Makefile ============================================================================== --- head/sysutils/ansible/Makefile Fri Jun 10 22:12:21 2016 (r416698) +++ head/sysutils/ansible/Makefile Sat Jun 11 00:49:52 2016 (r416699) @@ -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 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml ${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 Added: head/sysutils/ansible/files/extra-patch-b5e012b ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/ansible/files/extra-patch-b5e012b Sat Jun 11 00:49:52 2016 (r416699) @@ -0,0 +1,29 @@ +commit b5e012b47fa9e242a38c3f66678aa2f47946a9c9 +Author: Dmitry Marakasov <amdmi3@amdmi3.ru> +Date: Thu May 26 17:37:28 2016 +0300 + + Fix crontab argument order for writing + + Currently, when writing user's crontab, ansible calls + + crontab <file> -u <user> + + 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)) + + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606110049.u5B0nqGf070928>