From nobody Sat Dec 31 14:48:45 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 4NklPV2HB6z2nfv7; Sat, 31 Dec 2022 14:48:46 +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 4NklPV0gPgz4Zsq; Sat, 31 Dec 2022 14:48:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672498126; 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=BztYQPuAweU3d4qm2DNBm28YAQpcah0PgfvW6Za7jfo=; b=f9ZGxL3BTmP04eZq3uHb9A5o0S5j4hOuSbami4QGw6bP2pLUB1kfsqzq0huxQ7zrY25gkj R9AvSNPi55/Zfa78WZru/0Ei+Sq7ZU273FHZgI5JKU778gyo8w+WILo7B2NvXTh6uEDWth uL/97tZAS4Mw/24FuD3pjlKOTbS8UWWKWoR1YpIqDxeqaLlgkhC7JjBmpMnC+oKX9oZ66t EvnURZFBXqL14jSPHWVJIQ9w56x5im2kbnRhZawfocJMgxxGt22THHbgnu+v6bBHxq1pyV RrBhOW3HyR0tt4oZxLs/7mK4Uo4sd7olYPKKbpybChkXi9wtIWzhgrSRW2DCLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672498126; 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=BztYQPuAweU3d4qm2DNBm28YAQpcah0PgfvW6Za7jfo=; b=giLbutv62bSiKcy+XiNnmUxE3hvLFv/jBBCPm+yi5TwrmWjSMm+tumwl3CSJ0mPoohCIhh PSOkpMMRIEhgNSHvhkbV06DkQ7UF28mZcA7cYxd8YuA7PVuqJlZy7ba26XHyqb40Mu7Veq kOEOGmsiQzFw8avvsZB0vAsJgOcfyIGXKX1MxRvY5DpeMsSWoOhdjToSWWD+Qs3xk0z0qF cikIQzQ0Gg092YC7T3bBFrk4Nbu5g4YzIS8tub6y73Z3SEm//9hl2+Gr2VnNbS3G9mYeT1 7U07/VfNOMaGn2V3UlrlfjRvkzzWincxLPeeMurUIUFeHQ+MMafne0UhT5Im2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672498126; a=rsa-sha256; cv=none; b=fbKD4HJ9Yu+8m/HsWNkubT+0lnaJYBLLQKAoLbWRLy9SvBZm63GmLPpDT37uP9n/v7Kug3 9Jkb5mwXHA3ekcyhWPWKRIORgj5RvRDPKOTm/PMfGNuJAfFttW6InH0zXjcL0N5JrXEKIF S0Hz6hUpD9AHa8ASoOJ7zhCi1bhD+FB7eQ+qhpv8gJ6I6hhaUgaoli/AjMsAEAbIm+gtea BcS6ynU5DQG9WzsrzTUNM7MQC6ly5LHUdib+c+jq7Ju4S/NaOGggPo+pYfg8gNyjUTnw/y iEEbevoJCYaxkbkmYotDNsZ4ydssA1SFIIhOrj6QjJmSWQhx0+OD1ZeLYr1t0A== 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 4NklPT6sVRzsPN; Sat, 31 Dec 2022 14:48:45 +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 2BVEmjT2070465; Sat, 31 Dec 2022 14:48:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BVEmj59070464; Sat, 31 Dec 2022 14:48:45 GMT (envelope-from git) Date: Sat, 31 Dec 2022 14:48:45 GMT Message-Id: <202212311448.2BVEmj59070464@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 9850ae48b0ad - main - cleanup: Remove expired ports: 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: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9850ae48b0ad15a7ac6c62c2811f739ebbc80320 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=9850ae48b0ad15a7ac6c62c2811f739ebbc80320 commit 9850ae48b0ad15a7ac6c62c2811f739ebbc80320 Author: Rene Ladan AuthorDate: 2022-12-31 14:47:31 +0000 Commit: Rene Ladan CommitDate: 2022-12-31 14:47:39 +0000 cleanup: Remove expired ports: 2022-09-30 sysutils/py-ansible-core211: Depends on expired security/py-pycrypto 2022-12-31 sysutils/ansible4: Depends on expired security/py-pycrypto (via sysutils/py-ansible-core211) Also, Ansible 4 is end-of-life upstream, see e.g. - https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-community-changelogs - https://endoflife.date/ansible --- MOVED | 2 + sysutils/Makefile | 2 - sysutils/ansible4/Makefile | 55 ----------------- sysutils/ansible4/distinfo | 3 - sysutils/ansible4/pkg-descr | 2 - sysutils/py-ansible-core211/Makefile | 107 ---------------------------------- sysutils/py-ansible-core211/distinfo | 3 - sysutils/py-ansible-core211/pkg-descr | 5 -- 8 files changed, 2 insertions(+), 177 deletions(-) diff --git a/MOVED b/MOVED index fe0f662410df..b0013441c775 100644 --- a/MOVED +++ b/MOVED @@ -17740,3 +17740,5 @@ x11-toolkits/wxgtk28-contrib||2022-12-31|Has expired: Upstream support ended x11-toolkits/wxgtk28-common||2022-12-31|Has expired: Upstream support ended x11-toolkits/wxgtk28|x11-toolkits/wxgtk30|2022-12-31|Has expired: Upstream support ended, use wx 3.x www/py-txrequests|www/py-requests-futures|2022-12-31|Has expired: Use www/py-requests-futures as upstream is unmaintained since 2018 +sysutils/py-ansible-core211||2022-12-31|Has expired: Depends on expired security/py-pycrypto +sysutils/ansible4||2022-12-31|Has expired: Depends on expired security/py-pycrypto (via sysutils/py-ansible-core211) diff --git a/sysutils/Makefile b/sysutils/Makefile index 7a504502056b..65fdd0197bd7 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -45,7 +45,6 @@ SUBDIR += ansible-kld SUBDIR += ansible-sshjail SUBDIR += ansible-sysrc - SUBDIR += ansible4 SUBDIR += anvil SUBDIR += apache-mesos SUBDIR += apachetop @@ -1055,7 +1054,6 @@ SUBDIR += pxp-agent SUBDIR += py-ansible-compat SUBDIR += py-ansible-core - SUBDIR += py-ansible-core211 SUBDIR += py-ansible-lint SUBDIR += py-ansible-runner SUBDIR += py-azure-cli diff --git a/sysutils/ansible4/Makefile b/sysutils/ansible4/Makefile deleted file mode 100644 index c45ecc6d27aa..000000000000 --- a/sysutils/ansible4/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -PORTNAME= ansible -DISTVERSION= 4.10.0 -CATEGORIES= sysutils python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 4 - -MAINTAINER= 0mp@FreeBSD.org -COMMENT= Radically simple IT automation -WWW= https://www.ansible.com/ - -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= Depends on expired security/py-pycrypto (via sysutils/py-ansible-core211) -EXPIRATION_DATE=2022-12-31 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ansible-core211>0:sysutils/py-ansible-core211@${PY_FLAVOR} - -USES= ansible:env cpe python:3.6+ shebangfix -CPE_VENDOR= redhat -USE_PYTHON= autoplist concurrent distutils - -SHEBANG_FILES= ansible_collections/community/zabbix/roles/zabbix_proxy/files/install_semodule.bsx \ - ansible_collections/community/zabbix/roles/zabbix_server/files/install_semodule.bsx \ - 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 - -CONFLICTS_INSTALL= ${_ANSIBLE_PACKAGES:N${PKGBASE}} - -NO_ARCH= yes - -DO_MAKE_TEST= ansible -m ping -TEST_TARGET= localhost - -_ANSIBLE_VERSIONS= 1 2 23 24 25 26 27 28 4 -_ANSIBLE_PACKAGES= ${PYTHON_PKGNAMEPREFIX}ansible -.for version in ${_ANSIBLE_VERSIONS} -_ANSIBLE_PACKAGES+= ${PYTHON_PKGNAMEPREFIX}ansible${version} -.endfor - -post-patch: - ${FIND} ${WRKSRC} -type f -exec ${GREP} --null -El '(/etc/ansible|/usr/share/ansible)' {} + | ${XARGS} -n 500 -0 ${REINPLACE_CMD} \ - -e 's|/etc/ansible|${ETCDIR}|g' \ - -e 's|/usr/share/ansible|${DATADIR}|g' - ${FIND} ${WRKSRC} -type f -name "*.bak" -delete - -.include - -# Make sure that we override the unique DATADIR and ETCDIR set -# by the implicit USES=uniquefiles. -DATADIR= ${ANSIBLE_DATADIR} -ETCDIR= ${ANSIBLE_ETCDIR} diff --git a/sysutils/ansible4/distinfo b/sysutils/ansible4/distinfo deleted file mode 100644 index 0108429e6fdd..000000000000 --- a/sysutils/ansible4/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1643130968 -SHA256 (ansible-4.10.0.tar.gz) = 88af9479e81a3931bb3a1b8c4eeb252cd4f38c03daafd6a5aa120d6b0d70d45c -SIZE (ansible-4.10.0.tar.gz) = 36832606 diff --git a/sysutils/ansible4/pkg-descr b/sysutils/ansible4/pkg-descr deleted file mode 100644 index b8559aae1009..000000000000 --- a/sysutils/ansible4/pkg-descr +++ /dev/null @@ -1,2 +0,0 @@ -Ansible is a radically simple configuration-management, deployment, -task-execution, and multinode orchestration framework. diff --git a/sysutils/py-ansible-core211/Makefile b/sysutils/py-ansible-core211/Makefile deleted file mode 100644 index 4bec247c72f9..000000000000 --- a/sysutils/py-ansible-core211/Makefile +++ /dev/null @@ -1,107 +0,0 @@ -PORTNAME= ansible-core -DISTVERSION= 2.11.10 -CATEGORIES= sysutils python -MASTER_SITES= CHEESESHOP -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 211 - -MAINTAINER= 0mp@FreeBSD.org -COMMENT= Radically simple IT automation -WWW= https://www.ansible.com/ - -LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/COPYING - -DEPRECATED= Depends on expired security/py-pycrypto -EXPIRATION_DATE=2022-09-30 - -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}packaging>=0:devel/py-packaging@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}resolvelib05>=0.5.3<0.6:devel/py-resolvelib05@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcrypt>=0:security/py-bcrypt@${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} \ - ${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pycrypto>=0:security/py-pycrypto@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} - -USES= ansible:env cpe gmake python:3.6+ shebangfix -CPE_VENDOR= redhat -CPE_PRODUCT= ansible -USE_PYTHON= autoplist concurrent distutils - -SHEBANG_REGEX= [.]/test/.*[.]py - -TEST_ARGS= VERSION=${DISTVERSION} \ - PYTHON=${PYTHON_CMD} \ - DATE= -TEST_ENV= PYTHON_VERSION=${PYTHON_VER} -TEST_TARGET= tests - -CONFLICTS= py*-ansible-base py*-ansible-core py*-ansible2 - -NO_ARCH= yes - -PLIST_FILES= share/man/man1/ansible-config.1.gz \ - share/man/man1/ansible-console.1.gz \ - share/man/man1/ansible-doc.1.gz \ - share/man/man1/ansible-galaxy.1.gz \ - share/man/man1/ansible-inventory.1.gz \ - share/man/man1/ansible-playbook.1.gz \ - share/man/man1/ansible-pull.1.gz \ - share/man/man1/ansible-vault.1.gz \ - share/man/man1/ansible.1.gz -PORTEXAMPLES= ansible.cfg hosts - -OPTIONS_DEFINE= DOCS EXAMPLES - -post-patch: -# Preserve the original paths in -# test/units/cli/galaxy/test_execute_list_collection.py. -# Replacing /usr/share/ansible breaks tests. - ${FIND} ${WRKSRC} -not -regex '${WRKSRC}/test/units/cli/galaxy/test_execute_list_collection.py' -type f -print0 | \ - ${XARGS} -0 ${REINPLACE_CMD} \ - -e 's|/etc/ansible|${ETCDIR}|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}/share/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} {} \; -# USE_PYTHON=autoplist doesn't add this file to pkg-plist. - ${RM} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/ansible_test/_data/injector/ansible-inventory - -pre-test: -# This one file does not get its paths replaced correctly in post-patch. - ${REINPLACE_CMD} 's|"/etc"|"${ETCDIR:H}"|g' \ - ${WRKSRC}/test/units/playbook/test_helpers.py -# This test constructs a Python script inline and uses an invalid path to it. - ${REINPLACE_CMD} 's|/usr/bin/python|${PYTHON_CMD}|' \ - ${WRKSRC}/test/units/modules/test_async_wrapper.py -# Skip the SELinux tests, it's not present on FreeBSD. - ${RM} ${WRKSRC}/test/units/module_utils/basic/test_selinux.py -# Disable some failing tests. They fail to detect that emoji are of width 2 istead of 1. - ${RM} ${WRKSRC}/test/units/utils/test_display.py - -.include - -# Make sure that we override the unique DATADIR and ETCDIR set -# by the implicit USES=uniquefiles. -DATADIR= ${ANSIBLE_DATADIR} -ETCDIR= ${ANSIBLE_ETCDIR} diff --git a/sysutils/py-ansible-core211/distinfo b/sysutils/py-ansible-core211/distinfo deleted file mode 100644 index 5988c0669e15..000000000000 --- a/sysutils/py-ansible-core211/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1648646322 -SHA256 (ansible-core-2.11.10.tar.gz) = a0fba319963ff83c249bd0531b0b87d67e3ac0723f9cbf24b96790ff3774a897 -SIZE (ansible-core-2.11.10.tar.gz) = 7116288 diff --git a/sysutils/py-ansible-core211/pkg-descr b/sysutils/py-ansible-core211/pkg-descr deleted file mode 100644 index 12dcf10983b9..000000000000 --- a/sysutils/py-ansible-core211/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -Ansible is a radically simple configuration-management, deployment, -task-execution, and multinode orchestration framework. - -ansible-core contains the core engine, modules and plugins. It does not contain -community and partner supported Ansible Collections of modules and plugins.