From a93eeb85560a7cfef3a8e7aafa66216694644897 Mon Sep 17 00:00:00 2001 From: Marek Zarychta Date: Sat, 5 Apr 2025 20:24:36 +0100 Subject: [PATCH] net/py-ripe.atlas.tools: Resolve conflict with dns/c-ares All copies of the Python script ripe-atlas (atraceroute, asslcert, aping, antp, ahttp, adig) were removed. Those copies didn't provide any additional features. The same effect can be achieved by creating shell aliases referring to the ripe-atlas script. Additionally, Python 3.11 was added to the declared supported versions. Probably the upstream is not going to resolve it soon. Since the userbase is very narrow, and the removed aliases (copies of the original script) weren't useful, this change seems to be fine. PR: 285689 MFH: 2025Q2 --- net/py-ripe.atlas.tools/Makefile | 4 +--- net/py-ripe.atlas.tools/files/patch-setup.py | 23 ++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 net/py-ripe.atlas.tools/files/patch-setup.py diff --git a/net/py-ripe.atlas.tools/Makefile b/net/py-ripe.atlas.tools/Makefile index 139f777b9a27..2d57cf6a5fd3 100644 --- a/net/py-ripe.atlas.tools/Makefile +++ b/net/py-ripe.atlas.tools/Makefile @@ -1,6 +1,6 @@ PORTNAME= ripe.atlas.tools DISTVERSION= 3.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -30,8 +30,6 @@ USE_PYTHON= autoplist pep517 pytest PYTEST_IGNORED_TESTS= test_arg_radius test_html_documentation \ test_text_documentation test_basic #WIP -CONFLICTS_INSTALL= c-ares # bin/adig - NO_ARCH= yes .include diff --git a/net/py-ripe.atlas.tools/files/patch-setup.py b/net/py-ripe.atlas.tools/files/patch-setup.py new file mode 100644 index 000000000000..c7ed8a8e9dfd --- /dev/null +++ b/net/py-ripe.atlas.tools/files/patch-setup.py @@ -0,0 +1,23 @@ +--- setup.py.orig 2025-04-05 17:55:07 UTC ++++ setup.py +@@ -47,12 +47,6 @@ setup( + "fast": ["ujson"], + }, + scripts=[ +- "scripts/aping", +- "scripts/atraceroute", +- "scripts/adig", +- "scripts/asslcert", +- "scripts/ahttp", +- "scripts/antp", + "scripts/ripe-atlas", + ], + keywords=["RIPE", "RIPE NCC", "RIPE Atlas", "Command Line"], +@@ -65,6 +59,7 @@ setup( + "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ++ "Programming Language :: Python :: 3.11", + "Topic :: Internet :: WWW/HTTP", + ], + )