summaryrefslogtreecommitdiff
path: root/app-admin/procinfo
diff options
context:
space:
mode:
Diffstat (limited to 'app-admin/procinfo')
-rw-r--r--app-admin/procinfo/Manifest7
-rw-r--r--app-admin/procinfo/files/cpu-usage-fix.patch31
-rw-r--r--app-admin/procinfo/files/kernel-2.6.patch296
-rw-r--r--app-admin/procinfo/files/procinfo-18-stat.patch21
-rw-r--r--app-admin/procinfo/files/procinfo-flags.patch16
-rw-r--r--app-admin/procinfo/metadata.xml5
-rw-r--r--app-admin/procinfo/procinfo-18-r2.ebuild38
7 files changed, 0 insertions, 414 deletions
diff --git a/app-admin/procinfo/Manifest b/app-admin/procinfo/Manifest
deleted file mode 100644
index e0f7baa1cc81..000000000000
--- a/app-admin/procinfo/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX cpu-usage-fix.patch 791 BLAKE2B 1928875ea3e73dc7cdb804f57485b474d554b343a73901b717301d9e27912937d17b30dea9050b10db9d9c4b378d431792c01201856d8b253f4000de769255a2 SHA512 48b8bae8a8f117edd60dbb43172768bdbf8c8c0f718739ab1957afbecab323255de48504298ae2c03e3c52fac86dc47cd6bd44cd5c48d1f450404268833fd090
-AUX kernel-2.6.patch 9954 BLAKE2B 26c886b77d3eef12da4728191330a29bb7834d371a177f243f638379b54b96b2ce59b7ac1bcdf0bc2bc2fb236e1e5a776bf24a4adbf211f414675fe1f4b4199e SHA512 4c5ee12f199bb24459c1a41a927343bf4c1503229f8522c36ed07df7ec953331346e1271e5ac9bd1ad2d0a5efa5dfdc0276da40d68185655e1a5a96f4b8c0cff
-AUX procinfo-18-stat.patch 778 BLAKE2B cfe86d478607ea97f9110d5864e8ab053a1496d1f78471cabca6c45172a52bde8985379cdf69c8118c683ca2d8ba9c9f9d75766fcbcc1248328bd49456b3f59c SHA512 d9672780ca78976e84cddd80469553b1d5dcbb8c361ec4e2c6229e608a6a309293ced9ac41ee55b609ce7c8b4019571e406bda5228c2277e0e1ff7553ba700da
-AUX procinfo-flags.patch 373 BLAKE2B c8c4d62c88cbfd30a1c6844e7534a33c8fe4bd3fb0b743b2e5abe1190e34263e690ddd29263dc705437177a73afc26057074985c4fc099962f7e8089bfc3b42a SHA512 00ee615dc6156a5c162237abcfaec7596dd358e534c68208b39d1f2487d73e10cde77bf3ead8650d18cce640f2a5381eb13078c87e6525ce8d2448beba1454c1
-DIST procinfo-18.tar.gz 24365 BLAKE2B 7da2f2afe014dc5b991244c0f2eff631db87ed00942a38dcbd1f5080df0bc7c2fb30fd5c7af14a180dfc2ce0562b2a26633451e0a3a17a577cd15a5f281f0118 SHA512 12c4d7983f5d6531be6d4df39f5f1e1ee2ea2394a6eb8fb8df0573f0085499e4b7d43355bfa549a24ddf1ecb09bbfa7b038cef9c483620c74ad5cedc219e35fa
-EBUILD procinfo-18-r2.ebuild 836 BLAKE2B 02275d37224802d4c08ffbe6a85b8d2de710d0b912b5b918f36f4009151a91ebb60253ab796f97b828c6bee202076cba4b655967e1646a989955dfd6bdce80a4 SHA512 f91367e56f4b3191eff3050a3e4b388eca8bc65d070c5592821b22ca7fea6fdb53dbbeb912a5ebf7b3091d1ea66950b62f3c5777318c4f8df7ee37f50a843d91
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-admin/procinfo/files/cpu-usage-fix.patch b/app-admin/procinfo/files/cpu-usage-fix.patch
deleted file mode 100644
index f2bace1bd2cc..000000000000
--- a/app-admin/procinfo/files/cpu-usage-fix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- procinfo.c~ 2005-01-31 20:52:29.250918264 +0200
-+++ procinfo-18/procinfo.c 2005-01-31 20:48:55.907351416 +0200
-@@ -402,26 +402,8 @@
- }
-
- elapsed = new.uptime;
--
--/* XXX Is this stuff still relevant/true? */
--
--#ifdef __i386__ /* IRQ 0 is timer tick on i386's... */
-- if (nr_irqs) {
-- if (fs && old.uptime)
-- elapsed = DIFF (intr[0]);
-- } else
--#endif
--#ifdef __sparc__ /* IRQ 10 is timer tick on sparc's... */
-- if (nr_irqs) {
-- if (fs && old.uptime)
-- elapsed = DIFF (intr[10]);
-- } else
--#endif
-- {
-- /* This won't be exact... */
-- if (fs && old.uptime)
-- elapsed = DIFF (uptime);
-- }
-+ if (fs && old.uptime)
-+ elapsed = DIFF (uptime);
-
- printf ("user : %s %s",
- hms (bDIFF (cpu_user)), perc (bDIFF (cpu_user), elapsed, nr_cpus));
diff --git a/app-admin/procinfo/files/kernel-2.6.patch b/app-admin/procinfo/files/kernel-2.6.patch
deleted file mode 100644
index b1eef39e3088..000000000000
--- a/app-admin/procinfo/files/kernel-2.6.patch
+++ /dev/null
@@ -1,296 +0,0 @@
-diff -ruN procinfo-18/procinfo.c procinfo-19/procinfo.c
---- procinfo-18/procinfo.c 2001-02-25 11:29:16.000000000 +0000
-+++ procinfo-19/procinfo.c 2004-06-17 10:28:33.767925439 +0100
-@@ -5,9 +5,10 @@
- Displays general info from /proc.
-
- Date: 1995-07-08 05:30:34
-- Last Change: 2001-02-25 00:27:21
-+ Last Change: 2004-06-17 11:28:13
-
- Copyright (c) 1994-2001 svm@kozmix.cistron.nl
-+ Copyright (c) 2004 procinfo@meisel.cc (upgrades for 2.6 kernel)
-
- This software is released under the GNU Public Licence. See the file
- `COPYING' for details. Since you're probably running Linux I'm sure
-@@ -26,6 +27,7 @@
- #include <string.h>
- #include <termios.h>
- #include <termcap.h>
-+#include <ctype.h>
- #include <time.h>
- #include <unistd.h>
- #include <sys/param.h> /* for HZ -- should be in <time.h> ? */
-@@ -72,9 +74,9 @@
- int nr_irqs = 0;
- int nr_cpus = 0;
-
--FILE *loadavgfp, *meminfofp, *modulesfp, *statfp, *uptimefp,
-+FILE *loadavgfp, *meminfofp, *modulesfp, *statfp, *uptimefp, *diskstatsfp,
- *devicesfp, *filesystemsfp, *interruptsfp, *dmafp, *cmdlinefp,
-- *versionfp, *cpuinfofp;
-+ *versionfp, *cpuinfofp, *vmstatfp;
-
- char line[1024], cmdline[1024], booted[40], *version = NULL, *message = NULL;
-
-@@ -89,9 +91,13 @@
- {
- unsigned long elapsed;
- char loadavg[32];
-- int i;
-+ int i, havetwosix = 0, lastdisk;
- static int have_m_c = -1; /* Do we have cache info? */
- static int have_m_l = -1; /* Do we have new-style-one-datum-per-line? */
-+ char devicename[10];
-+ char *last;
-+ unsigned int q,w,a,s,d,f,g,h,j,k,l,y,x;
-+ int disk_counter = 0, ret;
-
-
- /**** /proc/uptime ****/
-@@ -237,6 +243,50 @@
-
- printf ("Bootup: %s Load average: %s\n\n", booted, loadavg);
-
-+/**** /proc/vmstat ... 2.6.x kernel only ****/
-+ if (vmstatfp) {
-+ havetwosix = 1;
-+ fseek (vmstatfp, 0L, SEEK_SET);
-+ while (fgets (line, sizeof (line), vmstatfp)) {
-+ char *type = strtok (line, " ");
-+ if (ISSTR ("pgpgin")) {
-+ new.pgin = VAL;
-+ } else if (ISSTR ("pgpgout")) {
-+ new.pgout = VAL;
-+ } else if (ISSTR ("pgactivate")) {
-+ new.pgac = VAL;
-+ } else if (ISSTR ("pgdeactivate")) {
-+ new.pgdeac = VAL;
-+ } else if (ISSTR ("pgfault")) {
-+ new.pgfault = VAL;
-+ } else if (ISSTR ("pswpin")) {
-+ new.swin = VAL;
-+ } else if (ISSTR ("pswpout")) {
-+ new.swout = VAL;
-+ }
-+ }
-+ }
-+
-+/**** /proc/diskstats ... 2.6.x kernel only ****/
-+ if (diskstatsfp) {
-+ havetwosix = 1;
-+ fseek (diskstatsfp, 0L, SEEK_SET);
-+ while (fgets (line, sizeof (line), diskstatsfp)) {
-+ char *type = strtok (line, "\n");
-+ ret = sscanf (type, "%d%d%s%d%d%d%d%d%d%d%d%d%d%d", &q, &w, devicename, &a, &s, &d, &f, &g, &h, &j, &k, &l, &y, &x);
-+ if (ret != 14) /* Everything with less than 14 elements is not a disk device */
-+ continue;
-+ last = devicename+strlen(devicename)-1;
-+ if (isalpha(*last)) {/* Is the last char is a number ignore it .. like fd0 */
-+ if (++disk_counter > 7) /* 7 disks is all we have room for */
-+ continue;
-+ else {
-+ new.disk_r[disk_counter-1] = a;
-+ new.disk_w[disk_counter-1] = g;
-+ }
-+ }
-+ }
-+ }
-
- /**** /proc/stat ****/
-
-@@ -249,6 +299,9 @@
- new.cpu_nice = VAL;
- new.cpu_sys = VAL;
- new.cpu_idle = VAL;
-+ new.cpu_iowait = VAL;
-+ new.cpu_hirq = VAL;
-+ new.cpu_sirq = VAL;
- /*
- * according to bug #1959, sometimes the cpu_idle
- * seems to go backwards(!) on SMP boxes. This may
-@@ -262,34 +315,54 @@
- new.disk[1] = VAL;
- new.disk[2] = VAL;
- new.disk[3] = VAL;
-+ new.disk[4] = VAL;
-+ new.disk[5] = VAL;
-+ new.disk[6] = VAL;
- } else if (ISSTR ("disk_rio") && io_or_blk == 0) {
- new.disk_r[0] = VAL;
- new.disk_r[1] = VAL;
- new.disk_r[2] = VAL;
- new.disk_r[3] = VAL;
-+ new.disk_r[4] = VAL;
-+ new.disk_r[5] = VAL;
-+ new.disk_r[6] = VAL;
-+ } else if (ISSTR ("disk_wio") && io_or_blk == 0) {
-+ new.disk_w[0] = VAL;
-+ } else if (ISSTR ("disk_wio") && io_or_blk == 0) {
-+ new.disk_w[0] = VAL;
-+ } else if (ISSTR ("disk_wio") && io_or_blk == 0) {
-+ new.disk_w[0] = VAL;
- } else if (ISSTR ("disk_wio") && io_or_blk == 0) {
- new.disk_w[0] = VAL;
- new.disk_w[1] = VAL;
- new.disk_w[2] = VAL;
- new.disk_w[3] = VAL;
-+ new.disk_w[4] = VAL;
-+ new.disk_w[5] = VAL;
-+ new.disk_w[6] = VAL;
- } else if (ISSTR ("disk_rblk") && io_or_blk == 1) {
- new.disk_r[0] = VAL;
- new.disk_r[1] = VAL;
- new.disk_r[2] = VAL;
- new.disk_r[3] = VAL;
-+ new.disk_r[4] = VAL;
-+ new.disk_r[5] = VAL;
-+ new.disk_r[6] = VAL;
- } else if (ISSTR ("disk_wblk") && io_or_blk == 1) {
- new.disk_w[0] = VAL;
- new.disk_w[1] = VAL;
- new.disk_w[2] = VAL;
- new.disk_w[3] = VAL;
-+ new.disk_w[4] = VAL;
-+ new.disk_w[5] = VAL;
-+ new.disk_w[6] = VAL;
- } else if (ISSTR ("disk_io:")) {
-- int disk_counter = 0, ret;
- unsigned int q, w, e, r, t, y, u; /* I'm NOT in the mood today. */
- char *barf;
-
- while ((barf = strtok (NULL, " "))) {
-
-- if (++disk_counter > 4) /* 4 is all we have room for */
-+ if (++disk_counter > 7) /* 7 is all we have room for */
- continue;
-
- ret = sscanf (barf, "(%d,%d):(%d,%d,%d,%d,%d)",
-@@ -374,7 +447,10 @@
-
- printf ("system: %s %s",
- hms (bDIFF (cpu_sys)), perc (bDIFF (cpu_sys), elapsed, nr_cpus));
-- printf (" swap in :%9lu", bDIFF (swin));
-+ if (havetwosix)
-+ printf (" page act:%9lu", bDIFF (pgac));
-+ else
-+ printf (" swap in :%9lu", bDIFF (swin));
- if (new.disk_r[2])
- printf (" disk 3: %8lur%8luw\n", bDIFF (disk_r[2]),
- bDIFF (disk_w[2]));
-@@ -383,14 +459,53 @@
- else
- putchar ('\n');
-
-+ if (havetwosix) {
-+ printf ("IOwait: %s %s",
-+ hms (bDIFF (cpu_iowait)), perc (bDIFF (cpu_iowait), elapsed, nr_cpus));
-+ printf (" page dea:%9lu", bDIFF (pgdeac));
-+ if (new.disk_r[3])
-+ printf (" disk 4: %8lur%8luw\n", bDIFF (disk_r[3]),
-+ bDIFF (disk_w[3]));
-+ else if (new.disk[3])
-+ printf (" disk 4: %8lu\n", bDIFF (disk[3]));
-+ else
-+ putchar ('\n');
-+
-+ printf ("hw irq: %s %s",
-+ hms (bDIFF (cpu_hirq)), perc (bDIFF (cpu_hirq), elapsed, nr_cpus));
-+ printf (" page flt:%9lu", bDIFF (pgfault));
-+ if (new.disk_r[4])
-+ printf (" disk 5: %8lur%8luw\n", bDIFF (disk_r[4]),
-+ bDIFF (disk_w[4]));
-+ else if (new.disk[4])
-+ printf (" disk 5: %8lu\n", bDIFF (disk[4]));
-+ else
-+ putchar ('\n');
-+
-+ printf ("sw irq: %s %s",
-+ hms (bDIFF (cpu_sirq)), perc (bDIFF (cpu_sirq), elapsed, nr_cpus));
-+ printf (" swap in :%9lu", bDIFF (swin));
-+ if (new.disk_r[5])
-+ printf (" disk 6: %8lur%8luw\n", bDIFF (disk_r[5]),
-+ bDIFF (disk_w[5]));
-+ else if (new.disk[5])
-+ printf (" disk 6: %8lu\n", bDIFF (disk[5]));
-+ else
-+ putchar ('\n');
-+ }
-+
- printf ("idle : %s %s",
- hms (bDIFF (cpu_idle)), perc (bDIFF (cpu_idle), elapsed, nr_cpus));
- printf (" swap out:%9lu", bDIFF (swout));
-- if (new.disk_r[3])
-- printf (" disk 4: %8lur%8luw\n", bDIFF (disk_r[3]),
-- bDIFF (disk_w[3]));
-- else if (new.disk[3])
-- printf (" disk 4: %8lu\n", bDIFF (disk[3]));
-+ if (havetwosix)
-+ lastdisk = 3;
-+ else
-+ lastdisk = 6;
-+ if (new.disk_r[lastdisk])
-+ printf (" disk %d: %8lur%8luw\n", lastdisk+1, bDIFF (disk_r[lastdisk]),
-+ bDIFF (disk_w[lastdisk]));
-+ else if (new.disk[lastdisk])
-+ printf (" disk %d: %8lu\n", lastdisk+1, bDIFF (disk[lastdisk]));
- else
- putchar ('\n');
-
-@@ -786,6 +901,8 @@
- meminfofp = myfopen (PROC_DIR "meminfo");
- statfp = myfopen (PROC_DIR "stat");
- /* These may be missing, so check for NULL later. */
-+ diskstatsfp = fopen (PROC_DIR "diskstats", "r");
-+ vmstatfp = fopen (PROC_DIR "vmstat", "r");
- modulesfp = fopen (PROC_DIR "modules", "r");
- devicesfp = fopen (PROC_DIR "devices", "r");
- filesystemsfp = fopen (PROC_DIR "filesystems", "r");
-@@ -990,6 +1107,9 @@
- new.disk_r[1] = new.disk_w[1] =
- new.disk_r[2] = new.disk_w[2] =
- new.disk_r[3] = new.disk_w[3] = 0;
-+ new.disk_r[4] = new.disk_w[4] = 0;
-+ new.disk_r[5] = new.disk_w[5] = 0;
-+ new.disk_r[6] = new.disk_w[6] = 0;
- redrawn = 1;
- message = io_or_blk ? "showing I/O in blocks" :
- "showing I/O per requests";
-diff -ruN procinfo-18/procinfo.h procinfo-19/procinfo.h
---- procinfo-18/procinfo.h 2001-02-24 23:30:45.000000000 +0000
-+++ procinfo-19/procinfo.h 2004-06-17 09:24:16.511726412 +0100
-@@ -81,11 +81,11 @@
- unsigned long uptime;
- long m_to, m_us, m_fr, m_sh, m_bu, m_ca;
- long s_to, s_us, s_fr;
-- unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle;
-- unsigned long disk[5];
-- unsigned long disk_r[5];
-- unsigned long disk_w[5];
-- unsigned long pgin, pgout, swin, swout;
-+ unsigned long cpu_user, cpu_nice, cpu_sys, cpu_idle, cpu_iowait, cpu_hirq, cpu_sirq;
-+ unsigned long disk[8];
-+ unsigned long disk_r[8];
-+ unsigned long disk_w[8];
-+ unsigned long pgin, pgout, pgac, pgdeac, pgfault, swin, swout;
- unsigned long *intr; /* Phew. That's better. */
- unsigned long old_intr;
- unsigned long ctxt;
-diff -ruN procinfo-18/routines.c procinfo-19/routines.c
---- procinfo-18/routines.c 2001-02-24 23:30:45.000000000 +0000
-+++ procinfo-19/routines.c 2004-06-16 16:36:51.000000000 +0100
-@@ -388,9 +388,13 @@
- hms (unsigned long t)
- {
- unsigned int d, h, m, s;
-+ unsigned long q;
- static char buf[22];
-
-- t = t * 100 / HZ;
-+ q = 100 / HZ; /* We need this because the libc does something funny here */
-+ /* if we try to use: t = t * 100 / HZ; here! */
-+ /* procinfo@meisel.cc 11. Feb. 2004 */
-+ t = t * q;
- d = (int) (t / 8640000);
- t = t - (long) (d * 8640000);
- h = (int) (t / 360000);
diff --git a/app-admin/procinfo/files/procinfo-18-stat.patch b/app-admin/procinfo/files/procinfo-18-stat.patch
deleted file mode 100644
index d7dc4a458b28..000000000000
--- a/app-admin/procinfo/files/procinfo-18-stat.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur procinfo-18/procinfo.c procinfo-18-mod/procinfo.c
---- procinfo-18/procinfo.c 2001-02-25 11:29:16.000000000 +0000
-+++ procinfo-18-mod/procinfo.c 2008-04-16 10:16:29.000000000 +0100
-@@ -76,7 +76,7 @@
- *devicesfp, *filesystemsfp, *interruptsfp, *dmafp, *cmdlinefp,
- *versionfp, *cpuinfofp;
-
--char line[1024], cmdline[1024], booted[40], *version = NULL, *message = NULL;
-+char line[4096], cmdline[1024], booted[40], *version = NULL, *message = NULL;
-
- float rate = 1.0; /* per interval or per sec */
-
-@@ -446,7 +446,7 @@
- */
- char *q;
-
-- if ((q = strstr (p, "PIC"))) {
-+ if ((q = strstr (p, "PIC")) || (q = strstr (p, "MSI"))) {
- while (*q != ' ') /* eat up "PIC" or "PIC-foo" */
- q++;
- while (*q == ' ') /* eat up spaces */
diff --git a/app-admin/procinfo/files/procinfo-flags.patch b/app-admin/procinfo/files/procinfo-flags.patch
deleted file mode 100644
index e254c254e1a9..000000000000
--- a/app-admin/procinfo/files/procinfo-flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- procinfo-18/Makefile.orig 2001-02-25 00:29:53.000000000 +0100
-+++ procinfo-18/Makefile 2006-10-21 13:57:47.000000000 +0200
-@@ -2,10 +2,10 @@
-
- prefix=/usr
-
--CC = gcc -Wall -Wstrict-prototypes
-+CC +=
-
--CFLAGS = -O2
--LDFLAGS = -s
-+CFLAGS += -Wall -Wstrict-prototypes
-+LDFLAGS +=
-
- # If you get lots of `undefined references', you probably need -lncurses
- # instead:
diff --git a/app-admin/procinfo/metadata.xml b/app-admin/procinfo/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/app-admin/procinfo/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/app-admin/procinfo/procinfo-18-r2.ebuild b/app-admin/procinfo/procinfo-18-r2.ebuild
deleted file mode 100644
index 33a1d8dc6daa..000000000000
--- a/app-admin/procinfo/procinfo-18-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Displays some kernel stats and info on a running Linux system"
-HOMEPAGE="http://www.kozmix.org/src/"
-SRC_URI="http://www.kozmix.org/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/kernel-2.6.patch
- epatch "${FILESDIR}"/cpu-usage-fix.patch
- epatch "${FILESDIR}"/${PN}-flags.patch
- epatch "${FILESDIR}"/${P}-stat.patch
-}
-
-src_compile() {
- emake \
- CC=$(tc-getCC) \
- LDLIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install() {
- dobin procinfo
- newbin lsdev.pl lsdev
- newbin socklist.pl socklist
-
- doman *.8
- dodoc README CHANGES
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-10 02:43:22 +0000