From nobody Thu Jul 21 23:46:10 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lpq2q0lSxz4Wbgw; Thu, 21 Jul 2022 23:46:11 +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 4Lpq2q0KLyz45mP; Thu, 21 Jul 2022 23:46:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658447171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zlQ+L3hbcydIG9DqWKeiF3xy7oJPvQXXZzZ0hMCL6fk=; b=rmzk41Nz7a42uhZUuNIW3f++C9nlYX8f58sMxpo+wnRq4+ZOM7lpCVG1JjsHMaEPA2d1WM nj0p1xbl8NGLfA8/jPeagMy3S1wIKTrBoaj62oqZFK9DN+FWd7JJm+kEHhwWXqGYp1L9ih fmhI08Hse0gPseszUIb8xQgzVYHhk4WXAhSjlcdFRvuF+ZSLEd2IjZ8wQ1TiZpMZcVsxja JvJVTZ47sMfjmW4+sSLeIY7/4K8DDWf8lyniwTLxsCCfB+eZqG4cscMCUBvIf4qR1CxFdJ EFpn+wMMhum2e7YT0PjMzrhURswKKERHvU7vWuXxm2lGzWsLAIQfAMKr+Tc4GA== 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 4Lpq2p6VN3zgXN; Thu, 21 Jul 2022 23:46:10 +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 26LNkAWF021460; Thu, 21 Jul 2022 23:46:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26LNkAcr021459; Thu, 21 Jul 2022 23:46:10 GMT (envelope-from git) Date: Thu, 21 Jul 2022 23:46:10 GMT Message-Id: <202207212346.26LNkAcr021459@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: a6edc54ae691 - main - sysutils/ansible: Do not replace shebangs within modules List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: a6edc54ae6911d8d7621182c2c2ffa26777985ea Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658447171; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zlQ+L3hbcydIG9DqWKeiF3xy7oJPvQXXZzZ0hMCL6fk=; b=LGI8rZaXPmB9Ijm6NeFd7k3mOm9rZn7u86JTw7UGR41jd7aAXVWYvgzeu8yqy/cbGJr0vV P9+CrcMo+E0hBKhuaRXprzpwIEVVlyuN/hZyu7osCqY7cRsMB70rWL3S0YXGPsTm/AQmaI oFvm6AFsvOVGxKHKz1qoNSMRWgEiJwWPyJeydMFw11R4I48L6ViUS2wjRnRe/fhkc1rM+0 OY7hW8hZd3eLjPL77H5H5rWUQw/WX7CPDMOxVhepHe0DQsK5cBFDqb7U7VI7BHrJbi8O/X T7NeifiYmr1bTLpBf15+G7xVAMjvq2ufwMVzs7yJUm+dq4odzcfnSrLbS6gMDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658447171; a=rsa-sha256; cv=none; b=Zjao71nUnvXfyVCQnWnQSz6AaKjxH32/4WDye95eUTWwhN8Ygu4v2ULAwcr29Cr7fRYfyI /NvcRZ1iJB8z54wX/7/S1tyejlxGV9i56or2oTuXsfaGFx2CU+r/2UnW+M1N5gQXfSNlrV lUad9Ar7vBQ3JQhUI4cYswOc8ijmuHD219dy13EHV2IGDewUL98G5CWPPh21pLdV3NwJrk t2HtoCvSXeJM7StqgNt9tbjiDAJhdjdSgkUfddJE25RePWaAKQv8S7ptej9yE9BhDzgHm1 i+0iuSKiUmX+lbs+hX9J8sdZjgnyVYLtw6Mz871kBBNKdVtn3Pp6fAzB+KDG2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=a6edc54ae6911d8d7621182c2c2ffa26777985ea commit a6edc54ae6911d8d7621182c2c2ffa26777985ea Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-07-21 23:38:56 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-07-21 23:45:15 +0000 sysutils/ansible: Do not replace shebangs within modules It turns out that Ansible does not like when we replace the shebang lines with a path to a Python interpreter with a trailing number (like "python3.9"). Stop replacing the shebang lines in modules directories. If it turns out to be problematic as well, we may consider introducing an indirect symlink to the versioned Python interpreter from a path like /usr/local/libexec/ansible/bin/python for example. PR: 265211 Reported by: vladimir-csp@yandex.ru --- sysutils/ansible/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile index 98d5968afc98..a3d819005cf1 100644 --- a/sysutils/ansible/Makefile +++ b/sysutils/ansible/Makefile @@ -1,5 +1,6 @@ PORTNAME= ansible DISTVERSION= 6.0.0 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -21,7 +22,12 @@ SHEBANG_FILES= ansible_collections/community/zabbix/roles/zabbix_proxy/files/ins ansible_collections/cyberark/conjur/ci/build_release \ ansible_collections/cyberark/conjur/ci/publish_to_galaxy \ ansible_collections/ovirt/ovirt/roles/disaster_recovery/files/ovirt-dr -SHEBANG_GLOB= *.py *.sh build.py.generic +# It's probably best to leave shebangs in modules untouched as they must be +# either unversioned or absent. +# See [1] and [2]. +# [1]: https://github.com/ansible/ansible/issues/78243 +# [2]: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265211 +SHEBANG_REGEX= (([^/])|(/[^m])|(/m[^o])|(/mo[^d])|(/mod[^u])|(/modu[^l])|(/modul[^e])|(/module[^s])|(/modules[^/]))*\.(py|sh|build.py.generic) python_OLD_CMD= /Users/kbreit/Documents/Programming/ansible_collections/cisco/meraki/venv/bin/python CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}}