Commit missing patches, bug #408935 by rainbow.

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

6 files changed, 87 insertions, 5 deletions

diff --git a/net-analyzer/chaosreader/ChangeLog b/net-analyzer/chaosreader/ChangeLog
index e0d0b9ab4e90..7f33ead2ed00 100644
--- a/net-analyzer/chaosreader/ChangeLog
+++ b/net-analyzer/chaosreader/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/chaosreader
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/ChangeLog,v 1.14 2012/03/17 10:44:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/chaosreader/ChangeLog,v 1.15 2012/03/20 09:28:31 pacho Exp $
+
+  20 Mar 2012; Pacho Ramos <pacho@gentoo.org>
+  +files/chaosreader-0.94-chunkcheck.patch,
+  +files/chaosreader-0.94-darwin.patch,
+  +files/chaosreader-0.94-divisionbyzero.patch,
+  +files/chaosreader-0.94-oldmultiline.patch:
+  Commit missing patches, bug #408935 by rainbow.
 
 *chaosreader-0.94-r1 (17 Mar 2012)
 
diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest
index 5d229f6cd776..c445357e2dd8 100644
--- a/net-analyzer/chaosreader/Manifest
+++ b/net-analyzer/chaosreader/Manifest
@@ -1,16 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX chaosreader-0.94-chunkcheck.patch 1048 RMD160 2a9a3504e49f30f2a7de7435985b91d306e43c0a SHA1 198fde2e7b4d8e7de402b630ebe09c21a7968edb SHA256 bb568d2e8e71e43168aca97a86fd396248c59189b326cd29a6565dbdcd9d27c1
+AUX chaosreader-0.94-darwin.patch 416 RMD160 f23b8e29375c980ca34f59456fbda76446281a50 SHA1 0e0232d8c74f11c4c5d3c11c0b71912f1ffd7192 SHA256 662f47776c92b4345e10f80b105e424e92612ed8f543a7faace9e60a4c64a540
+AUX chaosreader-0.94-divisionbyzero.patch 639 RMD160 4c0281efbfde8e86390a63fae6c302c24f6645ae SHA1 ac9ad8cb1da06e3c2af7ac14c0e22d35bb6ee4ae SHA256 92305d7b2820b7df75c557d8e9e9d6d5da7dcb9bb40a80e406dd28aa65009778
+AUX chaosreader-0.94-oldmultiline.patch 487 RMD160 ee528ea9d671532e413bdc2b5145cef3ba851548 SHA1 fcc027fc6badbcd5ab0253e7e5e62a784956522f SHA256 e9d34aed4170470fb02c646398f62bd54f013c96166c7c154ccb9c547432f1a1
 AUX chaosreader-0.94-zombies.patch 349 RMD160 024fa499429cd29984f28b2240a3108021f1fdca SHA1 237f586bfe868423963f1e28c1a71241ac579979 SHA256 bbb03272d9d8970ab9c4c7a7f5b263142424f848c114b6108b6604887eb80421
 DIST chaosreader-0.94.bz2 41039 RMD160 be830d31c4a93d969ad682780a84dae22a5f8202 SHA1 d37c237760cf883dcf311b3656f5bd8f088b1c89 SHA256 523f2107502dda9a1a9c73d8bc14605046f7352ada442bfcafec39a81b41f35b
 EBUILD chaosreader-0.94-r1.ebuild 960 RMD160 b4828d7ebddbed60d0a2662a29327022608fe9bc SHA1 7a0aa0cbdaabca594acf29212d507e1773182513 SHA256 522360029bb78f65d7dd169f1b191c336e4c2d56c2c8eaab4c90b7a41c5901a3
 EBUILD chaosreader-0.94.ebuild 748 RMD160 5a4ef770642c3f85afe3fad130dedaf567081452 SHA1 a661c1a7ef195a0d5d9060a15cc0ae7d37a77813 SHA256 831b58d1c17ac0f3c77a8f235adf930dd9bfebe4881b7148ea750a8f40214282
