From nobody Sun Apr 30 09:20:50 2023 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 4Q8LRk3QCPz46YZg; Sun, 30 Apr 2023 09:20:50 +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 4Q8LRk2wssz414R; Sun, 30 Apr 2023 09:20:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682846450; 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=u1+rLHJClBJ2PoJqN4AbymnW4/zSa2Irh6k06a3UO6s=; b=dp/u7bNHOJuPCq+kIRGK+/Corcv+NKDQEPTlhrbvbC19USIQwrLTx+bE9vUP0ERywAofbZ sGS8bt+BK3hi0YYXM647dUCruXDqdUbBTqApTe1O7IhNUmj7GvTZcj7IPb7HWy6+fYcBnH u3rCACsDravxl+Yy8WT42G/WBRSVGIp5Pi3XNBTRpW27yNWXyDJsykRION9IuOxTO+v4qL vYRqBgV3iIZ1w0I/ePs2RcA8PmAUpEXJZjx8udBPZUj7ER28AReLxuot5sLMsz32btS2vt Mc2QPHfjLW07AQP54kWwFgMY0Bbd4yNDz6fwb1jnf1XjPOFs9RyKvpq7ebjgyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682846450; 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=u1+rLHJClBJ2PoJqN4AbymnW4/zSa2Irh6k06a3UO6s=; b=Mym5HsRsAQnJLS7/BvGplmK7YWflOP0r2U2gznfjVU1mKL04rwr3rUopv9TReF49rWd79U mRJlPh+JJApeoqSTl7Sef/+KjIP51okqz1n8VW7cF3k2EGZ58ftP9eyKed8XAvGD8t+QOK 0Oz37wj7KL1anpb4WUJcDi58HJHsmqGbVIixFjaXhVwjskjlXluYV8KdTRFW9oHz3qw8zw zRg6DGsAqFQTUUH64/7a96f8rJR6vldX4eAhHAD0yfgJn5Ausgh/DUCvvSy8jCWqvB7RFm e6SbntlkVh9HtG5S3/Qv3XJOnGCziyNglWznyOJvDlgE8rrwzKudieBInhKyFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682846450; a=rsa-sha256; cv=none; b=KOWedFOyn+phGahbmriZOEVrkCgj3NIG42xTgu2NDu1Jc6b0WXTRdPx2XPFZKE2SnKGz9P rRZasdr2g7LreO98zR9zStz2vZvxyUFNsG9lFc1O1fVfAqpHwqCug+YCMDKz3MMN/pMMod JgIfb9731uG2tF/Uii7jQEc+463xfD/vAAB94x7aMNsmptnrOEurMrjd+uTjyBv4aJOmAN 7+0HXCT/wVYY8qTahn5nDQFGEORgsiR1WFlQwK+bcDbpE4edtwo5ICpYjltwoN8n0JO3Dh UycSPZtpAMnCF+JkNJwK1B/DqAj4YuNRtNOQg9WWt8u6tAl/WYFqb3zUlX48/Q== 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 4Q8LRk20b7zHj2; Sun, 30 Apr 2023 09:20:50 +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 33U9Kofc012328; Sun, 30 Apr 2023 09:20:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33U9KoKj012327; Sun, 30 Apr 2023 09:20:50 GMT (envelope-from git) Date: Sun, 30 Apr 2023 09:20:50 GMT Message-Id: <202304300920.33U9KoKj012327@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: 51cb92c46a23 - main - sysutils/py-psutil121/: Remove expired port: 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: 51cb92c46a23a267b842fbf6bd4637af192fe1df Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=51cb92c46a23a267b842fbf6bd4637af192fe1df commit 51cb92c46a23a267b842fbf6bd4637af192fe1df Author: Rene Ladan AuthorDate: 2023-04-30 09:20:41 +0000 Commit: Rene Ladan CommitDate: 2023-04-30 09:20:41 +0000 sysutils/py-psutil121/: Remove expired port: 2023-04-30 sysutils/py-psutil121: Use sysutils/py-psutil instead --- MOVED | 1 + sysutils/Makefile | 1 - sysutils/py-psutil121/Makefile | 25 ------------- sysutils/py-psutil121/distinfo | 2 - sysutils/py-psutil121/files/patch-_psutil_bsd.c | 50 ------------------------- sysutils/py-psutil121/pkg-descr | 4 -- 6 files changed, 1 insertion(+), 82 deletions(-) diff --git a/MOVED b/MOVED index c0af11587aec..97616f81b9c1 100644 --- a/MOVED +++ b/MOVED @@ -17912,3 +17912,4 @@ devel/datovka|mail/datovka|2023-04-25|Move port to proper category benchmarks/super-smack||2023-04-30|Has expired: Unfetchable www/moodle39||2023-04-30|Has expired: Requires php74 which has been removed from the tree sysutils/u-boot-utilite||2023-04-30|Has expired: This port depends on the long time unsupported upstream devel/arm-none-eabi-gcc492 +sysutils/py-psutil121|sysutils/py-psutil|2023-04-30|Has expired: Use sysutils/py-psutil instead diff --git a/sysutils/Makefile b/sysutils/Makefile index feba6178c154..99cd9edd1339 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -1119,7 +1119,6 @@ SUBDIR += py-power SUBDIR += py-prometheus-zfs SUBDIR += py-psutil - SUBDIR += py-psutil121 SUBDIR += py-ptyprocess SUBDIR += py-puremagic SUBDIR += py-py-cpuinfo diff --git a/sysutils/py-psutil121/Makefile b/sysutils/py-psutil121/Makefile deleted file mode 100644 index 081c81d58c9a..000000000000 --- a/sysutils/py-psutil121/Makefile +++ /dev/null @@ -1,25 +0,0 @@ -PORTNAME= psutil -PORTVERSION= 1.2.1 -PORTREVISION= 2 -CATEGORIES= sysutils python -MASTER_SITES= PYPI -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 121 - -MAINTAINER= bofh@FreeBSD.org -COMMENT= Process utilities module for Python -WWW= https://pypi.org/project/psutil/ - -LICENSE= BSD3CLAUSE - -DEPRECATED= Use sysutils/py-psutil instead -EXPIRATION_DATE=2023-04-30 - -CONFLICTS_INSTALL= ${PYTHON_PKGNAMEPREFIX}psutil - -PORTSCOUT= limit:^1\.2\. - -USES= python:3.6+ -USE_PYTHON= distutils autoplist - -.include diff --git a/sysutils/py-psutil121/distinfo b/sysutils/py-psutil121/distinfo deleted file mode 100644 index fe98f49a52db..000000000000 --- a/sysutils/py-psutil121/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (psutil-1.2.1.tar.gz) = 508e4a44c8253a386a0f86d9c9bd4a1b4cbb2f94e88d49a19c1513653ca66c45 -SIZE (psutil-1.2.1.tar.gz) = 167397 diff --git a/sysutils/py-psutil121/files/patch-_psutil_bsd.c b/sysutils/py-psutil121/files/patch-_psutil_bsd.c deleted file mode 100644 index 7ecc305d6f03..000000000000 --- a/sysutils/py-psutil121/files/patch-_psutil_bsd.c +++ /dev/null @@ -1,50 +0,0 @@ ---- psutil/_psutil_bsd.c.orig 2017-03-21 00:39:17.505652000 -0700 -+++ psutil/_psutil_bsd.c 2017-03-21 00:41:20.821739000 -0700 -@@ -917,11 +917,19 @@ - psutil_sockaddr_addrlen(family)) == 0); - } - -+#if __FreeBSD_version >= 1200026 -+static struct xtcpcb * -+psutil_search_tcplist(char *buf, struct kinfo_file *kif) -+{ -+ struct xtcpcb *tp; -+ struct xinpcb *inp; -+#else - static struct tcpcb * - psutil_search_tcplist(char *buf, struct kinfo_file *kif) - { - struct tcpcb *tp; - struct inpcb *inp; -+#endif - struct xinpgen *xig, *oxig; - struct xsocket *so; - -@@ -929,9 +937,15 @@ - for (xig = (struct xinpgen *)((char *)xig + xig->xig_len); - xig->xig_len > sizeof(struct xinpgen); - xig = (struct xinpgen *)((char *)xig + xig->xig_len)) { -+#if __FreeBSD_version >= 1200026 -+ tp = (struct xtcpcb *)xig; -+ inp = &tp->xt_inp; -+ so = &inp->xi_socket; -+#else - tp = &((struct xtcpcb *)xig)->xt_tp; - inp = &((struct xtcpcb *)xig)->xt_inp; - so = &((struct xtcpcb *)xig)->xt_socket; -+#endif - - if (so->so_type != kif->kf_sock_type || - so->xso_family != kif->kf_sock_domain || -@@ -976,7 +990,11 @@ - struct kinfo_file *kif; - struct kinfo_proc kipp; - char *tcplist = NULL; -+#if __FreeBSD_version >= 1200026 -+ struct xtcpcb *tcp; -+#else - struct tcpcb *tcp; -+#endif - - PyObject *retList = PyList_New(0); - PyObject *tuple = NULL; diff --git a/sysutils/py-psutil121/pkg-descr b/sysutils/py-psutil121/pkg-descr deleted file mode 100644 index 8ac55c868838..000000000000 --- a/sysutils/py-psutil121/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -psutil is a module providing an interface for retrieving information -on running processes and system utilization (CPU, memory) in a portable -way by using Python, implementing many functionalities offered by tools -like ps, top and Windows task manager.