From owner-svn-ports-all@FreeBSD.ORG Thu Apr 10 15:50:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F2DD1758; Thu, 10 Apr 2014 15:50:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DED0112C5; Thu, 10 Apr 2014 15:50:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3AFocFs006397; Thu, 10 Apr 2014 15:50:38 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3AFoc58006391; Thu, 10 Apr 2014 15:50:38 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201404101550.s3AFoc58006391@svn.freebsd.org> From: Rusmir Dusko Date: Thu, 10 Apr 2014 15:50:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350818 - in head/sysutils/ansible: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Apr 2014 15:50:39 -0000 Author: nemysis Date: Thu Apr 10 15:50:37 2014 New Revision: 350818 URL: http://svnweb.freebsd.org/changeset/ports/350818 QAT: https://qat.redports.org/buildarchive/r350818/ Log: - Update to 1.5.4, announce message is here: - Security fix for safe_eval, which further hardens the checking of the evaluation function. - Changing order of variable precendence for system facts, to ensure that inventory variables take precedence over any facts that may be set on a host. - Change Makefile header, add Created by - Change master sites, add icon - Simplify REINPLACE - Add Desktop entry file PR: ports/188209 Submitted by: Nikolai Lifanov Added: head/sysutils/ansible/files/ansible.desktop (contents, props changed) Modified: head/sysutils/ansible/Makefile head/sysutils/ansible/distinfo head/sysutils/ansible/files/pkg-message.in Modified: head/sysutils/ansible/Makefile ============================================================================== --- head/sysutils/ansible/Makefile Thu Apr 10 15:45:03 2014 (r350817) +++ head/sysutils/ansible/Makefile Thu Apr 10 15:50:37 2014 (r350818) @@ -1,8 +1,13 @@ +# Created by: Nikolai Lifanov # $FreeBSD$ PORTNAME= ansible -PORTVERSION= 1.5.3 +PORTVERSION= 1.5.4 CATEGORIES= sysutils python +MASTER_SITES= SF/lifanov-ports-distfiles/sysutils/${PORTNAME}/:icons +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}.png:icons +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} MAINTAINER= lifanov@mail.lifanov.com COMMENT= Simple ssh-based configuration management and orchestration system @@ -21,9 +26,10 @@ ACCELERATE_RUN_DEPENDS= ${PYTHON_PKGNAME ${PYTHON_PKGNAMEPREFIX}keyczar>0:${PORTSDIR}/security/py-keyczar USE_GITHUB= yes -GH_ACCOUNT= ansible -GH_TAGNAME= v${DISTVERSION} -GH_COMMIT= 6ae58a9 +GH_ACCOUNT= ${PORTNAME} +GH_PROJECT= ${PORTNAME} +GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= 036c819 USE_PYTHON= 2 USE_PYDISTUTILS= yes @@ -34,32 +40,32 @@ SHEBANG_FILES= library/*/* \ lib/ansible/runner/action_plugins/synchronize.py 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.1.gz + man/man1/ansible-vault.1.gz \ + man/man1/ansible.1.gz \ + ${DESKTOPDIR}/${PORTNAME}.desktop \ + share/pixmaps/${PORTNAME}.png PORTEXAMPLES= ansible.cfg hosts post-patch: - @${REINPLACE_CMD} -i -e "s|/etc/ansible|${ETCDIR}|" \ - ${WRKSRC}/bin/ansible-galaxy \ - ${WRKSRC}/docs/man/man1/ansible-playbook.1 \ - ${WRKSRC}/docs/man/man1/ansible.1 \ - ${WRKSRC}/examples/ansible.cfg \ - ${WRKSRC}/examples/hosts \ - ${WRKSRC}/lib/ansible/constants.py \ - ${WRKSRC}/lib/ansible/playbook/__init__.py \ - ${WRKSRC}/lib/ansible/runner/__init__.py \ - ${WRKSRC}/library/system/setup - @${REINPLACE_CMD} -i -e "s|/usr/share/ansible|${DATADIR}|" \ - ${WRKSRC}/docs/man/man1/ansible-playbook.1 \ - ${WRKSRC}/docs/man/man1/ansible.1 \ - ${WRKSRC}/examples/ansible.cfg \ - ${WRKSRC}/lib/ansible/constants.py \ - ${WRKSRC}/lib/ansible/playbook/__init__.py \ - ${WRKSRC}/lib/ansible/runner/__init__.py - @${RM} ${WRKSRC}/library/system/setup-e +.for f in bin/ansible-galaxy docs/man/man1/ansible-playbook.1 \ + docs/man/man1/ansible.1 examples/ansible.cfg \ + examples/hosts lib/ansible/constants.py \ + lib/ansible/playbook/__init__.py lib/ansible/runner/__init__.py \ + library/system/setup + @${REINPLACE_CMD} -e 's|/etc/ansible|${ETCDIR}|' ${WRKSRC}/${f} +.endfor + +.for f in docs/man/man1/ansible-playbook.1 docs/man/man1/ansible.1 \ + examples/ansible.cfg lib/ansible/constants.py \ + lib/ansible/playbook/__init__.py lib/ansible/runner/__init__.py + @${REINPLACE_CMD} -e 's|/usr/share/ansible|${DATADIR}|' ${WRKSRC}/${f} +.endfor post-install: @${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1 @@ -68,5 +74,9 @@ post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/ansible.cfg ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/examples/hosts ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop \ + ${STAGEDIR}${DESKTOPDIR} .include Modified: head/sysutils/ansible/distinfo ============================================================================== --- head/sysutils/ansible/distinfo Thu Apr 10 15:45:03 2014 (r350817) +++ head/sysutils/ansible/distinfo Thu Apr 10 15:50:37 2014 (r350818) @@ -1,2 +1,4 @@ -SHA256 (ansible-1.5.3.tar.gz) = 3b3f5a0410124ad5a432b1e8125fcd27118597af429f05e58e712ae2a9212539 -SIZE (ansible-1.5.3.tar.gz) = 1035170 +SHA256 (ansible-1.5.4.tar.gz) = 71cbe162ead87b044696166d6f74bf675f2f13246fba213ace3c6d93b40dffe0 +SIZE (ansible-1.5.4.tar.gz) = 1141916 +SHA256 (ansible.png) = 9bf68abd2c95db4dc8dfc091c0e0e0a9716891f28d157e3f04e541d96e1c6850 +SIZE (ansible.png) = 1160 Added: head/sysutils/ansible/files/ansible.desktop ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/ansible/files/ansible.desktop Thu Apr 10 15:50:37 2014 (r350818) @@ -0,0 +1,10 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=ansible +GenericName=ansible +Comment=Simple ssh-based configuration management and orchestration system +Icon=ansible +Exec=ansible +Categories=System;ConsoleOnly; +Terminal=true Modified: head/sysutils/ansible/files/pkg-message.in ============================================================================== --- head/sysutils/ansible/files/pkg-message.in Thu Apr 10 15:45:03 2014 (r350817) +++ head/sysutils/ansible/files/pkg-message.in Thu Apr 10 15:50:37 2014 (r350818) @@ -1,3 +1,4 @@ +=============================================================================== To use Ansible, you need at least a host database. If you installed examples, you will have a sample @@ -20,3 +21,5 @@ that system. Example: [centos:var] ansible_python_interpreter=/usr/bin/python + +===============================================================================