[gentoo-commits] repo/gentoo:master commit in: sys-process/unixtop/
commit: c593876424cdbb13cb5596804a0e5dc6513ce02b
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Jun 19 12:24:20 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Tue Jul 4 22:18:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5938764
sys-process/unixtop: use https
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
index cbdbb531ceac..0f1fe94dea03 100644
--- a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
+++ b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
inherit autotools
DESCRIPTION="top for UNIX systems"
-HOMEPAGE="http://unixtop.sourceforge.net/;
+HOMEPAGE="https://unixtop.sourceforge.net/;
SRC_URI="mirror://sourceforge/unixtop/top-${PV/_/}.tar.bz2"
LICENSE="BSD"
[gentoo-commits] repo/gentoo:master commit in: sys-process/unixtop/, sys-process/unixtop/files/
commit: ed270e4a02b2450c9e18d01710baa7860478f1cc
Author: Fabian Groffen gentoo org>
AuthorDate: Sat May 30 10:12:53 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat May 30 10:13:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed270e4a
sys-process/unixtop-3.8_beta1-r3: fix compilation on Linux #726052
Albeit not really keyworded, fix compilation on Linux, and add some
other fixes too:
- block sys-process/procps for conflicting /usr/bin/top
- add resize crash patch
- add patch to allow compilation on Linux
- fix curses patch to work with ncurses[tinfo]
Closes: https://bugs.gentoo.org/726052
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen gentoo.org>
.../unixtop/files/unixtop-3.8_beta1-ncurses.patch | 3 ++-
.../files/unixtop-3.8_beta1-recent-linux.patch | 13 +
.../files/unixtop-3.8_beta1-winch-segfault.patch | 31 ++
sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild| 7 +++--
4 files changed, 51 insertions(+), 3 deletions(-)
diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch
b/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch
index a2da4b47da6..476093c7e56 100644
--- a/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch
+++ b/sys-process/unixtop/files/unixtop-3.8_beta1-ncurses.patch
@@ -1,5 +1,6 @@
* check ncurses first, such that we only link agains (system) termcap if
necessary (never the case in prefix) -- grob...@gentoo.org
+* check tinfo in case of ncurses[tinfo] -- j...@gentoo.org
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +9,7 @@
# -lmld -lmach
AC_CHECK_LIB(mach, vm_statistics)
-AC_SEARCH_LIBS(tgetent, termcap curses ncurses)
-+AC_SEARCH_LIBS(tgetent, ncurses curses termcap)
++AC_SEARCH_LIBS(tgetent, ncurses tinfo curses termcap)
AC_CHECK_LIB(m, exp)
# check for libraries required by extension
diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-recent-linux.patch
b/sys-process/unixtop/files/unixtop-3.8_beta1-recent-linux.patch
new file mode 100644
index 000..f3777dacb80
--- /dev/null
+++ b/sys-process/unixtop/files/unixtop-3.8_beta1-recent-linux.patch
@@ -0,0 +1,13 @@
+grab PAGE_SHIFT from a location where it is defined nowadays
+
+--- a/machine/m_linux.c
b/machine/m_linux.c
+@@ -68,7 +68,7 @@
+ #include
+
+ #include /* for HZ */
+-#include /* for PAGE_SHIFT */
++#include /* for PAGE_SHIFT */
+
+ #if 0
+ #include /* for PROC_SUPER_MAGIC */
diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-winch-segfault.patch
b/sys-process/unixtop/files/unixtop-3.8_beta1-winch-segfault.patch
new file mode 100644
index 000..e00e4052eb4
--- /dev/null
+++ b/sys-process/unixtop/files/unixtop-3.8_beta1-winch-segfault.patch
@@ -0,0 +1,31 @@
+https://sourceforge.net/p/unixtop/patches/22/
+
+diff -u top-3.8beta1/top.c top-3.8beta1-rivoreo-r1/top.c
+--- top-3.8beta1/top.c 2008-05-07 11:41:39.0 +0800
top-3.8beta1-rivoreo-r1/top.c 2017-01-15 18:32:50.0 +0800
+@@ -257,14 +258,14 @@
+ }
+
+ void
+-set_signals()
++set_signals(int set_winch)
+
+ {
+ (void) set_signal(SIGINT, sig_leave);
+ (void) set_signal(SIGQUIT, sig_leave);
+ (void) set_signal(SIGTSTP, sig_tstop);
+ #ifdef SIGWINCH
+-(void) set_signal(SIGWINCH, sig_winch);
++if(set_winch) set_signal(SIGWINCH, sig_winch);
+ #endif
+ }
+
+@@ -905,7 +906,7 @@
+ screen_init();
+
+ /* set the signal handlers */
+-set_signals();
++set_signals(gstate->interactive);
+
+ /* longjmp re-entry point */
+ /* set the jump buffer for long jumps out of signal handlers */
diff --git a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
index c4f9598cf00..c4ee3dd4748 100644
--- a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
+++ b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,8 @@ KEYWORDS="~amd64-linux ~sparc-solaris ~sparc64-solaris
~x64-solaris ~x86-solaris
IUSE=""
RDEPEND="sys-libs/ncurses"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ !sys-process/procps"
S=${WORKDIR}/top-${PV/_/}
@@ -26,6 +27,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.8_beta1-memleak-fix-v2.patch
"${FILESDIR}"/${PN}-3.8_beta1-high-threadid-crash.patch
"${FILESDIR}"/${PN}-3.8_beta1-percent-cpu.patch
+ "${FILESDIR}"/${PN}-3.8_beta1-winch-segfault.patch
+ "${FILESDIR}"/${PN}-3.8_beta1-recent-linux.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-process/unixtop/files/, sys-process/unixtop/
commit: f04018ad352989d27434700fecc8108a917f2ff5
Author: Marty E. Plummer startmail com>
AuthorDate: Fri Apr 20 16:04:58 2018 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Mon Apr 23 14:53:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f04018ad
sys-process/unixtop: epatch->PATCHES=()
Reworked patches to be -p1, and converted the two 'diff -c' context
style diffs to a 'diff -u' unified diff, both for greater readability
and a generally smaller filesize.
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../unixtop-3.8_beta1-high-threadid-crash.patch| 115 +++--
.../files/unixtop-3.8_beta1-memleak-fix-v2.patch | 68 +---
.../unixtop/files/unixtop-3.8_beta1-ncurses.patch | 4 +-
.../files/unixtop-3.8_beta1-no-AX-macros.patch | 4 +-
sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild| 21 ++--
5 files changed, 82 insertions(+), 130 deletions(-)
diff --git
a/sys-process/unixtop/files/unixtop-3.8_beta1-high-threadid-crash.patch
b/sys-process/unixtop/files/unixtop-3.8_beta1-high-threadid-crash.patch
index 734826a647d..00f19536e38 100644
--- a/sys-process/unixtop/files/unixtop-3.8_beta1-high-threadid-crash.patch
+++ b/sys-process/unixtop/files/unixtop-3.8_beta1-high-threadid-crash.patch
@@ -1,75 +1,40 @@
-https://sourceforge.net/tracker/index.php?func=detail=2815842_id=72892=536042
-
-*** hash.c-old Thu Jul 2 15:30:55 2009
hash.c Thu Jul 2 15:48:39 2009
-***
-*** 1354,1360
- hi->value = value;
-
- /* hash to the bucket */
-! bucket = &(ht->buckets[((key.k_thr * 1 + key.k_pid) %
ht->num_buckets)]);
-
- /* walk the list to make sure we do not have a duplicate */
- ll = &(bucket->list);
1354,1360
- hi->value = value;
-
- /* hash to the bucket */
-! bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 1U + (unsigned
long)(key.k_pid)) % ht->num_buckets)]);
-
- /* walk the list to make sure we do not have a duplicate */
- ll = &(bucket->list);
-***
-*** 1408,1414
- pidthr_t k1;
-
- /* find the bucket */
-! bucket = &(ht->buckets[((key.k_thr * 1 + key.k_pid) %
ht->num_buckets)]);
-
- /* walk the list until we find the existing item */
- ll = &(bucket->list);
1408,1414
- pidthr_t k1;
-
- /* find the bucket */
-! bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 1U + (unsigned
long)(key.k_pid)) % ht->num_buckets)]);
-
- /* walk the list until we find the existing item */
- ll = &(bucket->list);
-***
-*** 1460,1466
- pidthr_t k1;
-
- result = NULL;
-! if ((bucket = &(ht->buckets[((key.k_thr * 1 + key.k_pid) %
ht->num_buckets)])) != NULL)
- {
-ll = &(bucket->list);
-li = LL_FIRST(ll);
1460,1466
- pidthr_t k1;
-
- result = NULL;
-! if ((bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 1U +
(unsigned long)(key.k_pid)) % ht->num_buckets)])) != NULL)
- {
-ll = &(bucket->list);
-li = LL_FIRST(ll);
-***
-*** 1499,1505
- pidthr_t k1;
-
- result = NULL;
-! if ((bucket = &(ht->buckets[((key.k_thr * 1 + key.k_pid) %
ht->num_buckets)])) != NULL)
- {
-ll = &(bucket->list);
-li = LL_FIRST(ll);
1499,1505
- pidthr_t k1;
-
- result = NULL;
-! if ((bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 1U +
(unsigned long)(key.k_pid)) % ht->num_buckets)])) != NULL)
- {
-ll = &(bucket->list);
-li = LL_FIRST(ll);
-
-
-
+https://sourceforge.net/p/unixtop/bugs/43/
+
+--- a/hash.c
b/hash.c
+@@ -1354,7 +1354,7 @@ hash_add_pidthr(hash_table *ht, pidthr_t
+ hi->value = value;
+
+ /* hash to the bucket */
+-bucket = &(ht->buckets[((key.k_thr * 1 + key.k_pid) %
ht->num_buckets)]);
++bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 1U + (unsigned
long)(key.k_pid)) % ht->num_buckets)]);
+
+ /* walk the list to make sure we do not have a duplicate */
+ ll = &(bucket->list);
+@@ -1408,7 +1408,7 @@ hash_replace_pidthr(hash_table *ht, pidt
+ pidthr_t k1;
+
+ /* find the bucket */
+-bucket = &(ht->buckets[((key.k_thr * 1 + key.k_pid) %
ht->num_buckets)]);
++bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 1U + (unsigned
long)(key.k_pid)) % ht->num_buckets)]);
+
+ /* walk the list until we find the existing item */
+ ll = &(bucket->list);
+@@ -1460,7 +1460,7 @@ hash_lookup_pidthr(hash_table *ht, pidth
+ pidthr_t k1;
+
+ result = NULL;
+-if ((bucket = &(ht->buckets[((key.k_thr * 1 + key.k_pid) %
ht->num_buckets)])) != NULL)
++if ((bucket = &(ht->buckets[(((unsigned long)(key.k_thr) * 1U +
(unsigned long)(key.k_pid)) % ht->num_buckets)])) != NULL)
+ {
+ ll = &(bucket->list);
+ li = LL_FIRST(ll);
+@@ -1499,7 +1499,7 @@
[gentoo-commits] repo/gentoo:master commit in: sys-process/unixtop/
commit: 898508cae55771dd611ff9e883611a905c27f301
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Apr 14 07:35:57 2017 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Apr 14 07:35:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=898508ca
sys-process/unixtop: bump from EAPI=0 to EAPI=6
Package-Manager: Portage-2.3.3, Repoman-2.3.1
sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild | 19 +++
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
index 38bfa90fe46..d32e3863a6f 100644
--- a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
+++ b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
+EAPI=6
+
inherit eutils autotools
DESCRIPTION="top for UNIX systems"
@@ -17,19 +19,18 @@ DEPEND="${RDEPEND}"
S=${WORKDIR}/top-${PV/_/}
-src_unpack() {
- unpack ${A}
- cd "${S}"
+src_prepare() {
epatch "${FILESDIR}"/${P}-ncurses.patch
epatch "${FILESDIR}"/${P}-no-AX-macros.patch
epatch "${FILESDIR}"/${P}-renice-segfault.patch
epatch "${FILESDIR}"/${P}-memleak-fix-v2.patch
epatch "${FILESDIR}"/${P}-high-threadid-crash.patch
epatch "${FILESDIR}"/${P}-percent-cpu.patch
+ eapply_user
eautoreconf
}
-src_compile() {
+src_configure() {
local myconf=
# don't do bi-arch cruft on hosts that support that, such as Solaris
@@ -38,11 +39,5 @@ src_compile() {
# configure demands an override because on OSX this is "experimental"
[[ ${CHOST} == *-darwin* ]] && myconf="${myconf} --with-module=macosx"
- econf ${myconf} || die
- emake || die
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc README FAQ Y2K
+ econf ${myconf}
}
[gentoo-commits] repo/gentoo:master commit in: sys-process/unixtop/files/
commit: 986a8b82d59d77fd1634224f80efc2aadd33fec6
Author: Michael Mair-Keimberger (asterix) gmail
com>
AuthorDate: Fri Feb 3 14:42:17 2017 +
Commit: Robin H. Johnson gentoo org>
CommitDate: Fri Feb 3 21:37:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986a8b82
sys-process/unixtop: remove unused patch
(cherry picked from commit 296b25d4295be555ba76288d2a9332860e571c8e)
Fixes: https://github.com/gentoo/gentoo/pull/3790
Signed-off-by: Robin H. Johnson gentoo.org>
.../files/unixtop-3.8_beta1-memleak-fix.patch | 28 --
1 file changed, 28 deletions(-)
diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-memleak-fix.patch
b/sys-process/unixtop/files/unixtop-3.8_beta1-memleak-fix.patch
deleted file mode 100644
index 1307506..
--- a/sys-process/unixtop/files/unixtop-3.8_beta1-memleak-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-http://defect.opensolaris.org/bz/show_bug.cgi?id=5482
-https://sourceforge.net/tracker/?func=detail=2593511_id=72892=536042
-
top-3.8beta1/machine/m_sunos5.c
-+++ top-3.8beta1/machine/m_sunos5.c
-@@ -2059,11 +2059,11 @@
- /* make sure we have a valid descriptor and the file's current size */
- if (fd >= 0 && fstat(fd, ) != -1)
- {
-- char *p;
-+ char *p, *p0;
- int i;
-
- /* read the whole file */
-- p = malloc(st.st_size);
-+ p = p0 = malloc(st.st_size);
- (void)pread(fd, p, st.st_size, 0);
-
- /* cache the file descriptor if we can */
-@@ -2148,7 +2148,7 @@
- op->oldtime = TIMESPEC_TO_DOUBLE(lwpp->pr_time);
- op->seen = 1;
- }
-- free(p);
-+ free(p0);
- }
- #endif
-
