Fix amd64 signedness bug, thanks to phreak

Package-Manager: portage-2.1.2.9

5 files changed, 128 insertions, 18 deletions

diff --git a/net-analyzer/nload/ChangeLog b/net-analyzer/nload/ChangeLog
index ef50b4644862..2e0dd10f9016 100644
--- a/net-analyzer/nload/ChangeLog
+++ b/net-analyzer/nload/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/nload
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/ChangeLog,v 1.21 2007/03/22 14:25:52 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/ChangeLog,v 1.22 2007/06/03 07:56:25 jokey Exp $
+
+*nload-0.6.0-r2 (03 Jun 2007)
+
+  03 Jun 2007; Markus Ullmann <jokey@gentoo.org>
+  +files/nload-0.6.0-signedness.patch, -nload-0.6.0-r1.ebuild,
+  +nload-0.6.0-r2.ebuild:
+  Fix amd64 signedness bug, thanks to phreak
 
   22 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org> nload-0.6.0-r1.ebuild:
   Stable on sparc
diff --git a/net-analyzer/nload/Manifest b/net-analyzer/nload/Manifest
index 95f67e589b70..631084869a63 100644
--- a/net-analyzer/nload/Manifest
+++ b/net-analyzer/nload/Manifest
@@ -5,19 +5,23 @@ AUX nload-0.6.0-prevent-stripping.patch 592 RMD160 1ba0691ced3d591909d461d46b114
 MD5 db2db19aa3a812f774d7ada931d743e5 files/nload-0.6.0-prevent-stripping.patch 592
 RMD160 1ba0691ced3d591909d461d46b1148d0f9a6de8a files/nload-0.6.0-prevent-stripping.patch 592
 SHA256 9367907e43aa05a50d4d74efc3d9d360e52c316640505ac9f77ed4ad46ef49c6 files/nload-0.6.0-prevent-stripping.patch 592
+AUX nload-0.6.0-signedness.patch 2382 RMD160 1fbdc77b07c6c80c48e13614c8d97950651b0140 SHA1 7c3fcff9084db36c2bf8e64fcfe46e23fa079c41 SHA256 21bc1dd5f45dfd3bf01173026f5703af88400f49ad1bf4e78024a0e4b28a4522
+MD5 6f96a6869f1a912e0895a98791fa298f files/nload-0.6.0-signedness.patch 2382
+RMD160 1fbdc77b07c6c80c48e13614c8d97950651b0140 files/nload-0.6.0-signedness.patch 2382
+SHA256 21bc1dd5f45dfd3bf01173026f5703af88400f49ad1bf4e78024a0e4b28a4522 files/nload-0.6.0-signedness.patch 2382
 DIST nload-0.6.0.tar.gz 121136 RMD160 d7bcd89d32b90ce4e5676c6630e478cd3e73a9d7 SHA1 3f71fb4fce9b8f4da7dccf9ab9696c3d051012c2 SHA256 546c7934a1e97aed34982eca6a4f17d33956479f76de9151371fa58eb24766c9
-EBUILD nload-0.6.0-r1.ebuild 765 RMD160 217a9985062b03577a34bc3676005b1e2f745ca8 SHA1 12351b0eb9d71dd3e1865b45f9645e3eef75f849 SHA256 f2f1597a5935dd4c4f9607bd0d10c1dd1a92b5e9275426e5cc7438cb2014f336
-MD5 faa35dbb5ea217f4b1d8924ac15c92cc nload-0.6.0-r1.ebuild 765
-RMD160 217a9985062b03577a34bc3676005b1e2f745ca8 nload-0.6.0-r1.ebuild 765
-SHA256 f2f1597a5935dd4c4f9607bd0d10c1dd1a92b5e9275426e5cc7438cb2014f336 nload-0.6.0-r1.ebuild 765
+EBUILD nload-0.6.0-r2.ebuild 805 RMD160 8413e9ed9dbdd341a3a1c051d920c74d30849106 SHA1 2ff86ccbb7bc99eb4d5da6bb27710da84df723f9 SHA256 a41e019622b7ad989eb24d0ba4f9cacaa9d8448d248f708c5318036c9406a4e0
+MD5 ec2c11de8e3dee2f3c79342bb4d9daaa nload-0.6.0-r2.ebuild 805
+RMD160 8413e9ed9dbdd341a3a1c051d920c74d30849106 nload-0.6.0-r2.ebuild 805
+SHA256 a41e019622b7ad989eb24d0ba4f9cacaa9d8448d248f708c5318036c9406a4e0 nload-0.6.0-r2.ebuild 805
 EBUILD nload-0.6.0.ebuild 626 RMD160 48744e00feec91695c2cb9a744e27f93befab9b4 SHA1 960c0d751748ed774eea8ccfd29ab8b045276644 SHA256 df0139565d3a4ffdc6337922507edb8d627631cd59af9cca903b26df07a310c6
 MD5 3ad4869b2ae472e48f9e875b36db8841 nload-0.6.0.ebuild 626
 RMD160 48744e00feec91695c2cb9a744e27f93befab9b4 nload-0.6.0.ebuild 626
 SHA256 df0139565d3a4ffdc6337922507edb8d627631cd59af9cca903b26df07a310c6 nload-0.6.0.ebuild 626
