diff options
author | Fabian Groffen <grobian@gentoo.org> | 2012-05-09 11:14:22 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2012-05-09 11:14:22 +0000 |
commit | 4bd10bc1bdbc15430df3843464835342101fc883 (patch) | |
tree | 3ef6d6b8951975c1b62a638613c6fa0d51f483f7 /sys-process | |
parent | Make comply with multilib-strict (diff) | |
download | historical-4bd10bc1bdbc15430df3843464835342101fc883.tar.gz historical-4bd10bc1bdbc15430df3843464835342101fc883.tar.bz2 historical-4bd10bc1bdbc15430df3843464835342101fc883.zip |
Revbump for some patches from Oracle/OpenIndiana
Package-Manager: portage-2.2.01.20430-prefix/cvs/SunOS i386
Diffstat (limited to 'sys-process')
-rw-r--r-- | sys-process/unixtop/ChangeLog | 11 | ||||
-rw-r--r-- | sys-process/unixtop/Manifest | 15 | ||||
-rw-r--r-- | sys-process/unixtop/files/unixtop-3.8_beta1-memleak-fix-v2.patch | 44 | ||||
-rw-r--r-- | sys-process/unixtop/files/unixtop-3.8_beta1-percent-cpu.patch | 23 | ||||
-rw-r--r-- | sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild | 49 |
5 files changed, 139 insertions, 3 deletions
diff --git a/sys-process/unixtop/ChangeLog b/sys-process/unixtop/ChangeLog index 63d2d83881df..74578d80a591 100644 --- a/sys-process/unixtop/ChangeLog +++ b/sys-process/unixtop/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-process/unixtop -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-process/unixtop/ChangeLog,v 1.3 2010/01/25 18:36:49 grobian Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/unixtop/ChangeLog,v 1.4 2012/05/09 11:14:22 grobian Exp $ + +*unixtop-3.8_beta1-r3 (09 May 2012) + + 09 May 2012; Fabian Groffen <grobian@gentoo.org> + +files/unixtop-3.8_beta1-memleak-fix-v2.patch, + +files/unixtop-3.8_beta1-percent-cpu.patch, +unixtop-3.8_beta1-r3.ebuild: + Revbump for some patches from Oracle/OpenIndiana *unixtop-3.8_beta1-r2 (25 Jan 2010) diff --git a/sys-process/unixtop/Manifest b/sys-process/unixtop/Manifest index 378ebda194ea..93239b5cd19b 100644 --- a/sys-process/unixtop/Manifest +++ b/sys-process/unixtop/Manifest @@ -1,10 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX unixtop-3.8_beta1-high-threadid-crash.patch 2260 RMD160 90ade9471efa1caecd0a62c77aa4db43fc77303b SHA1 3a8e7cb3e0bc9ba9cd17794e572bb50f6a0515aa SHA256 5bcfe0a03ab73e4204367da0988968988d338d8c35ac907cd82692d3ec3e005a +AUX unixtop-3.8_beta1-memleak-fix-v2.patch 1060 RMD160 836135553cfd8ce8052767b8e29c6698d7eada48 SHA1 b0b81ef84a36b7cd12b9938356750744f6b2aa70 SHA256 56167fb4d6a655c248ddc3a2809fba5bb0a410d4497990e089d680cb57e2a250 AUX unixtop-3.8_beta1-memleak-fix.patch 732 RMD160 151dbd7cc2cadbf34fc9136df91bbd88c2f1eb8a SHA1 6849adb541636c4ea5fa530e4d882e6ed27b6792 SHA256 01bcab2902e0031aff71f033ec4d39b19e3d4e7dcf7657e3343ef24fcdfa3ff0 AUX unixtop-3.8_beta1-ncurses.patch 436 RMD160 07b267cc669f392c7d3923c48f6ccdac83b8d115 SHA1 3cefc53f2390b6028cda151794691ef93cb1fdb2 SHA256 26971db7940dd2aed33f523ea19c0084a679d4803f9f8fab8edcd822cad05e3c AUX unixtop-3.8_beta1-no-AX-macros.patch 609 RMD160 80fc04598d3ba2c361488d9352a5355a07074eed SHA1 0588fa050a1a302406d3be19e12da6f4dc517cb0 SHA256 ba24d9c3f3d361d6dfb55447fb2e7e270224868723121fefa7ebd04a1909129f +AUX unixtop-3.8_beta1-percent-cpu.patch 903 RMD160 021de5cb236567af6e2178b80e44bae16ebdd310 SHA1 63e87db960ac1b8322a1d853bf434867140897de SHA256 94236fc3ceb038a7022b8b9208cf8e29ffd1a6bfbb1a05baa97a4e8e4cc45a91 AUX unixtop-3.8_beta1-renice-segfault.patch 518 RMD160 b1c0cfc908224d91695323be5222c8ac3578b149 SHA1 f1a8f5ecaff1b34449a6a90899b3c33ceac73caf SHA256 47ffd2879fa9d3e6eae4fd38191abc004540f04b54cf39a72ab2366802067c7e DIST top-3.8beta1.tar.bz2 233880 RMD160 9949ba3262efdc0c5a311ee03508e1ad7a3e9229 SHA1 790340c375300a2ce78e0b939af98638999d787f SHA256 1b5281071a4fcc132205e643fb2fe196cf839555874aaee507a7d07aa0076cda EBUILD unixtop-3.8_beta1-r1.ebuild 1189 RMD160 fc2e86ef12b4c6e593a308ee10d4d52b4549370f SHA1 244ad96a597e4bbf977048f6f446eb7b939f8499 SHA256 89b5ddfacd07d2fece89b027918239fbe08234658f6d7017f5f5b4666ca01531 EBUILD unixtop-3.8_beta1-r2.ebuild 1246 RMD160 2fa3011c9074e05c71ebe94ce61b4121301aa5ad SHA1 c474c9142fcc335e33cbb8945d71026aa76c2e17 SHA256 54d64d8f18d2079c87a21344f81c7544238770a0ed9aec059d4541803cc256a5 -MISC ChangeLog 968 RMD160 e1284d231129ceb2c3e236e7d00cc87962abf08d SHA1 8dad10b358fd2d6f85ded3c2f6a5da604997e148 SHA256 79345929333c7d2399b087b29895052c75bfe0c38cd4b15c0b90fcd52bb1592e +EBUILD unixtop-3.8_beta1-r3.ebuild 1294 RMD160 717e7152d31135a575eacb5b4eb9e0446b7e8659 SHA1 38cd22a2e2c09ad6b1d7e792048b8a22ccfacf9e SHA256 be6d5269f28909420a8d5e46aecefa3aee2b135aa483232a163bee20cb131f89 +MISC ChangeLog 1233 RMD160 c7ff79aa34661832a171b8807d86629d3d8cec11 SHA1 38050d6824421b468285c2d39df79c270dbaf6d6 SHA256 f135fe625c773de8f49dfe85c1a2f42f586d180dcfb65454b86aa3a13997c505 MISC metadata.xml 160 RMD160 baab82f4bc435813cfde4796d42840882a9a4f8f SHA1 144e248704973cfad031c92a930aad01a62a2fda SHA256 27667dd7db1d188c12342624ec5ff2155717821d646e442aef9a691c65539ac4 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.18 (SunOS) + +iEYEARECAAYFAk+qUZQACgkQX3X2B8XHTonfIwCfTk146YKS9s/ISw32tniaevir +UykAn31BeXH0ORejRu+0hTa8poOjv/6N +=2G3d +-----END PGP SIGNATURE----- diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-memleak-fix-v2.patch b/sys-process/unixtop/files/unixtop-3.8_beta1-memleak-fix-v2.patch new file mode 100644 index 000000000000..76042bb4c1a6 --- /dev/null +++ b/sys-process/unixtop/files/unixtop-3.8_beta1-memleak-fix-v2.patch @@ -0,0 +1,44 @@ +https://hg.openindiana.org/upstream/oracle/userland-gate/raw-file/23c55a2f8a8e/components/top/patches/03.sunos5.patch + +*** top-3.8beta1/machine/m_sunos5.c.orig Wed Aug 31 05:23:52 2011 +--- top-3.8beta1/machine/m_sunos5.c Wed Aug 31 05:25:25 2011 +*************** +*** 2064,2070 **** + + /* read the whole file */ + p = malloc(st.st_size); +! (void)pread(fd, p, st.st_size, 0); + + /* cache the file descriptor if we can */ + if (fd < maxfiles) +--- 2064,2076 ---- + + /* read the whole file */ + p = malloc(st.st_size); +! if (pread(fd, p, st.st_size, 0) != st.st_size) +! { +! (void) close(fd); +! op->fd_lpsinfo = -1; +! free(p); +! continue; +! } + + /* cache the file descriptor if we can */ + if (fd < maxfiles) +*************** +*** 2148,2154 **** + op->oldtime = TIMESPEC_TO_DOUBLE(lwpp->pr_time); + op->seen = 1; + } +! free(p); + } + #endif + +--- 2154,2160 ---- + op->oldtime = TIMESPEC_TO_DOUBLE(lwpp->pr_time); + op->seen = 1; + } +! free(prp); + } + #endif + diff --git a/sys-process/unixtop/files/unixtop-3.8_beta1-percent-cpu.patch b/sys-process/unixtop/files/unixtop-3.8_beta1-percent-cpu.patch new file mode 100644 index 000000000000..503ed3576a70 --- /dev/null +++ b/sys-process/unixtop/files/unixtop-3.8_beta1-percent-cpu.patch @@ -0,0 +1,23 @@ +https://hg.openindiana.org/upstream/oracle/userland-gate/file/23c55a2f8a8e/components/top/patches/04.percent_cpu.patch + +--- top-3.8beta1/machine/m_sunos5.c.orig Tue Nov 8 11:23:08 2011 ++++ top-3.8beta1/machine/m_sunos5.c Tue Nov 8 11:23:11 2011 +@@ -152,8 +152,17 @@ + * one of the spare slots in the prinfo structure. + */ + +-#define percent_cpu(pp) (*(double *)dbl_align(&pp->pr_filler[0])) ++#if OSREV > 59 ++/* ++ * on Solaris 10, psinfo.pr_filler is 4 bytes and not double-aligned, so we must * move our scratch space to the larger pr.lwp_pr_filler which is 20 bytes ++ * XXX this is a time bomb and will likely break in future Solaris releases. ++ */ ++#define percent_cpu(pp) (*(double *)dbl_align(&pp->pr_lwp.pr_filler[0])) ++#else ++#define percent_cpu(pp) (*(double *)dbl_align(&pp->pr_filler[0])) ++#endif + ++ + /* definitions for indices in the nlist array */ + #define X_V 0 + #define X_MPID 1 diff --git a/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild new file mode 100644 index 000000000000..5ccad0837793 --- /dev/null +++ b/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-process/unixtop/unixtop-3.8_beta1-r3.ebuild,v 1.1 2012/05/09 11:14:22 grobian Exp $ + +inherit eutils autotools + +DESCRIPTION="top for UNIX systems" +HOMEPAGE="http://unixtop.sourceforge.net/" +SRC_URI="mirror://sourceforge/unixtop/top-${PV/_/}.tar.bz2" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="" + +RDEPEND="sys-libs/ncurses" +DEPEND="${RDEPEND}" + +S=${WORKDIR}/top-${PV/_/} + +src_unpack() { + unpack ${A} + cd "${S}" + 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 + eautoreconf +} + +src_compile() { + local myconf= + + # don't do bi-arch cruft on hosts that support that, such as Solaris + export enable_dualarch=no + + # 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 +} |