Index: branches/2020Q2/sysutils/ansible/Makefile
===================================================================
--- branches/2020Q2/sysutils/ansible/Makefile	(revision 532024)
+++ branches/2020Q2/sysutils/ansible/Makefile	(revision 532025)
@@ -1,90 +1,90 @@
 # $FreeBSD$
 
 PORTNAME=	ansible
-PORTVERSION?=	2.8.7
+PORTVERSION?=	2.8.11
 PORTREVISION?=	0
 CATEGORIES=	sysutils python
 MASTER_SITES=	http://releases.ansible.com/ansible/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 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-* \
 		ansible23-* \
 		ansible24-* \
 		ansible25-* \
 		ansible27-* \
 		ansible26-* \
 		ansible27-*
 
 EXTRA_PATCHES?=
 
 NO_ARCH=	yes
 USES?=		cpe python
 USE_PYTHON=	distutils autoplist concurrent
 CPE_VENDOR=	ansibleworks
 
 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 <bsd.port.mk>
Index: branches/2020Q2/sysutils/ansible/distinfo
===================================================================
--- branches/2020Q2/sysutils/ansible/distinfo	(revision 532024)
+++ branches/2020Q2/sysutils/ansible/distinfo	(revision 532025)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577375349
-SHA256 (ansible-2.8.7.tar.gz) = 828239ca2b4d92865a00ab415caa932700f7c93f3e4838ddd55614ddf104c947
-SIZE (ansible-2.8.7.tar.gz) = 12697144
+TIMESTAMP = 1587131533
+SHA256 (ansible-2.8.11.tar.gz) = 156caa8b6c60b9f0d5c7d57ee0f4e46d8e226147b58546be6a8ac52925a9c191
+SIZE (ansible-2.8.11.tar.gz) = 12712657
Index: branches/2020Q2/sysutils/ansible/files/extra-patch-27
===================================================================
--- branches/2020Q2/sysutils/ansible/files/extra-patch-27	(nonexistent)
+++ branches/2020Q2/sysutils/ansible/files/extra-patch-27	(revision 532025)
@@ -0,0 +1,84 @@
+--- lib/ansible/module_utils/facts/virtual/freebsd.py.orig	2020-04-17 14:07:09 UTC
++++ lib/ansible/module_utils/facts/virtual/freebsd.py
+@@ -19,9 +19,11 @@ __metaclass__ = type
+ import os
+ 
+ from ansible.module_utils.facts.virtual.base import Virtual, VirtualCollector
++# Rudimentary detection of the virtual platforms, more through version is coming. Catches VMWare at minimum.
++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
+@@ -34,6 +36,9 @@ class FreeBSDVirtual(Virtual):
+         # Set empty values as default
+         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'
+--- lib/ansible/modules/packaging/os/pkgng.py.orig	2020-04-17 14:07:10 UTC
++++ lib/ansible/modules/packaging/os/pkgng.py
+@@ -201,13 +201,17 @@ def install_packages(module, pkgng_path, packages, cac
+ 
+     # This environment variable skips mid-install prompts,
+     # setting them to their default values.
+-    batch_var = 'env BATCH=yes'
++    # There is at least one case, when upgrading from 11.1 to 11.2 when pkg asks extra 
++    # question about OS version mismatch in the repository. As this isn't handled, playbook
++    # hangs forever. Adding ASSUME_ALWAYS_YES to the environment addresses that, and
++    # possibly other potential issues.
++    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	2020-04-17 14:07:11 UTC
++++ lib/ansible/modules/storage/zfs/zfs.py
+@@ -102,7 +102,15 @@ 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]
++        # - name: Create a new file system by cloning a snapshot
++        # zfs:
++        #   name: rpool/cloned_fs
++        #   state: present
++        #   origin: rpool@mysnapshot
++        #
++        # doesn't work properly, as code assumes that there is at least one level of hierarchy
++        # in zpool. But that's not always the case - pool may be dataset as well and have a snapshot.
++        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	2020-04-17 14:07:10 UTC
++++ lib/ansible/playbook/play_context.py
+@@ -528,8 +528,13 @@ class PlayContext(Base):
+                 becomecmd = cmd
+ 
+             elif self.become_method == 'doas':
++                # `doas` support in ansible is broken ATM, doesn't handle password
++                # authentication properly, cause assumes only challenge-respond auth.
++                # This patch should handle both ways properly.
++                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: branches/2020Q2/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: branches/2020Q2/sysutils/ansible23/Makefile
===================================================================
--- branches/2020Q2/sysutils/ansible23/Makefile	(revision 532024)
+++ branches/2020Q2/sysutils/ansible23/Makefile	(revision 532025)
@@ -1,34 +1,36 @@
 # $FreeBSD$
 
 PORTVERSION=	2.3.3.0
 PORTREVISION=	4
 PKGNAMESUFFIX=	23
 
 CONFLICTS=	ansible-* \
 		ansible1-* \
 		ansible24-* \
 		ansible25-* \
 		ansible26-* \
 		ansible27-*
 
 MASTERDIR=	${.CURDIR}/../ansible
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
+DEPRECATED=	Upstream support ended. Consider upgrading to sysutils/ansible
+
 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} \
 		${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>0:security/py-pycrypto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 
 PLIST_FILES=	man/man1/ansible-console.1.gz \
 		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
 
 EXTRA_PATCHES=
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2020Q2/sysutils/ansible24/Makefile
===================================================================
--- branches/2020Q2/sysutils/ansible24/Makefile	(revision 532024)
+++ branches/2020Q2/sysutils/ansible24/Makefile	(revision 532025)
@@ -1,19 +1,21 @@
 # $FreeBSD$
 
 PORTVERSION=	2.4.6.0
 PORTREVISION=	3
 PKGNAMESUFFIX=	24
 
 CONFLICTS=	ansible-* \
 		ansible1-* \
 		ansible23-* \
 		ansible25-* \
 		ansible26-* \
 		ansible27-*
 
 MASTERDIR=	${.CURDIR}/../ansible
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
+DEPRECATED=	Upstream support ended. Consider upgrading to sysutils/ansible
+
 EXTRA_PATCHES=
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2020Q2/sysutils/ansible25/Makefile
===================================================================
--- branches/2020Q2/sysutils/ansible25/Makefile	(revision 532024)
+++ branches/2020Q2/sysutils/ansible25/Makefile	(revision 532025)
@@ -1,19 +1,21 @@
 # $FreeBSD$
 
 PORTVERSION=	2.5.15
 PORTREVISION=	2
 PKGNAMESUFFIX=	25
 
 CONFLICTS=	ansible-* \
 		ansible1-* \
 		ansible23-* \
 		ansible24-* \
 		ansible26-* \
 		ansible27-*
 
 MASTERDIR=	${.CURDIR}/../ansible
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
+DEPRECATED=	Upstream support ended. Consider upgrading to sysutils/ansible
+
 EXTRA_PATCHES=
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2020Q2/sysutils/ansible26/Makefile
===================================================================
--- branches/2020Q2/sysutils/ansible26/Makefile	(revision 532024)
+++ branches/2020Q2/sysutils/ansible26/Makefile	(revision 532025)
@@ -1,18 +1,20 @@
 # $FreeBSD$
 
 PORTVERSION=	2.6.20
 PKGNAMESUFFIX=	26
 
 CONFLICTS=	ansible-* \
 		ansible1-* \
 		ansible23-* \
 		ansible24-* \
 		ansible25-* \
 		ansible27-*
 
 MASTERDIR=	${.CURDIR}/../ansible
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
+DEPRECATED=	Upstream support ended. Consider upgrading to sysutils/ansible
+
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sesu
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2020Q2/sysutils/ansible27/Makefile
===================================================================
--- branches/2020Q2/sysutils/ansible27/Makefile	(revision 532024)
+++ branches/2020Q2/sysutils/ansible27/Makefile	(revision 532025)
@@ -1,18 +1,19 @@
 # $FreeBSD$
 
-PORTVERSION=	2.7.15
+PORTVERSION=	2.7.17
 PKGNAMESUFFIX=	27
 
 CONFLICTS=	ansible-* \
 		ansible1-* \
 		ansible23-* \
 		ansible24-* \
 		ansible25-* \
 		ansible26-*
 
 MASTERDIR=	${.CURDIR}/../ansible
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-sesu
+EXTRA_PATCHES=	${FILESDIR}/extra-patch-sesu \
+		${FILESDIR}/extra-patch-27
 
 .include "${MASTERDIR}/Makefile"
Index: branches/2020Q2/sysutils/ansible27/distinfo
===================================================================
--- branches/2020Q2/sysutils/ansible27/distinfo	(revision 532024)
+++ branches/2020Q2/sysutils/ansible27/distinfo	(revision 532025)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577375263
-SHA256 (ansible-2.7.15.tar.gz) = 99bf683d069b3f73704182ece95b6618ae2090594a66e146f4d286c0cac858ce
-SIZE (ansible-2.7.15.tar.gz) = 10205890
+TIMESTAMP = 1587128349
+SHA256 (ansible-2.7.17.tar.gz) = 9fdb79c43f7ad972dc7ccff8a4e9553d623e52dc80b802c619568d3c38f94ccc
+SIZE (ansible-2.7.17.tar.gz) = 10215119
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 532024)
+++ branches/2020Q2	(revision 532025)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r531978