diff options
| author |   Dawid Węgliński <cla@gentoo.org> | 2010-01-20 17:04:04 +0000 |
|---|---|---|
| committer | Dawid Węgliński <cla@gentoo.org> | 2010-01-20 17:04:04 +0000 |
| commit | c25d1677c74f86675e2f638594df78fab6873410 (patch) | |
| tree | ecd2c40e1cb995b3701bcd59888a1fd001335e7d /app-admin | |
| parent | This new revision fixes #301594, an issue with the vlan support (diff) | |
| download | historical-c25d1677c74f86675e2f638594df78fab6873410.tar.gz historical-c25d1677c74f86675e2f638594df78fab6873410.tar.bz2 historical-c25d1677c74f86675e2f638594df78fab6873410.zip | |
Don't segfault when /proc/stat exceeds 1024 characters (bug #300611)
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/procinfo/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/procinfo/Manifest | 5 | ||||
| -rw-r--r-- | app-admin/procinfo/files/procinfo-18-stat.patch | 21 | ||||
| -rw-r--r-- | app-admin/procinfo/procinfo-18-r1.ebuild | 5 |
4 files changed, 33 insertions, 6 deletions
diff --git a/app-admin/procinfo/ChangeLog b/app-admin/procinfo/ChangeLog index 783eeab5cbe0..803e8b5e3044 100644 --- a/app-admin/procinfo/ChangeLog +++ b/app-admin/procinfo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/procinfo -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/ChangeLog,v 1.22 2008/05/20 11:47:41 armin76 Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/ChangeLog,v 1.23 2010/01/20 17:04:03 cla Exp $ + + 20 Jan 2010; Dawid Węgliński <cla@gentoo.org> procinfo-18-r1.ebuild, + +files/procinfo-18-stat.patch: + Don't segfault when /proc/stat exceeds 1024 characters (bug #300611) 20 May 2008; Raúl Porcel <armin76@gentoo.org> procinfo-18-r1.ebuild: Add ~ia64 diff --git a/app-admin/procinfo/Manifest b/app-admin/procinfo/Manifest index ddbdf416c39b..9318b5a47fb5 100644 --- a/app-admin/procinfo/Manifest +++ b/app-admin/procinfo/Manifest @@ -1,7 +1,8 @@ AUX cpu-usage-fix.patch 791 RMD160 f752ecda6339d9521b041e316c505aa967bd401c SHA1 5babd00b95a2433f2484c191a989a40ca979337a SHA256 6f1be6a86a4e38008660cb7f5039c5c267a3ec1c0d6819b298473e0aa2797bba AUX kernel-2.6.patch 9954 RMD160 84fbd47891bcbc8bf616efaca8821ba847551e0d SHA1 80c7001b20bc53e7a878caeefb92f7c04520c0f5 SHA256 db154ead361395186e9fe3a120eb71ce1b3cd8df04560459ec44398db7a0b9a1 +AUX procinfo-18-stat.patch 778 RMD160 7c4da5d5c0f52ff2d063124d63887410dce5d412 SHA1 6e14653a42bff96b80d2dd18f8a3e54a2197a55f SHA256 b0312e05e8f77faf73e9dd18e1c8a0133c26159d0fd3032821f883a99444f96f AUX procinfo-flags.patch 373 RMD160 a7530daea19ff2d911c2eef8bd12b43f4d84a45e SHA1 597a13414f698bd207b5fac8c71024b97146576c SHA256 80b65c4444ce0367876e6e083de99402a5abafc5065bee15e5951d5c274e75be DIST procinfo-18.tar.gz 24365 RMD160 be29226d308aa5c437498d56bf5613f7ed7f0290 SHA1 8bc75669cbd27775c3a837209425c5ce76238ebc SHA256 c114e625b87fb06585484eb9f3ff868de165b3e61926fee55479d1bd3de09b99 -EBUILD procinfo-18-r1.ebuild 939 RMD160 48d96b8bd6771248677f5a7036a85e7a07bc116a SHA1 fcb6a9c68a32d90da991349aad0e7b1228a03767 SHA256 2b5500ab5353f8cf1a8ce6e98c6011c6ed753e5aa61906d28dc721a05a79f17c -MISC ChangeLog 2432 RMD160 b566718fb98749217186581dee32be5655950222 SHA1 f4375fb8b0246761de8dc1806b6a306fd8c131e6 SHA256 754a44eaa2559fc169cb4f2e363e29e20238dd0dfd8f1960a07375c2f73f68dd +EBUILD procinfo-18-r1.ebuild 973 RMD160 3604419fc68c50a0b50c889dccd226ff415918f4 SHA1 1980f91e0f54270ca69e09c272703717918ca2fb SHA256 727f7f9b1d33724a97a6c2a4f8c5510066b6e1d2db8132950913aa473faa5e57 +MISC ChangeLog 2606 RMD160 b79c3d5ef808a1360b85ba08ca81b82f70abf8aa SHA1 051e9a89b22c5043d36dd91a6ce6f161b8b8968b SHA256 def0271dd9c4205e2b361e1750cc16bcab4c24616c4ae73ace27e0dbf0d25e1e MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 diff --git a/app-admin/procinfo/files/procinfo-18-stat.patch b/app-admin/procinfo/files/procinfo-18-stat.patch new file mode 100644 index 000000000000..d7dc4a458b28 --- /dev/null +++ b/app-admin/procinfo/files/procinfo-18-stat.patch @@ -0,0 +1,21 @@ +diff -ur procinfo-18/procinfo.c procinfo-18-mod/procinfo.c +--- procinfo-18/procinfo.c 2001-02-25 11:29:16.000000000 +0000 ++++ procinfo-18-mod/procinfo.c 2008-04-16 10:16:29.000000000 +0100 +@@ -76,7 +76,7 @@ + *devicesfp, *filesystemsfp, *interruptsfp, *dmafp, *cmdlinefp, + *versionfp, *cpuinfofp; + +-char line[1024], cmdline[1024], booted[40], *version = NULL, *message = NULL; ++char line[4096], cmdline[1024], booted[40], *version = NULL, *message = NULL; + + float rate = 1.0; /* per interval or per sec */ + +@@ -446,7 +446,7 @@ + */ + char *q; + +- if ((q = strstr (p, "PIC"))) { ++ if ((q = strstr (p, "PIC")) || (q = strstr (p, "MSI"))) { + while (*q != ' ') /* eat up "PIC" or "PIC-foo" */ + q++; + while (*q == ' ') /* eat up spaces */ diff --git a/app-admin/procinfo/procinfo-18-r1.ebuild b/app-admin/procinfo/procinfo-18-r1.ebuild index 78bcafe20f23..287303e59fc3 100644 --- a/app-admin/procinfo/procinfo-18-r1.ebuild +++ b/app-admin/procinfo/procinfo-18-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/procinfo-18-r1.ebuild,v 1.11 2008/05/20 11:47:41 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/procinfo/procinfo-18-r1.ebuild,v 1.12 2010/01/20 17:04:03 cla Exp $ inherit eutils toolchain-funcs @@ -18,6 +18,7 @@ src_unpack() { epatch "${FILESDIR}"/kernel-2.6.patch epatch "${FILESDIR}"/cpu-usage-fix.patch epatch "${FILESDIR}"/${PN}-flags.patch + epatch "${FILESDIR}"/${P}-stat.patch } src_compile() { |