Index: head/sysutils/ansible/Makefile =================================================================== --- head/sysutils/ansible/Makefile (revision 416698) +++ head/sysutils/ansible/Makefile (revision 416699) @@ -1,67 +1,70 @@ # Created by: Nikolai Lifanov # $FreeBSD$ PORTNAME= ansible PORTVERSION?= 2.1.0.0 +PORTREVISION?= 1 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ MAINTAINER= lifanov@mail.lifanov.com COMMENT= Radically simple IT automation LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml \ ${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto \ ${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 python_CMD= ${LOCALBASE}/bin/python SHEBANG_FILES+= lib/ansible/modules/core/*/*.py \ lib/ansible/modules/core/*/*/*.py \ lib/ansible/modules/extras/*/*.py \ lib/ansible/modules/extras/*/*/*.py CPE_VENDOR= ansibleworks SUB_FILES= pkg-message PLIST_FILES+= man/man1/ansible-doc.1.gz \ man/man1/ansible-galaxy.1.gz \ man/man1/ansible-playbook.1.gz \ man/man1/ansible-pull.1.gz \ man/man1/ansible-vault.1.gz \ man/man1/ansible.1.gz PORTEXAMPLES= ansible.cfg hosts OPTIONS_DEFINE= DOCS EXAMPLES NETADDR OPTIONS_DEFAULT=NETADDR NETADDR_DESC= Dependency on py-netaddr for ipaddr() filter NETADDR_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr post-patch: .for f in bin/* docs/man/man1/* examples/* lib/ansible/*.py \ lib/ansible/*/*.py lib/ansible/*/*/*.py lib/ansible/*/*/*/*.py @${REINPLACE_CMD} -e 's|/etc/ansible|${ETCDIR}|' ${WRKSRC}/${f} .endfor .for f in docs/man/man1/* examples/* lib/ansible/*.py lib/ansible/*/*.py @${REINPLACE_CMD} -e 's|/usr/share/ansible|${DATADIR}|' ${WRKSRC}/${f} .endfor post-install: @${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/docs/man/man1/*.1 \ ${STAGEDIR}${MAN1PREFIX}/man/man1 post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/ansible.cfg ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/hosts ${STAGEDIR}${EXAMPLESDIR} .include Index: head/sysutils/ansible/files/extra-patch-b5e012b =================================================================== --- head/sysutils/ansible/files/extra-patch-b5e012b (nonexistent) +++ head/sysutils/ansible/files/extra-patch-b5e012b (revision 416699) @@ -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: head/sysutils/ansible/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