-MISC ChangeLog 1961 RMD160 546fd9fa0edf5c1e189824caa6f9dbb9f4980e33 SHA1 4bbe6b054c410deedbac58da0878f63ac8f992b0 SHA256 b6f39e7160e9d3f970f3f0f31899ed0a2573ba59e45c8406e868474b4516f3c5
+MISC ChangeLog 2236 RMD160 3f860975bc6d860830a773cb36616f99de77265e SHA1 b14522ff88249bbb73e99ced95cdcfb8171c6d92 SHA256 2116303055c01ef58ce3c2937747e09e5a6b141cbf0d0f2cfb460923965061c1
 MISC metadata.xml 212 RMD160 f278ca2a473dd949f7d0f359c432cfe4ed026e71 SHA1 b67d9ec2368a50032f536d14dbd7f105b25191cf SHA256 70bbfd181623c884c763902ca127ef24c917b2e55cda0869e6ffaa6c4ebc5757
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk9kav8ACgkQCaWpQKGI+9Qg4gCfUXabSx5JwbA4lKBSJGTmpfaO
-Hp4AnR1Ns2Z4q2/g243BN11dUi9PmoRx
-=Vx9u
+iEYEARECAAYFAk9oTcQACgkQCaWpQKGI+9TzlgCdFGWd6Xb2111SLbGG7nlNircQ
+ktkAnieQ0DOfsQrEYAiYHNx7UF2gAKjK
+=1J7w
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-chunkcheck.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-chunkcheck.patch
new file mode 100644
index 000000000000..547af04db5b7
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.94-chunkcheck.patch
@@ -0,0 +1,27 @@
+--- chaosreader	2011-11-10 19:17:50.000000000 +0100
++++ chaosreader-0.94	2012-03-09 18:15:21.096105305 +0100
+@@ -5350,6 +5353,24 @@
+ 		next if length($http_data) < 8;
+ 		$partnum++;
+ 		$parttext = sprintf("%02d",$partnum);
++		
++		## from http://sourceforge.net/tracker/?func=detail&aid=2019799&group_id=107384&atid=647491 
++		### Chunk Check
++		if ( $http_header =~ /Transfer-Encoding: chunked/ ) {
++                  my $new_http_data="";
++                  my $chunksize=-1;
++                  my $pos=0;
++                  until ($chunksize==0) {
++                    my $eolpos=index($http_data,"\r\n",$pos);
++                    $chunksize=hex(substr($http_data,$pos,$eolpos - $pos));
++                    $pos=($eolpos+2);
++                    if ($chunksize > 0) {
++                      $new_http_data.=substr($http_data,$pos,$chunksize);
++                    }
++                    $pos+=($chunksize+2);
++                  }
++                  $http_data=$new_http_data;
++		}
+ 
+ 		### Part - Checks
+ 		$http_type = &File_Type($http_data);
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-darwin.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-darwin.patch
new file mode 100644
index 000000000000..2eaca80909ae
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.94-darwin.patch
@@ -0,0 +1,11 @@
+--- chaosreader 2011-11-10 19:17:50.000000000 +0100
++++ chaosreader-0.94    2012-03-09 18:15:21.096105305 +0100
+@@ -6233,6 +6254,8 @@
+ 		$command = "tcpdump -s9999 -w";
+ 	} elsif ($^O eq "solaris") {
+ 		$command = "snoop -o";
++	} elsif ($^O eq "darwin") {
++		$command = "tcpdump -i en1 -s9999 -w";
+ 	} else {
+ 		die "ERROR54: Can't find the sniffer command for \"$^O\".\n" .
+ 		 "\t Please use log mode instead.\n";
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-divisionbyzero.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-divisionbyzero.patch
new file mode 100644
index 000000000000..7f3ec2804dd4
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.94-divisionbyzero.patch
@@ -0,0 +1,18 @@
+--- chaosreader	2011-11-10 19:17:50.000000000 +0100
++++ chaosreader-0.94	2012-03-09 18:15:21.096105305 +0100
+@@ -4028,7 +4024,14 @@
+ 	   ### This causes the replay program to pause
+ 	   print REPLAY "ms($timediff1);\n";
+ 	}
+-	$speed = sprintf("%.2f",$bytes / (1024 * $duration));
++	# avoid division by zero
++	# from http://sourceforge.net/tracker/?func=detail&aid=2210488&group_id=107384&atid=647489
++	if ( $duration > 0 ) {
++		$speed = sprintf("%.2f",$bytes / (1024 * $duration));
++	}
++	else {
++		$speed = "unknown";
++	}
+ 	print REPLAY "print \"\n\n" .
+ 	 "Summary: $duration2 seconds, $bytes bytes, $speed Kb/sec\\n\";";
+ 	close REPLAY;
diff --git a/net-analyzer/chaosreader/files/chaosreader-0.94-oldmultiline.patch b/net-analyzer/chaosreader/files/chaosreader-0.94-oldmultiline.patch
new file mode 100644
index 000000000000..1fada077058e
--- /dev/null
+++ b/net-analyzer/chaosreader/files/chaosreader-0.94-oldmultiline.patch
@@ -0,0 +1,15 @@
+--- chaosreader	2012-01-18 21:47:02.000000000 +0100
++++ chaosreader-0.94	2012-03-13 12:10:44.740136742 +0100
+@@ -259,12 +259,6 @@
+ $| = 1;					# flush output
+ 
+ #
+-#  The following is needed for old perl5 multiline matching. New perl5 uses
+-#  a "/s" on the RE (which is used in this program as well).
+-#
+-$* = 1;					# old perl5
+-
+-#
+ #  These ports have been selected to be saved as coloured 2-way HTML files
+ #
+ @Save_As_HTML_TCP_Ports = (21,23,25,79,80,109,110,119,143,513,514,1080,