From owner-dev-commits-ports-all@freebsd.org Wed May 12 18:45:45 2021 Return-Path: Delivered-To: dev-commits-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 F41DA6489EE; Wed, 12 May 2021 18:45:44 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FgNyw4Mc1z3C8R; Wed, 12 May 2021 18:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 86707109AC; Wed, 12 May 2021 18:45:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14CIjiBp064694; Wed, 12 May 2021 18:45:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14CIjiqo064693; Wed, 12 May 2021 18:45:44 GMT (envelope-from git) Date: Wed, 12 May 2021 18:45:44 GMT Message-Id: <202105121845.14CIjiqo064693@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 5872020e4f51 - main - sysutils/ansible: Drop unnecessary master port infrastructure MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5872020e4f51c4d337dc83b5168c7e5cf466f602 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 May 2021 18:45:45 -0000 The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=5872020e4f51c4d337dc83b5168c7e5cf466f602 commit 5872020e4f51c4d337dc83b5168c7e5cf466f602 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2021-05-12 18:45:04 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-05-12 18:45:52 +0000 sysutils/ansible: Drop unnecessary master port infrastructure Currently, sysutils/ansible is no longer a master port. --- sysutils/ansible/Makefile | 15 +++--- sysutils/ansible/files/extra-patch-27 | 84 --------------------------------- sysutils/ansible/files/extra-patch-sesu | 59 ----------------------- 3 files changed, 7 insertions(+), 151 deletions(-) diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 2c7924f66b52..45dad643c437 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,6 +1,6 @@ PORTNAME= ansible -PORTVERSION?= 2.9.21 -PORTREVISION?= 1 +DISTVERSION= 2.9.21 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= http://releases.ansible.com/ansible/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,13 +11,13 @@ COMMENT= Radically simple IT automation LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ ${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}yaml>0:devel/py-yaml@${PY_FLAVOR} -TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ +TEST_DEPENDS= ${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} \ ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ @@ -28,11 +28,11 @@ TEST_DEPENDS?= ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} -USES?= cpe gmake python:3.6+ shebangfix +USES= cpe gmake python:3.6+ shebangfix CPE_VENDOR= ansibleworks USE_PYTHON= autoplist concurrent distutils -SHEBANG_REGEX?= [.]/test/.*[.]py +SHEBANG_REGEX= [.]/test/.*[.]py TEST_ARGS= VERSION=${PORTVERSION} \ PYTHON=${PYTHON_CMD} \ @@ -42,13 +42,12 @@ TEST_TARGET= tests CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}-*} -EXTRA_PATCHES?= NO_ARCH= yes SUB_FILES= pkg-message SUB_LIST= MAJMINVER=${PORTVERSION:R} \ PYTHON_PKGNAMEPREFIX=${PYTHON_PKGNAMEPREFIX} -PLIST_FILES?= man/man1/ansible-config.1.gz \ +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 \ diff --git a/sysutils/ansible/files/extra-patch-27 b/sysutils/ansible/files/extra-patch-27 deleted file mode 100644 index bd077f558e36..000000000000 --- a/sysutils/ansible/files/extra-patch-27 +++ /dev/null @@ -1,84 +0,0 @@ ---- 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: diff --git a/sysutils/ansible/files/extra-patch-sesu b/sysutils/ansible/files/extra-patch-sesu deleted file mode 100644 index 845594ee16bc..000000000000 --- a/sysutils/ansible/files/extra-patch-sesu +++ /dev/null @@ -1,59 +0,0 @@ ---- lib/ansible/constants.py.orig 2018-06-28 23:30:34 UTC -+++ lib/ansible/constants.py -@@ -59,8 +59,9 @@ def set_constant(name, value, export=var - - - # CONSTANTS ### yes, actual ones --BECOME_METHODS = ['sudo', 'su', 'pbrun', 'pfexec', 'doas', 'dzdo', 'ksu', 'runas', 'pmrun', 'enable', 'machinectl'] -+BECOME_METHODS = ['sesu', 'sudo', 'su', 'pbrun', 'pfexec', 'doas', 'dzdo', 'ksu', 'runas', 'pmrun', 'enable', 'machinectl'] - BECOME_ERROR_STRINGS = { -+ 'sesu': '', - 'sudo': 'Sorry, try again.', - 'su': 'Authentication failure', - 'pbrun': '', -@@ -73,6 +74,7 @@ BECOME_ERROR_STRINGS = { - 'machinectl': '', - } # FIXME: deal with i18n - BECOME_MISSING_STRINGS = { -+ 'sesu': '', - 'sudo': 'sorry, a password is required to run sudo', - 'su': '', - 'pbrun': '', ---- lib/ansible/modules/commands/command.py.orig 2018-06-28 23:30:34 UTC -+++ lib/ansible/modules/commands/command.py -@@ -142,7 +142,7 @@ def check_command(module, commandline): - 'mount': 'mount', 'rpm': 'yum, dnf or zypper', 'yum': 'yum', 'apt-get': 'apt', - 'tar': 'unarchive', 'unzip': 'unarchive', 'sed': 'replace, lineinfile or template', - 'dnf': 'dnf', 'zypper': 'zypper'} -- become = ['sudo', 'su', 'pbrun', 'pfexec', 'runas', 'pmrun', 'machinectl'] -+ become = ['sesu', 'sudo', 'su', 'pbrun', 'pfexec', 'runas', 'pmrun', 'machinectl'] - if isinstance(commandline, list): - command = commandline[0] - else: ---- lib/ansible/modules/web_infrastructure/ansible_tower/tower_credential.py.orig 2018-06-28 23:30:34 UTC -+++ lib/ansible/modules/web_infrastructure/ansible_tower/tower_credential.py -@@ -96,7 +96,7 @@ options: - become_method: - description: - - Become method to Use for privledge escalation. -- choices: ["None", "sudo", "su", "pbrun", "pfexec", "pmrun"] -+ choices: ["None", "sesu", "sudo", "su", "pbrun", "pfexec", "pmrun"] - become_username: - description: - - Become username. Use ASK for prompting. ---- lib/ansible/playbook/play_context.py.orig 2018-06-28 23:30:34 UTC -+++ lib/ansible/playbook/play_context.py -@@ -562,6 +562,13 @@ class PlayContext(Base): - exe = self.become_exe or 'machinectl' - becomecmd = '%s shell -q %s %s@ %s' % (exe, flags, self.become_user, command) - -+ elif self.become_method == 'sesu': -+ -+ exe = self.become_exe or 'sesu' -+ -+ prompt = 'Please enter your password:' -+ becomecmd = '%s %s %s -c %s' % (exe, flags, self.become_user, shlex_quote(command)) -+ - else: - raise AnsibleError("Privilege escalation method not found: %s" % self.become_method) -