Index: sysutils/Makefile =================================================================== --- sysutils/Makefile (revision 529065) +++ sysutils/Makefile (working copy) @@ -44,6 +44,7 @@ SUBDIR += ansible25 SUBDIR += ansible26 SUBDIR += ansible27 + SUBDIR += ansible28 SUBDIR += anvil SUBDIR += apache-mesos SUBDIR += apachetop Index: sysutils/ansible/Makefile =================================================================== --- sysutils/ansible/Makefile (revision 528589) +++ sysutils/ansible/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ansible -PORTVERSION?= 2.8.7 +PORTVERSION?= 2.9.6 PORTREVISION?= 0 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ @@ -34,15 +34,47 @@ 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,7 @@ post-stage: ${FIND} ${STAGEDIR}${PREFIX}/bin -type l -name ansible-\* -lname ansible \ -execdir ${RLN} ansible-${PYTHON_VER} {} \; + ${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory TEST_WRKSRC=${WRKSRC}/test Index: sysutils/ansible/distinfo =================================================================== --- sysutils/ansible/distinfo (revision 528589) +++ sysutils/ansible/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577375349 -SHA256 (ansible-2.8.7.tar.gz) = 828239ca2b4d92865a00ab415caa932700f7c93f3e4838ddd55614ddf104c947 -SIZE (ansible-2.8.7.tar.gz) = 12697144 +TIMESTAMP = 1585020908 +SHA256 (ansible-2.9.6.tar.gz) = 59cf3a0781f89992d1dae5205b07e802dff1db205eebd238de9e503b62b8cbc9 +SIZE (ansible-2.9.6.tar.gz) = 14201258 Index: sysutils/ansible/files/extra-patch-27 =================================================================== --- sysutils/ansible/files/extra-patch-27 (nonexistent) +++ sysutils/ansible/files/extra-patch-27 (working copy) @@ -0,0 +1,68 @@ +--- lib/ansible/module_utils/facts/virtual/freebsd.py.orig 2018-10-25 02:45:26 UTC ++++ lib/ansible/module_utils/facts/virtual/freebsd.py +@@ -19,9 +19,10 @@ __metaclass__ = type + import os + + from ansible.module_utils.facts.virtual.base import Virtual, VirtualCollector ++from ansible.module_utils.facts.virtual.sysctl import VirtualSysctlDetectionMixin + + +-class FreeBSDVirtual(Virtual): ++class FreeBSDVirtual(Virtual, VirtualSysctlDetectionMixin): + """ + This is a FreeBSD-specific subclass of Virtual. It defines + - virtualization_type +@@ -35,6 +36,9 @@ class FreeBSDVirtual(Virtual): + virtual_facts['virtualization_type'] = '' + virtual_facts['virtualization_role'] = '' + ++ virtual_product_facts = self.detect_virt_product('hw.hv_vendor') ++ virtual_facts.update(virtual_product_facts) ++ + if os.path.exists('/dev/xen/xenstore'): + virtual_facts['virtualization_type'] = 'xen' + virtual_facts['virtualization_role'] = 'guest' +--- lib/ansible/modules/packaging/os/pkgng.py.orig 2018-10-24 02:17:26 UTC ++++ lib/ansible/modules/packaging/os/pkgng.py +@@ -201,13 +201,13 @@ def install_packages(module, pkgng_path, + + # This environment variable skips mid-install prompts, + # setting them to their default values. +- batch_var = 'env BATCH=yes' ++ batch_var = 'env BATCH=yes ASSUME_ALWAYS_YES=yes' + + if not module.check_mode and not cached: + if old_pkgng: +- rc, out, err = module.run_command("%s %s update" % (pkgsite, pkgng_path)) ++ rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgsite, pkgng_path)) + else: +- rc, out, err = module.run_command("%s %s update" % (pkgng_path, dir_arg)) ++ rc, out, err = module.run_command("%s %s %s update" % (batch_var, pkgng_path, dir_arg)) + if rc != 0: + module.fail_json(msg="Could not update catalogue") + +--- lib/ansible/modules/storage/zfs/zfs.py.orig 2018-11-07 02:46:41 UTC ++++ lib/ansible/modules/storage/zfs/zfs.py +@@ -102,7 +102,7 @@ class Zfs(object): + self.changed = False + self.zfs_cmd = module.get_bin_path('zfs', True) + self.zpool_cmd = module.get_bin_path('zpool', True) +- self.pool = name.split('/')[0] ++ self.pool = name.split('@')[0].split('/')[0] + self.is_solaris = os.uname()[0] == 'SunOS' + self.is_openzfs = self.check_openzfs() + self.enhanced_sharing = self.check_enhanced_sharing() +--- lib/ansible/playbook/play_context.py.orig 2018-10-10 00:56:07 UTC ++++ lib/ansible/playbook/play_context.py +@@ -528,8 +528,10 @@ class PlayContext(Base): + becomecmd = cmd + + elif self.become_method == 'doas': ++ def detect_doas_prompt(b_data): ++ return re.match(b"[Pp]assword:", b_data) + +- prompt = 'doas (%s@' % self.remote_user ++ prompt = detect_doas_prompt + exe = self.become_exe or 'doas' + + if not self.become_pass: Property changes on: sysutils/ansible/files/extra-patch-27 ___________________________________________________________________ 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 Index: sysutils/ansible23/Makefile =================================================================== --- sysutils/ansible23/Makefile (revision 528589) +++ sysutils/ansible23/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.3.3.0 -PORTREVISION= 4 +PORTREVISION= 5 PKGNAMESUFFIX= 23 CONFLICTS= ansible-* \ @@ -9,11 +9,15 @@ ansible24-* \ ansible25-* \ ansible26-* \ - ansible27-* + ansible27-* \ + ansible28-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo +DEPRECATED= Upstream support ended +EXPIRATION_DATE=2020-04-24 + RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}jmespath>0:devel/py-jmespath@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \ @@ -29,6 +33,7 @@ man/man1/ansible-vault.1.gz \ man/man1/ansible.1.gz +USES= cpe python EXTRA_PATCHES= .include "${MASTERDIR}/Makefile" Index: sysutils/ansible24/Makefile =================================================================== --- sysutils/ansible24/Makefile (revision 528589) +++ sysutils/ansible24/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.4.6.0 -PORTREVISION= 3 +PORTREVISION= 4 PKGNAMESUFFIX= 24 CONFLICTS= ansible-* \ @@ -9,11 +9,16 @@ ansible23-* \ ansible25-* \ ansible26-* \ - ansible27-* + ansible27-* \ + ansible28-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo +DEPRECATED= Upstream support ended +EXPIRATION_DATE=2020-04-24 + +USES= cpe python EXTRA_PATCHES= .include "${MASTERDIR}/Makefile" Index: sysutils/ansible25/Makefile =================================================================== --- sysutils/ansible25/Makefile (revision 528589) +++ sysutils/ansible25/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.5.15 -PORTREVISION= 2 +PORTREVISION= 3 PKGNAMESUFFIX= 25 CONFLICTS= ansible-* \ @@ -9,11 +9,16 @@ ansible23-* \ ansible24-* \ ansible26-* \ - ansible27-* + ansible27-* \ + ansible28-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo +DEPRECATED= Upstream support ended +EXPIRATION_DATE=2020-04-24 + +USES= cpe python EXTRA_PATCHES= .include "${MASTERDIR}/Makefile" Index: sysutils/ansible26/Makefile =================================================================== --- sysutils/ansible26/Makefile (revision 528589) +++ sysutils/ansible26/Makefile (working copy) @@ -1,6 +1,7 @@ # $FreeBSD$ PORTVERSION= 2.6.20 +PORTREVISION= 1 PKGNAMESUFFIX= 26 CONFLICTS= ansible-* \ @@ -8,11 +9,16 @@ ansible23-* \ ansible24-* \ ansible25-* \ - ansible27-* + ansible27-* \ + ansible28-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo +DEPRECATED= Upstream support ended +EXPIRATION_DATE=2020-04-24 + +USES= cpe python EXTRA_PATCHES= ${FILESDIR}/extra-patch-sesu .include "${MASTERDIR}/Makefile" Index: sysutils/ansible27/Makefile =================================================================== --- sysutils/ansible27/Makefile (revision 528589) +++ sysutils/ansible27/Makefile (working copy) @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTVERSION= 2.7.15 +PORTVERSION= 2.7.16 PKGNAMESUFFIX= 27 CONFLICTS= ansible-* \ @@ -8,11 +8,13 @@ ansible23-* \ ansible24-* \ ansible25-* \ - ansible26-* + ansible26-* \ + ansible28-* MASTERDIR= ${.CURDIR}/../ansible DISTINFO_FILE= ${.CURDIR}/distinfo -EXTRA_PATCHES= ${FILESDIR}/extra-patch-sesu - +USES= cpe python +EXTRA_PATCHES= ${FILESDIR}/extra-patch-sesu \ + ${FILESDIR}/extra-patch-27 .include "${MASTERDIR}/Makefile" Index: sysutils/ansible27/distinfo =================================================================== --- sysutils/ansible27/distinfo (revision 528589) +++ sysutils/ansible27/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1577375263 -SHA256 (ansible-2.7.15.tar.gz) = 99bf683d069b3f73704182ece95b6618ae2090594a66e146f4d286c0cac858ce -SIZE (ansible-2.7.15.tar.gz) = 10205890 +TIMESTAMP = 1585014421 +SHA256 (ansible-2.7.16.tar.gz) = bb4a95a3e1a0f9e1aabd8cf628de68f5218fba3057b970b6b3c41cc53ab06268 +SIZE (ansible-2.7.16.tar.gz) = 10206620 Index: sysutils/ansible28/Makefile =================================================================== --- sysutils/ansible28/Makefile (nonexistent) +++ sysutils/ansible28/Makefile (working copy) @@ -0,0 +1,20 @@ +# $FreeBSD$ + +PORTVERSION= 2.8.10 +PKGNAMESUFFIX= 28 + +CONFLICTS= ansible-* \ + ansible1-* \ + ansible23-* \ + ansible24-* \ + ansible25-* \ + ansible26-* \ + ansible27-* + +MASTERDIR= ${.CURDIR}/../ansible +DISTINFO_FILE= ${.CURDIR}/distinfo + +USES= cpe python +EXTRA_PATCHES= + +.include "${MASTERDIR}/Makefile" Property changes on: sysutils/ansible28/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: sysutils/ansible28/distinfo =================================================================== --- sysutils/ansible28/distinfo (nonexistent) +++ sysutils/ansible28/distinfo (working copy) @@ -0,0 +1,3 @@ +TIMESTAMP = 1585012493 +SHA256 (ansible-2.8.10.tar.gz) = 72449a3dde4142c79ef607dc6a2a02995b1c96f75d0ef5beffd00f3dfa6f93a6 +SIZE (ansible-2.8.10.tar.gz) = 12705261 Property changes on: sysutils/ansible28/distinfo ___________________________________________________________________ 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 Index: UPDATING =================================================================== --- UPDATING (revision 529065) +++ UPDATING (working copy) @@ -5,6 +5,20 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20200325: + AFFECTS: users of sysutils/ansible + AUTHOR: bofh@FreeBSD.org + + Ansible has been updated to 2.9.6. 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 + 20200320 AFFECTS: users of devel/qca AUTHOR: kde@FreeBSD.org