diff options
Diffstat (limited to 'net-analyzer/nload')
| -rw-r--r-- | net-analyzer/nload/ChangeLog | 7 | ||||
| -rw-r--r-- | net-analyzer/nload/Manifest | 16 | ||||
| -rw-r--r-- | net-analyzer/nload/files/nload-0.6.0-prevent-stripping.patch | 15 | ||||
| -rw-r--r-- | net-analyzer/nload/files/nload-0.6.0-signedness.patch | 99 | ||||
| -rw-r--r-- | net-analyzer/nload/nload-0.6.0-r2.ebuild | 30 |
5 files changed, 17 insertions, 150 deletions
diff --git a/net-analyzer/nload/ChangeLog b/net-analyzer/nload/ChangeLog index 27af4abb7d0d..c6a593377670 100644 --- a/net-analyzer/nload/ChangeLog +++ b/net-analyzer/nload/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-analyzer/nload # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/ChangeLog,v 1.28 2008/06/29 14:04:11 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/ChangeLog,v 1.29 2008/11/05 17:41:41 opfer Exp $ + + 05 Nov 2008; Christian Faulhammer <opfer@gentoo.org> + -files/nload-0.6.0-prevent-stripping.patch, + -files/nload-0.6.0-signedness.patch, -nload-0.6.0-r2.ebuild: + clean up 29 Jun 2008; nixnut <nixnut@gentoo.org> nload-0.7.1.ebuild: Stable on ppc wrt bug 229995 diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest index 564966ade39c..e6800b068ea7 100644 --- a/net-analyzer/nload/Manifest +++ b/net-analyzer/nload/Manifest @@ -1,9 +1,15 @@ -AUX nload-0.6.0-prevent-stripping.patch 592 RMD160 1ba0691ced3d591909d461d46b1148d0f9a6de8a SHA1 9bcfde2518901760bcbebf36a0259702019a1341 SHA256 9367907e43aa05a50d4d74efc3d9d360e52c316640505ac9f77ed4ad46ef49c6 -AUX nload-0.6.0-signedness.patch 2382 RMD160 1fbdc77b07c6c80c48e13614c8d97950651b0140 SHA1 7c3fcff9084db36c2bf8e64fcfe46e23fa079c41 SHA256 21bc1dd5f45dfd3bf01173026f5703af88400f49ad1bf4e78024a0e4b28a4522 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX nload-0.7.1-gcc43.patch 820 RMD160 a75dff26f2e70ed6652a487338a14616120171d5 SHA1 6533be86e5e87dd2cd47ee3f8c1c8d2d55335203 SHA256 c061f37ea193da89373ac04cef6722a545437166725a5bad2b84de03a797e8a9 -DIST nload-0.6.0.tar.gz 121136 RMD160 d7bcd89d32b90ce4e5676c6630e478cd3e73a9d7 SHA1 3f71fb4fce9b8f4da7dccf9ab9696c3d051012c2 SHA256 546c7934a1e97aed34982eca6a4f17d33956479f76de9151371fa58eb24766c9 DIST nload-0.7.1.tar.gz 144658 RMD160 7d5b87aa3de35c9114bfa6ba1e697e72ba0acb25 SHA1 7d096f3941d57046310768ffc6f63ccc228f65a5 SHA256 d4f34c65b72014b5d4f21f24262b8ba1f714dc87851a1bf05c929cb4a7767bc6 -EBUILD nload-0.6.0-r2.ebuild 808 RMD160 76311b48053f25aa117dafdb7a5090d051a1f1ed SHA1 9db6c0db445de97e28547d7eae47a8f664f30cef SHA256 2bad4cb32bdb84d01ee0eb423eddb4379537f60a8d0ab6a978ce8d4771dde651 EBUILD nload-0.7.1.ebuild 808 RMD160 cb5ee47e770fde1472dca6a829f38b1244af0cf1 SHA1 6cd9c3c0c34d8ec531e0085ec8ef066b57aed0e6 SHA256 e2c3f0583312217478d523ac94b3be3d350bd8ee41e200f42f0de262d4a55117 -MISC ChangeLog 4189 RMD160 98fe91f50a597ab4c1cbe6617aef7abc10a5c192 SHA1 c4abcfb9738fcba4184dd30ccc5c924880e9f1dc SHA256 8d9d0caa1384fd737b33b3586cb86a1bfacdda19167aeac1ec26cca429f942fc +MISC ChangeLog 4364 RMD160 66becbca2c645b7e6a0820ed3f2656bafc5a6b3a SHA1 b683f12fb12eb3de2ee4349af393e962aef5fa34 SHA256 ac0825ba3de342d186199921f8c7a931f08278a5069ba18e08f185d7917780f6 MISC metadata.xml 342 RMD160 38eeeee554b815d283175ed3640c51116aff4dd8 SHA1 fb126e68c220fb3266d2e00d6d0df44d980538d0 SHA256 83a6e222ff40f06fb5b65bca6dd62b2709eff276bd8e9b1ed1d5c5aaf7939e09 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkkR2tsACgkQNQqtfCuFneNBhwCfYOA1FoaR+NhE9dZtsTpL1QAd +AOwAn123vcXQKFNByy27XGlwmbZrFVdW +=Ib13 +-----END PGP SIGNATURE----- diff --git a/net-analyzer/nload/files/nload-0.6.0-prevent-stripping.patch b/net-analyzer/nload/files/nload-0.6.0-prevent-stripping.patch deleted file mode 100644 index a856f8ece058..000000000000 --- a/net-analyzer/nload/files/nload-0.6.0-prevent-stripping.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: nload-0.6.0/configure.in -=================================================================== ---- nload-0.6.0.orig/configure.in -+++ nload-0.6.0/configure.in -@@ -76,8 +76,8 @@ fi - dnl Adds extra arguments to configure script. - AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug], [do not strip debugging symbols (default no)]), -- test "$enableval" = "no" && LDFLAGS="$LDFLAGS -s", -- LDFLAGS="$LDFLAGS -s") -+ test "$enableval" = "no" && LDFLAGS="$LDFLAGS", -+ LDFLAGS="$LDFLAGS") - - dnl Checks for library functions. - AC_TYPE_SIGNAL diff --git a/net-analyzer/nload/files/nload-0.6.0-signedness.patch b/net-analyzer/nload/files/nload-0.6.0-signedness.patch deleted file mode 100644 index 53d53c1a80e0..000000000000 --- a/net-analyzer/nload/files/nload-0.6.0-signedness.patch +++ /dev/null @@ -1,99 +0,0 @@ ---- nload-0.6.0.orig/src/proc.h -+++ nload-0.6.0/src/proc.h -@@ -36,8 +36,8 @@ - - void readLoad( unsigned long& in, unsigned long& out ); - -- unsigned long totalIn(); -- unsigned long totalOut(); -+ long long totalIn(); -+ long long totalOut(); - - int getElapsedTime(); - -@@ -51,7 +51,7 @@ - - char m_ip[16]; - -- unsigned long m_total[2]; -+ long long m_total[2]; - - }; - ---- nload-0.6.0.orig/src/status.h -+++ nload-0.6.0/src/status.h -@@ -52,7 +52,7 @@ - gigabyte = 7 - }; - -- void update( unsigned long, unsigned long ); -+ void update( unsigned long, long long); - void print( Window&, int, int, status_format traff_format, status_format data_format ); - void resetTrafficData(); - ---- nload-0.6.0.orig/src/proc.cpp -+++ nload-0.6.0/src/proc.cpp -@@ -126,7 +126,7 @@ - - void Proc::readLoad( unsigned long& in, unsigned long& out ) - { -- unsigned long total_new[2] = { 0, 0 }; -+ long long total_new[2] = { 0, 0 }; - int curr_time = 0; - struct timeval time; - -@@ -181,7 +181,7 @@ - - if( ! strcmp( m_dev, dev ) ) - { -- sscanf( tmp, "%lu %*u %*u %*u %*u %*u %*u %*u %lu", &total_new[0], &total_new[1] ); -+ sscanf( tmp, "%llu %*u %*u %*u %*u %*u %*u %*u %llu", &total_new[0], &total_new[1] ); - - if( total_new[0] > m_total[0] ) - in = total_new[0] - m_total[0]; -@@ -198,7 +198,7 @@ - } - } while( 0 ); - -- fclose(fd); -+ if (fd != NULL) fclose(fd); - - #endif - // === End Linux specific network data reading code === -@@ -513,12 +513,12 @@ - return m_elapsed_time; - } - --unsigned long Proc::totalIn() -+long long Proc::totalIn() - { - return m_total[0]; - } - --unsigned long Proc::totalOut() -+long long Proc::totalOut() - { - return m_total[1]; - } ---- nload-0.6.0.orig/src/status.cpp -+++ nload-0.6.0/src/status.cpp -@@ -30,7 +30,7 @@ - } - - //new traffic measurement has been made => update statistics --void Status::update( unsigned long new_value, unsigned long new_total ) -+void Status::update( unsigned long new_value, long long new_total ) - { - - m_cur = new_value; -@@ -44,7 +44,9 @@ - *the /proc/net/dev file - *(the total bytes value reaches 4GB and then switches to 0) - */ -- if( new_total < ( m_total % UINT_MAX ) ) -+ if (new_total >= UINT_MAX ) -+ m_total = new_total; -+ else if ( new_total < ( m_total % UINT_MAX ) ) - m_total = ( ( m_total / UINT_MAX ) + 1 ) * UINT_MAX + new_total; - else - m_total = ( m_total / UINT_MAX ) * UINT_MAX + new_total; diff --git a/net-analyzer/nload/nload-0.6.0-r2.ebuild b/net-analyzer/nload/nload-0.6.0-r2.ebuild deleted file mode 100644 index 4bfd7f1aff9d..000000000000 --- a/net-analyzer/nload/nload-0.6.0-r2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/nload-0.6.0-r2.ebuild,v 1.3 2007/09/23 18:37:44 philantrop Exp $ - -inherit eutils autotools - -DESCRIPTION="console application which monitors network traffic and bandwidth usage in real time" -SRC_URI="mirror://sourceforge/nload/${P}.tar.gz" -HOMEPAGE="http://roland-riegel.de/nload/index_en.html" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc sparc x86" -IUSE="" - -DEPEND=">=sys-libs/ncurses-5.2" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-prevent-stripping.patch - epatch "${FILESDIR}"/${P}-signedness.patch - eautoreconf -} - -src_install () { - #make DESTDIR=${D} install - einstall || die - dodoc README INSTALL ChangeLog AUTHORS -} |