From 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 3 Mar 2019 13:42:34 +0000 Subject: gentoo resync : 03.03.2019 --- net-analyzer/chaosreader/Manifest | 9 +++++-- .../chaosreader/chaosreader-0.94-r1.ebuild | 7 +++--- net-analyzer/chaosreader/chaosreader-0.96.ebuild | 28 ++++++++++++++++++++++ .../files/chaosreader-0.96-chunkcheck.patch | 27 +++++++++++++++++++++ .../files/chaosreader-0.96-divisionbyzero.patch | 18 ++++++++++++++ .../files/chaosreader-0.96-zombies.patch | 11 +++++++++ net-analyzer/chaosreader/metadata.xml | 10 +++++++- 7 files changed, 104 insertions(+), 6 deletions(-) create mode 100644 net-analyzer/chaosreader/chaosreader-0.96.ebuild create mode 100644 net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch create mode 100644 net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch create mode 100644 net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch (limited to 'net-analyzer/chaosreader') diff --git a/net-analyzer/chaosreader/Manifest b/net-analyzer/chaosreader/Manifest index a8a09265687d..84473bb0e02b 100644 --- a/net-analyzer/chaosreader/Manifest +++ b/net-analyzer/chaosreader/Manifest @@ -3,6 +3,11 @@ AUX chaosreader-0.94-darwin.patch 416 BLAKE2B db4a0556b055857a88dae5294b6e993fb8 AUX chaosreader-0.94-divisionbyzero.patch 640 BLAKE2B 50d8d24212d1150128f22d74d07ce18bafb60a137235fd548784dc95b3ca325dfe1d5a26ad852ae4eaff5151c36518e546077be79aeef74ce66cefac002b6c2c SHA512 04afa8959847fc52ba8bc546b7f2f134efcc8283b5b99c2af24af27bae73922ea4df4ff5f55308f075e1c77a29718c63345bceca3da3014611cf8b1f06e48ed8 AUX chaosreader-0.94-oldmultiline.patch 487 BLAKE2B 596eac7253649813d6f3486522a998c8c647d2cde8830964480a394b91486f3b710c2fb7a54862be6ef8f60c8db40052cf8d4e6c8e638efc648194462354e244 SHA512 dcb98d8e5000fd0d130217e582ae21a519fd6e1554cd1e4902db632e7760c1708c9754f97f28f90d3371ccf76bb7b499b023d0985c27e799c27205f410515941 AUX chaosreader-0.94-zombies.patch 349 BLAKE2B 607cd4f48c77613ab794f8d2fe00f5653854fe3d5a669412190e520015724cc9ad1c246e308a0c43c1ec0b4e29ec261c6eb77910dccbc0f8ddfdc730ff9f8cac SHA512 d3348cd6f29d01b1e94e4aa7f89b7f76fa9a4c8a557c437d0495ae32c6a6399019fe3affed5f1611a77a6b70fd1f30d011c87e00b614640c155f3afd8470a0f3 +AUX chaosreader-0.96-chunkcheck.patch 1048 BLAKE2B 81aa846daac3aa098d6699c6542c4e510198e3b1cc873f693d93fca24b98ed8a2de87a5dba0fa50fe4eb62faaba2fbd7733b754dabfdbc78b4f1d31911eb3090 SHA512 3721f42751698a99918ef92c08e7244fae27fb4baab6ee311dfc7c069a8ae5e44e33886dbe3ade63b92a3d56de84c6ac8b5c77cdb8bd4ab283b291747718f310 +AUX chaosreader-0.96-divisionbyzero.patch 661 BLAKE2B 529dce5b432e6636aee92526ce1e9edfaf900d64b7d4daed1163570d5d30d649987b453350bfba49bdb839256910e3849558fd7283e5a23d563f521304be35df SHA512 77fbb6e7b75055320e1cdd5e88fdadf10cc619e0ec3315640c579c6dd490be07dd504e8204ad7f35e260dbd42d82f596458cece701173aac0a5023274d56f380 +AUX chaosreader-0.96-zombies.patch 343 BLAKE2B 85dd641d9c20a5f90a0f102fbae1abee3042974c40b166a1c8f6fc8e78f2f3a6eafa8ac2ffd1de66baf751bc05b581bdf6742df68cac5254b0a363a6d99ba9a8 SHA512 7aa70a9e5dc543cc583ee825b0bee00aaecc7dbb12c0888376354cbdc403e194af37685b10e339f7fb59e031ff92b6b0f24634311572a5ba43e89706d700ec9c DIST chaosreader-0.94.bz2 41039 BLAKE2B 664ac7de3ea15dcc2942f7d9ffa4a7ffd2066a521345877127594ece197cab8d49d2f3441335c012dc09041543cda31c723d021ae86a512b4d578f958acc3afc SHA512 f2c2b31e6f7fc27c5cb59a43ce9cdea67de520c79f6354c9a0f627c098d73f4666461fb4f3c393a0a9ac36105979fe36b08035c4404371db2f573dd534e1adad -EBUILD chaosreader-0.94-r1.ebuild 797 BLAKE2B ba97daaaa2377c2fd3b21ab297c5e7c3613896d57a6406b9b602437fe980a483f2cd0cd60eb97050588fd6c5f2ba07f6685baa76bcd62a838ff936c72636c327 SHA512 517498a840b8143362be0d9c97a9fa5b7b03f91eea3acb09f067cc8e4ae7e1dd23316592e7de0571484a5c31a33e45006e3299ac15b7329b337ce03046f1991e -MISC metadata.xml 247 BLAKE2B 46dfce417653ec2bfa8e15a6e45e95eda5fe76d2867baba64738dc625b20b4170461fc30cf34f3607ba5b0a39c932ef3722f388802c18c21501c75742344a95a SHA512 6776ae1219f92689a0543d71a91ba750986de47dd363a376fae8c926ee6e09767cb98a6d7b8cea2d9e5d1002ceee26cf62c4d72a9d38b08b793d0fa3deb25125 +DIST chaosreader-0.96.tar.gz 99124 BLAKE2B 04e9dd45543033bb3d15264fcc9168b7e2cec6f304f10142df36c363e841afc91659d7956bbb60b05cc6ab4e8fd519adaf9a2e69be2efc129fd2f38ca0d99f1f SHA512 46ba4a66152403e150e652bf6fa08af98cd3d709ea2cb834a32411ca5dde5f94a7e972404626787e604c1449c29ab5f335673b305ab83856c0dfff7cbf2f4de4 +EBUILD chaosreader-0.94-r1.ebuild 840 BLAKE2B 8060c14564abfe0a5994fe7ca8263ac281fcedf33cc590adc0a10927281ced71a8f6dd4e8659fc36597835086501bef436db99d383b7deb9426a1ae5e8102484 SHA512 365f6740dce7ad5b9938fa5e15a2564cadc35f49b04a2b7e7dac9efbb8071be872a8bdf8e58c7b44eb3386ed392b60d73f4b483a49002743dedf7a598f5c7a70 +EBUILD chaosreader-0.96.ebuild 726 BLAKE2B bbc041d07cf075465a04a9b594c52b13d919dcea78d61a88213b5454ae23222ba40d10c9e63494dd05dd4fe915acfd59a2736c6f1c592988ea5bf3c2ccf1c856 SHA512 5064abb43c24fd06d8862144d6d4c02302a746af2bde3759cc2734ecaf035404086256b36404f3734282c9ef4a5ad797b5af6a1f10b69441493f47dfc39ce966 +MISC metadata.xml 519 BLAKE2B bb962789720f669f73a42bb2b4b0cf80f39d8efc8c7ef191048ed554813dd2ca3e3e8b0fecdbd46513fe7bf815d0129fc9d11be45ef240ba280d931a751377b6 SHA512 1c1018ea975b13592ac38a1d5207ad599f8a6f36f58718232a27870e23d5d5b2c7b3977b31975bf24c42176e0d8043259a130e4020a05942fe6d7aca073444a4 diff --git a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild index 33c7a6f55825..1b7d356fcb14 100644 --- a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild +++ b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -6,12 +6,13 @@ EAPI=4 inherit eutils DESCRIPTION="Trace TCP/UDP/... sessions and fetch application data." -HOMEPAGE="http://chaosreader.sourceforge.net" +HOMEPAGE="http://chaosreader.sourceforge.net + https://github.com/brendangregg/Chaosreader" SRC_URI="https://dev.gentoo.org/~spock/portage/distfiles/${P}.bz2" SLOT="0" KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux ~x86-macos" -LICENSE="GPL-2" +LICENSE="GPL-2+" IUSE="" diff --git a/net-analyzer/chaosreader/chaosreader-0.96.ebuild b/net-analyzer/chaosreader/chaosreader-0.96.ebuild new file mode 100644 index 000000000000..ab29f713b3df --- /dev/null +++ b/net-analyzer/chaosreader/chaosreader-0.96.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Trace TCP/UDP/... sessions and fetch application data." +HOMEPAGE="http://chaosreader.sourceforge.net + https://github.com/brendangregg/Chaosreader" +SRC_URI="https://github.com/brendangregg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +SLOT="0" + +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos" +LICENSE="GPL-2+" + +DEPEND=">=dev-lang/perl-5.8.0" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/Chaosreader-${PV}" + +PATCHES=( + "${FILESDIR}"/chaosreader-0.96-zombies.patch + "${FILESDIR}"/chaosreader-0.96-chunkcheck.patch + "${FILESDIR}"/chaosreader-0.96-divisionbyzero.patch +) + +src_install() { + dobin ${PN} +} diff --git a/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch new file mode 100644 index 000000000000..6a394d4b308e --- /dev/null +++ b/net-analyzer/chaosreader/files/chaosreader-0.96-chunkcheck.patch @@ -0,0 +1,27 @@ +--- a/chaosreader 2011-11-10 19:17:50.000000000 +0100 ++++ b/chaosreader 2012-03-09 18:15:21.096105305 +0100 +@@ -5350,6 +5353,24 @@ + next if length($http_data) < 8; + $partnum++; + $parttext = sprintf("%02d",$partnum); ++ ++ ## from https://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.96-divisionbyzero.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch new file mode 100644 index 000000000000..584918513062 --- /dev/null +++ b/net-analyzer/chaosreader/files/chaosreader-0.96-divisionbyzero.patch @@ -0,0 +1,18 @@ +--- a/chaosreader 2014-06-15 21:30:11.000000000 +0200 ++++ b/chaosreader 2019-02-21 18:26:00.671756895 +0100 +@@ -4275,7 +4275,14 @@ + print REPLAY "ms($timediff1);\n"; + } + $duration = 0.01 if $duration == 0; # avoid divide by 0, +- $speed = sprintf("%.2f",$bytes / (1024 * $duration)); ++ + # avoid division by zero ++ # from https://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.96-zombies.patch b/net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch new file mode 100644 index 000000000000..40fa6063adf3 --- /dev/null +++ b/net-analyzer/chaosreader/files/chaosreader-0.96-zombies.patch @@ -0,0 +1,11 @@ +--- a/chaosreader 2006-12-24 15:12:23.000000000 +0100 ++++ b/chaosreader 2006-12-24 15:11:56.000000000 +0100 +@@ -396,6 +395,8 @@ if ($Arg{normal}) { + + elsif ($Arg{standalone}) { + ++ $SIG{CHLD} = "IGNORE"; ++ + ############################################################ + # --- STANDALONE - Create Packet Logs and Process them --- + # diff --git a/net-analyzer/chaosreader/metadata.xml b/net-analyzer/chaosreader/metadata.xml index 8a3b2249bc8f..4cd76b15bbeb 100644 --- a/net-analyzer/chaosreader/metadata.xml +++ b/net-analyzer/chaosreader/metadata.xml @@ -1,8 +1,16 @@ - + + bu9zilla@gmail.com + Michael Mair-Keimberger + + + proxy-maint@gentoo.org + Proxy Maintainers + chaosreader + brendangregg/chaosreader -- cgit v1.2.3