Index: Makefile =================================================================== --- Makefile (revision 487098) +++ Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= ansible PORTVERSION?= 2.7.2 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Index: files/patch-lib__ansible__module_utils__facts__virtual__freebsd.py =================================================================== --- files/patch-lib__ansible__module_utils__facts__virtual__freebsd.py (nonexistent) +++ files/patch-lib__ansible__module_utils__facts__virtual__freebsd.py (working copy) @@ -0,0 +1,24 @@ +--- 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' Property changes on: files/patch-lib__ansible__module_utils__facts__virtual__freebsd.py ___________________________________________________________________ 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: files/patch-lib__ansible__modules__packaging__os__pkgng.py =================================================================== --- files/patch-lib__ansible__modules__packaging__os__pkgng.py (nonexistent) +++ files/patch-lib__ansible__modules__packaging__os__pkgng.py (working copy) @@ -0,0 +1,19 @@ +--- 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") + Property changes on: files/patch-lib__ansible__modules__packaging__os__pkgng.py ___________________________________________________________________ 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: files/patch-lib__ansible__modules__storage__zfs__zfs.py =================================================================== --- files/patch-lib__ansible__modules__storage__zfs__zfs.py (nonexistent) +++ files/patch-lib__ansible__modules__storage__zfs__zfs.py (working copy) @@ -0,0 +1,11 @@ +--- 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() Property changes on: files/patch-lib__ansible__modules__storage__zfs__zfs.py ___________________________________________________________________ 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: files/patch-lib__ansible__playbook__play_context.py =================================================================== --- files/patch-lib__ansible__playbook__play_context.py (nonexistent) +++ files/patch-lib__ansible__playbook__play_context.py (working copy) @@ -0,0 +1,14 @@ +--- 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: files/patch-lib__ansible__playbook__play_context.py ___________________________________________________________________ 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