From nobody Mon Nov 18 07:25:22 2024 X-Original-To: dev-commits-ports-all@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 4XsK0L54hgz5dyQp; Mon, 18 Nov 2024 07:25:22 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XsK0L4Z1dz52s8; Mon, 18 Nov 2024 07:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731914722; 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=Nc7pqFi3JH+NpaBbObKBsZKbaDm2+626On2aGEzhrRE=; b=cQCyhOXgV6aA3okUrost0LMDnezUJv3KVDJmfym/GlbDFCRJZ4kaH9Y4v1y6H7JWizbvmA R7Yh7FjJRLmx2qPOc+OfYPaS2WVeF15Ctm4HhminBxsnNbn3drGRf5Dr5N2zAdT4MnXdUi bUzzGP3FtK8zGyz07Akv+8ve91MZ1QR/i4IA5tyr7K6Coeb/GnqmLhZyWLkL7r5gSHt3LI Z21figxB7S3EbKGMSTbj5JVIIGrp8tZCvjv/7v1TluasXJUmwHLI3ySauc76yPgGqMfdTf 9GuIQZm3tGKn7Xhr9pf7Clb1FPBR2XPxBo0WyRpRZHZZI8uUbO9YxkYy6nZ9Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731914722; 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=Nc7pqFi3JH+NpaBbObKBsZKbaDm2+626On2aGEzhrRE=; b=XATnwozU00F/j5Yr1PK3odw6StL/sgVe/NRywljm91fo0RzrhBme5ejy8oix9CTeXH4qj7 l6d37P+9KSw02f7SpT1gCi+GO+h0iI7RXgcwMyEqdf52AG8T59Lkn7ELoIjP+OONaGeEq4 NVkukAYgdgKeMM9LDPm6qBSTJNX/RTmdDtEWtaaXlPEW511A17Z54pmcXdHQfRL730ROBH FDKSzwYu39NJF6LcK42qyh+PM1gx2cagy5SNPJJ49Rzc6ZsSik5U5y7BcCC7srKHvfZoDN fgOnhdByZisoYuRc5SXZAacK7AmSHlAXI3JtpeZmjnSAEbyb9g1MDLozORGXOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731914722; a=rsa-sha256; cv=none; b=V8UwwRSo+GpdSgHpPPYftiG+V7TpupyJimiIexAmJcyng5L5zUTqsSeyKESwK3gIhmtcUu bJ4WjRAIb/BmlW4aa5B3aYx0KWgmw6uvIkC0/lM1oJVBAYdObPf5MMhe+BsmZGCLsmCzaw 602inI+LvTQGvPc3wlP4rha1KO3QlrVd61ws9t4EUsE4NmJNahkfMizsfIDP2L023dEYeS Mmw43s1/ZZ9I+OIaUaGgCk9mXtxGX4pzuotPl+AmxsH2p1AhI53H977+PpLslg2D1KKs+K SA0Vjf3by33ikXxE74eRDbTBdVb8ZmDcojEaWHuZPeA0fue/rF2OV+AhN/cSBQ== 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 4XsK0L48wZzWRC; Mon, 18 Nov 2024 07:25:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AI7PMhP067222; Mon, 18 Nov 2024 07:25:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AI7PMDF067218; Mon, 18 Nov 2024 07:25:22 GMT (envelope-from git) Date: Mon, 18 Nov 2024 07:25:22 GMT Message-Id: <202411180725.4AI7PMDF067218@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ruslan Makhmatkhanov Subject: git: 14bfcede4d86 - main - security/nyx: fix runtime with python 3.11 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 14bfcede4d86c65fe810fb644a0f1f8449fe4703 Auto-Submitted: auto-generated The branch main has been updated by rm: URL: https://cgit.FreeBSD.org/ports/commit/?id=14bfcede4d86c65fe810fb644a0f1f8449fe4703 commit 14bfcede4d86c65fe810fb644a0f1f8449fe4703 Author: Ruslan Makhmatkhanov AuthorDate: 2024-11-18 07:22:56 +0000 Commit: Ruslan Makhmatkhanov CommitDate: 2024-11-18 07:22:56 +0000 security/nyx: fix runtime with python 3.11 switch to pep517 while here taken from upstream commit: https://github.com/torproject/nyx/commit/dcaddf2ab PR: 281337 Reported by: mdw Approved by: maintainer timeout --- security/nyx/Makefile | 6 ++++-- security/nyx/files/patch-nyx_panel_____init____.py | 11 +++++++++++ security/nyx/files/patch-test_____init____.py | 11 +++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/security/nyx/Makefile b/security/nyx/Makefile index 0ca0b04f9c8b..90d73b96862d 100644 --- a/security/nyx/Makefile +++ b/security/nyx/Makefile @@ -1,6 +1,6 @@ PORTNAME= nyx PORTVERSION= 2.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security net MASTER_SITES= PYPI @@ -11,11 +11,13 @@ WWW= https://nyx.torproject.org/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}stem>=1.7.1:security/py-stem@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} USES= python -USE_PYTHON= distutils autoplist noflavors +USE_PYTHON= autoplist noflavors pep517 NO_ARCH= yes diff --git a/security/nyx/files/patch-nyx_panel_____init____.py b/security/nyx/files/patch-nyx_panel_____init____.py new file mode 100644 index 000000000000..9588e181f369 --- /dev/null +++ b/security/nyx/files/patch-nyx_panel_____init____.py @@ -0,0 +1,11 @@ +--- nyx/panel/__init__.py.orig 2024-11-18 07:13:38 UTC ++++ nyx/panel/__init__.py +@@ -78,7 +78,7 @@ class KeyHandler(collections.namedtuple('Help', ['key' + is_match = self._key_func(key) if self._key_func else key.match(self.key) + + if is_match: +- if inspect.getargspec(self._action).args == ['key']: ++ if inspect.getfullargspec(self._action).args == ['key']: + self._action(key) + else: + self._action() diff --git a/security/nyx/files/patch-test_____init____.py b/security/nyx/files/patch-test_____init____.py new file mode 100644 index 000000000000..65fcb2a1da48 --- /dev/null +++ b/security/nyx/files/patch-test_____init____.py @@ -0,0 +1,11 @@ +--- test/__init__.py.orig 2024-11-18 07:14:15 UTC ++++ test/__init__.py +@@ -94,7 +94,7 @@ def render(func, *args, **kwargs): + nyx.curses.CURSES_SCREEN.erase() + start_time = time.time() + +- func_args = inspect.getargspec(func).args ++ func_args = inspect.getfullargspec(func).args + + if func_args[:1] == ['subwindow'] or func_args[:2] == ['self', 'subwindow']: + def _draw(subwindow):