-MISC ChangeLog 3215 RMD160 5e15e6637e9e2542e249485c267536486bcb7162 SHA1 02e1248cd562c66ca31b880faef70cbb67a9b744 SHA256 5f8bcd8c43600990f6c80585c9d6233892f60240699f2e02d2da3247801ecc99
-MD5 f7cd08af0e1207480201279e38dc4130 ChangeLog 3215
-RMD160 5e15e6637e9e2542e249485c267536486bcb7162 ChangeLog 3215
-SHA256 5f8bcd8c43600990f6c80585c9d6233892f60240699f2e02d2da3247801ecc99 ChangeLog 3215
+MISC ChangeLog 3427 RMD160 cf3c638103725cfac1c38271894b79126440456e SHA1 bc25337e1dc132adcac5bb03274e522d6fe36982 SHA256 b4816b1de3af71cfef37e142b4cfa57a045b19629dfa683ed099cc44cc36188d
+MD5 df14b92cac74adda0e3b823acbd0cb55 ChangeLog 3427
+RMD160 cf3c638103725cfac1c38271894b79126440456e ChangeLog 3427
+SHA256 b4816b1de3af71cfef37e142b4cfa57a045b19629dfa683ed099cc44cc36188d ChangeLog 3427
 MISC metadata.xml 342 RMD160 38eeeee554b815d283175ed3640c51116aff4dd8 SHA1 fb126e68c220fb3266d2e00d6d0df44d980538d0 SHA256 83a6e222ff40f06fb5b65bca6dd62b2709eff276bd8e9b1ed1d5c5aaf7939e09
 MD5 973561a9f8af7319f312cc6cc86873fb metadata.xml 342
 RMD160 38eeeee554b815d283175ed3640c51116aff4dd8 metadata.xml 342
@@ -25,13 +29,13 @@ SHA256 83a6e222ff40f06fb5b65bca6dd62b2709eff276bd8e9b1ed1d5c5aaf7939e09 metadata
 MD5 a1c20bed67b2dbef6f42f70d4c522aac files/digest-nload-0.6.0 235
 RMD160 a701c9930f2a92fa5970f8f787ac0079a4e65972 files/digest-nload-0.6.0 235
 SHA256 141ed5b85ca905e8d5fe9095db7b032d08304554886805d21cf15b3e12a7c926 files/digest-nload-0.6.0 235
-MD5 a1c20bed67b2dbef6f42f70d4c522aac files/digest-nload-0.6.0-r1 235
-RMD160 a701c9930f2a92fa5970f8f787ac0079a4e65972 files/digest-nload-0.6.0-r1 235
-SHA256 141ed5b85ca905e8d5fe9095db7b032d08304554886805d21cf15b3e12a7c926 files/digest-nload-0.6.0-r1 235
+MD5 a1c20bed67b2dbef6f42f70d4c522aac files/digest-nload-0.6.0-r2 235
+RMD160 a701c9930f2a92fa5970f8f787ac0079a4e65972 files/digest-nload-0.6.0-r2 235
+SHA256 141ed5b85ca905e8d5fe9095db7b032d08304554886805d21cf15b3e12a7c926 files/digest-nload-0.6.0-r2 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGApH4KRy60XGEcJIRApf6AJkB7ERX2fdz8vLyInl1MLGQGJ81vwCgof1z
-jGeAVAmZnWHBX/cI9freZ+c=
-=Onhr
+iD8DBQFGYnQ2z974XjDVpbkRAsPgAJ41sfGp1oFiZgBDzmUP2m3F/YRVOQCfUWRu
+7U5sINjlK9gJHh39cnhb+S0=
+=m7D4
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/nload/files/digest-nload-0.6.0-r1 b/net-analyzer/nload/files/digest-nload-0.6.0-r2
index 821d6ef86e0c..821d6ef86e0c 100644
--- a/net-analyzer/nload/files/digest-nload-0.6.0-r1
+++ b/net-analyzer/nload/files/digest-nload-0.6.0-r2
diff --git a/net-analyzer/nload/files/nload-0.6.0-signedness.patch b/net-analyzer/nload/files/nload-0.6.0-signedness.patch
new file mode 100644
index 000000000000..53d53c1a80e0
--- /dev/null
+++ b/net-analyzer/nload/files/nload-0.6.0-signedness.patch
@@ -0,0 +1,99 @@
+--- 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-r1.ebuild b/net-analyzer/nload/nload-0.6.0-r2.ebuild
index 2454274f17f1..ea032512dca7 100644
--- a/net-analyzer/nload/nload-0.6.0-r1.ebuild
+++ b/net-analyzer/nload/nload-0.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.3 2007/03/22 14:25:52 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/nload/nload-0.6.0-r2.ebuild,v 1.1 2007/06/03 07:56:25 jokey Exp $
 
 inherit eutils autotools
 
@@ -19,6 +19,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-prevent-stripping.patch
+	epatch "${FILESDIR}"/${P}-signedness.patch
 	eautoreconf
 }
 
@@ -27,4 +28,3 @@ src_install () {
 	einstall || die
 	dodoc README INSTALL ChangeLog AUTHORS
 }
-