From owner-svn-ports-all@freebsd.org Tue Apr 28 20:46:10 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3FD9A2C4B14; Tue, 28 Apr 2020 20:46:10 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49BYZp14nYz4H32; Tue, 28 Apr 2020 20:46:10 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1BF322A2C0; Tue, 28 Apr 2020 20:46:10 +0000 (UTC) (envelope-from bofh@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03SKk9xN086128; Tue, 28 Apr 2020 20:46:09 GMT (envelope-from bofh@FreeBSD.org) Received: (from bofh@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03SKk7fN086117; Tue, 28 Apr 2020 20:46:07 GMT (envelope-from bofh@FreeBSD.org) Message-Id: <202004282046.03SKk7fN086117@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bofh set sender to bofh@FreeBSD.org using -f From: Muhammad Moinur Rahman Date: Tue, 28 Apr 2020 20:46:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r533266 - in head: . sysutils sysutils/ansible sysutils/ansible23 sysutils/ansible24 sysutils/ansible25 sysutils/ansible26 sysutils/ansible27 sysutils/ansible28 sysutils/ansible28/files X-SVN-Group: ports-head X-SVN-Commit-Author: bofh X-SVN-Commit-Paths: in head: . sysutils sysutils/ansible sysutils/ansible23 sysutils/ansible24 sysutils/ansible25 sysutils/ansible26 sysutils/ansible27 sysutils/ansible28 sysutils/ansible28/files X-SVN-Commit-Revision: 533266 X-SVN-Commit-Repository: ports 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.29 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: Tue, 28 Apr 2020 20:46:10 -0000 Author: bofh Date: Tue Apr 28 20:46:07 2020 New Revision: 533266 URL: https://svnweb.freebsd.org/changeset/ports/533266 Log: sysutils/ansible: Update version 2.8.11=>2.9.7 - Create sysutils/ansible28 from sysutils/ansible - Set EXPIRATION_DATE to 20200530 for ansible23 ansible24 ansible25 and ansible26 as they are no longer maintained by upstream - Bump ansible23 ansible24 ansible25 ansible26 and ansible27 for CONFLICTS with ansible28 PR: 241734 Submitted by: ncrogers@gmail.com Approved by: portmgr (maintainer-timeout) Added: head/sysutils/ansible28/ - copied from r533265, head/sysutils/ansible/ Deleted: head/sysutils/ansible28/files/ head/sysutils/ansible28/pkg-descr Modified: head/UPDATING head/sysutils/Makefile head/sysutils/ansible/Makefile head/sysutils/ansible/distinfo head/sysutils/ansible23/Makefile head/sysutils/ansible24/Makefile head/sysutils/ansible25/Makefile head/sysutils/ansible26/Makefile head/sysutils/ansible27/Makefile head/sysutils/ansible28/Makefile head/sysutils/ansible28/distinfo Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Apr 28 19:27:34 2020 (r533265) +++ head/UPDATING Tue Apr 28 20:46:07 2020 (r533266) @@ -6,6 +6,20 @@ You should get into the habit of checking this file fo you update your ports collection, before attempting any port upgrades. 20200428: + AFFECTS: users of sysutils/ansible + AUTHOR: bofh@FreeBSD.org + + Ansible has been updated to 2.9.7. Please follow the porting guide + to update the rulesets: + + https://docs.ansible.com/ansible/devel/porting_guides/porting_guide_2.9.html + + If you wish to stay with 2.8 version, you can switch + to new sysutils/ansible28 port, which tracks stable 2.8 branch: + + # pkg set -n ansible:ansible28 + +20200428: AFFECTS: x11-servers/xwayland-devel AUTHOR: jbeich@FreeBSD.org Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Tue Apr 28 19:27:34 2020 (r533265) +++ head/sysutils/Makefile Tue Apr 28 20:46:07 2020 (r533266) @@ -45,6 +45,7 @@ SUBDIR += ansible25 SUBDIR += ansible26 SUBDIR += ansible27 + SUBDIR += ansible28 SUBDIR += anvil SUBDIR += apache-mesos SUBDIR += apachetop Modified: head/sysutils/ansible/Makefile ============================================================================== --- head/sysutils/ansible/Makefile Tue Apr 28 19:27:34 2020 (r533265) +++ head/sysutils/ansible/Makefile Tue Apr 28 20:46:07 2020 (r533266) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ansible -PORTVERSION?= 2.8.11 +PORTVERSION?= 2.9.7 PORTREVISION?= 0 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ @@ -34,15 +34,47 @@ CONFLICTS?= ansible1-* \ ansible25-* \ ansible27-* \ ansible26-* \ - ansible27-* + ansible27-* \ + ansible28-* EXTRA_PATCHES?= NO_ARCH= yes -USES?= cpe python +USES?= cpe python shebangfix USE_PYTHON= distutils autoplist concurrent CPE_VENDOR= ansibleworks +SHEBANG_FILES?= \ + test/lib/ansible_test/_data/injector/python.py \ + test/lib/ansible_test/_data/versions.py \ + test/lib/ansible_test/_data/virtualenvcheck.py \ + test/lib/ansible_test/_data/yamlcheck.py \ + test/lib/ansible_test/_data/cli/ansible_test_cli_stub.py \ + test/lib/ansible_test/_data/sanity/import/importer.py \ + test/lib/ansible_test/_data/sanity/code-smell/metaclass-boilerplate.py \ + test/lib/ansible_test/_data/sanity/code-smell/future-import-boilerplate.py \ + test/lib/ansible_test/_data/sanity/code-smell/use-argspec-type-path.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-get-exception.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-illegal-filenames.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-dict-iterkeys.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-smart-quotes.py \ + test/lib/ansible_test/_data/sanity/code-smell/replace-urlopen.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-unicode-literals.py \ + test/lib/ansible_test/_data/sanity/code-smell/action-plugin-docs.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-main-display.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-dict-itervalues.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-dict-iteritems.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-assert.py \ + test/lib/ansible_test/_data/sanity/code-smell/use-compat-six.py \ + test/lib/ansible_test/_data/sanity/code-smell/line-endings.py \ + test/lib/ansible_test/_data/sanity/code-smell/symlinks.py \ + test/lib/ansible_test/_data/sanity/code-smell/shebang.py \ + test/lib/ansible_test/_data/sanity/code-smell/empty-init.py \ + test/lib/ansible_test/_data/sanity/code-smell/no-basestring.py \ + test/lib/ansible_test/_data/sanity/yamllint/yamllinter.py \ + test/lib/ansible_test/_data/sanity/compile/compile.py \ + test/lib/ansible_test/_data/sanity/validate-modules/main.py + SUB_FILES= pkg-message SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} @@ -79,6 +111,8 @@ post-install-EXAMPLES-on: post-stage: ${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \ -execdir ${RLN} ansible-${PYTHON_VER} {} \; + # python autoplist doesn't add this file in plist + ${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory TEST_WRKSRC=${WRKSRC}/test Modified: head/sysutils/ansible/distinfo ============================================================================== --- head/sysutils/ansible/distinfo Tue Apr 28 19:27:34 2020 (r533265) +++ head/sysutils/ansible/distinfo Tue Apr 28 20:46:07 2020 (r533266) @@ -1,3 +1,3 @@ -TIMESTAMP = 1587131533 -SHA256 (ansible-2.8.11.tar.gz) = 156caa8b6c60b9f0d5c7d57ee0f4e46d8e226147b58546be6a8ac52925a9c191 -SIZE (ansible-2.8.11.tar.gz) = 12712657 +TIMESTAMP = 1588106713 +SHA256 (ansible-2.9.7.tar.gz) = 7222ce925536a25b2912364e13b03a3e21dbf2f96799ebff304f48509324de7b +SIZE (ansible-2.9.7.tar.gz) = 14215538 Modified: head/sysutils/ansible23/Makefile ============================================================================== --- head/sysutils/ansible23/Makefile Tue Apr 28 19:27:34 2020 (r533265) +++ head/sysutils/ansible23/Makefile Tue Apr 28 20:46:07 2020 (r533266) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.3.3.0 -PORTREVISION= 4 +PORTREVISION= 5 PKGNAMESUFFIX= 23 CONFLICTS= ansible-* \ @@ -9,12 +9,14 @@ CONFLICTS= ansible-* \ ansible24-* \ ansible25-* \ ansible26-* \ - ansible27-* + ansible27-* \ + ansible28-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo DEPRECATED= Upstream support ended. Consider upgrading to sysutils/ansible +EXPIRATION_DATE=2020-05-31 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \ @@ -31,6 +33,7 @@ PLIST_FILES= man/man1/ansible-console.1.gz \ man/man1/ansible-vault.1.gz \ man/man1/ansible.1.gz +USES= cpe python EXTRA_PATCHES= .include "${MASTERDIR}/Makefile" Modified: head/sysutils/ansible24/Makefile ============================================================================== --- head/sysutils/ansible24/Makefile Tue Apr 28 19:27:34 2020 (r533265) +++ head/sysutils/ansible24/Makefile Tue Apr 28 20:46:07 2020 (r533266) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.4.6.0 -PORTREVISION= 3 +PORTREVISION= 4 PKGNAMESUFFIX= 24 CONFLICTS= ansible-* \ @@ -9,13 +9,16 @@ CONFLICTS= ansible-* \ ansible23-* \ ansible25-* \ ansible26-* \ - ansible27-* + ansible27-* \ + ansible28-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo DEPRECATED= Upstream support ended. Consider upgrading to sysutils/ansible +EXPIRATION_DATE=2020-05-31 +USES= cpe python EXTRA_PATCHES= .include "${MASTERDIR}/Makefile" Modified: head/sysutils/ansible25/Makefile ============================================================================== --- head/sysutils/ansible25/Makefile Tue Apr 28 19:27:34 2020 (r533265) +++ head/sysutils/ansible25/Makefile Tue Apr 28 20:46:07 2020 (r533266) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.5.15 -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= 25 CONFLICTS= ansible-* \ @@ -9,13 +9,16 @@ CONFLICTS= ansible-* \ ansible23-* \ ansible24-* \ ansible26-* \ - ansible27-* + ansible27-* \ + ansible28-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo DEPRECATED= Upstream support ended. Consider upgrading to sysutils/ansible +EXPIRATION_DATE=2020-05-31 +USES= cpe python EXTRA_PATCHES= .include "${MASTERDIR}/Makefile" Modified: head/sysutils/ansible26/Makefile ============================================================================== --- head/sysutils/ansible26/Makefile Tue Apr 28 19:27:34 2020 (r533265) +++ head/sysutils/ansible26/Makefile Tue Apr 28 20:46:07 2020 (r533266) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.6.20 +PORTREVISION= 1 PKGNAMESUFFIX= 26 CONFLICTS= ansible-* \ @@ -8,13 +9,16 @@ CONFLICTS= ansible-* \ ansible23-* \ ansible24-* \ ansible25-* \ - ansible27-* + ansible27-* \ + ansible28-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo DEPRECATED= Upstream support ended. Consider upgrading to sysutils/ansible +EXPIRATION_DATE=2020-05-31 +USES= cpe python EXTRA_PATCHES= ${FILESDIR}/extra-patch-sesu .include "${MASTERDIR}/Makefile" Modified: head/sysutils/ansible27/Makefile ============================================================================== --- head/sysutils/ansible27/Makefile Tue Apr 28 19:27:34 2020 (r533265) +++ head/sysutils/ansible27/Makefile Tue Apr 28 20:46:07 2020 (r533266) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.7.17 +PORTREVISION= 1 PKGNAMESUFFIX= 27 CONFLICTS= ansible-* \ @@ -8,11 +9,13 @@ CONFLICTS= ansible-* \ ansible23-* \ ansible24-* \ ansible25-* \ - ansible26-* + ansible26-* \ + ansible28-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo +USES= cpe python EXTRA_PATCHES= ${FILESDIR}/extra-patch-sesu \ ${FILESDIR}/extra-patch-27 Modified: head/sysutils/ansible28/Makefile ============================================================================== --- head/sysutils/ansible/Makefile Tue Apr 28 19:27:34 2020 (r533265) +++ head/sysutils/ansible28/Makefile Tue Apr 28 20:46:07 2020 (r533266) @@ -1,90 +1,20 @@ # $FreeBSD$ -PORTNAME= ansible -PORTVERSION?= 2.8.11 -PORTREVISION?= 0 -CATEGORIES= sysutils python -MASTER_SITES= http://releases.ansible.com/ansible/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PORTVERSION= 2.8.11 +PKGNAMESUFFIX= 28 -MAINTAINER= lifanov@FreeBSD.org -COMMENT= Radically simple IT automation - -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING - -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} - -CONFLICTS?= ansible1-* \ +CONFLICTS= ansible-* \ + ansible1-* \ ansible23-* \ ansible24-* \ ansible25-* \ - ansible27-* \ ansible26-* \ ansible27-* -EXTRA_PATCHES?= +MASTERDIR= ${.CURDIR}/../ansible +DISTINFO_FILE= ${.CURDIR}/distinfo -NO_ARCH= yes -USES?= cpe python -USE_PYTHON= distutils autoplist concurrent -CPE_VENDOR= ansibleworks +USES= cpe python +EXTRA_PATCHES= -SUB_FILES= pkg-message -SUB_LIST+= PYTHON_CMD=${PYTHON_CMD} - -PLIST_FILES?= man/man1/ansible-config.1.gz \ - man/man1/ansible-console.1.gz \ - man/man1/ansible-doc.1.gz \ - man/man1/ansible-galaxy.1.gz \ - man/man1/ansible-inventory.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 - -post-patch: - ${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} \ - -e 's|/etc/ansible|${ETCDIR:S/${PY_FLAVOR}-//}|g' \ - -e 's|/usr/share/ansible|${DATADIR}|g' - ${FIND} ${WRKSRC} -type f -name "*.bak" -delete - -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} - -post-stage: - ${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \ - -execdir ${RLN} ansible-${PYTHON_VER} {} \; - -TEST_WRKSRC=${WRKSRC}/test - -do-test: -# ${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test sanity --python ${PYTHON_VER} -v - ${RM} ${TEST_WRKSRC}/units/modules/net_tools/test_nmcli.py # not conditional/doesn't work with nose - ${PYTHON_CMD} ${TEST_WRKSRC}/runner/ansible-test units --python ${PYTHON_VER} -v - -.include +.include "${MASTERDIR}/Makefile" Modified: head/sysutils/ansible28/distinfo ============================================================================== --- head/sysutils/ansible/distinfo Tue Apr 28 19:27:34 2020 (r533265) +++ head/sysutils/ansible28/distinfo Tue Apr 28 20:46:07 2020 (r533266) @@ -1,3 +1,3 @@ -TIMESTAMP = 1587131533 +TIMESTAMP = 1588106665 SHA256 (ansible-2.8.11.tar.gz) = 156caa8b6c60b9f0d5c7d57ee0f4e46d8e226147b58546be6a8ac52925a9c191 SIZE (ansible-2.8.11.tar.gz) = 12712657