Fixes for overflows buffers taken from debian

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

4 files changed, 239 insertions, 305 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index 755b8f06fd97..b151f490fd5c 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,309 +1,10 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.82 2010/01/06 20:12:05 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.83 2010/11/28 09:29:02 jlec Exp $
 
-  06 Jan 2010; Jeroen Roovers <jer@gentoo.org>
-  -files/iptraf-3.0.0-atheros.patch, -files/iptraf-3.0.0-bnep.patch,
-  -files/iptraf-3.0.0-ipv6-glibc24.patch:
-  Remove unused patches.
+*iptraf-3.0.0-r6 (28 Nov 2010)
 
-  06 Jan 2010; Jeroen Roovers <jer@gentoo.org> -iptraf-3.0.0-r4.ebuild:
-  Remove old.
+  28 Nov 2010; Justin Lecher <jlec@gentoo.org>
+  +files/3.0.0-buffer-overflow.patch, +iptraf-3.0.0-r6.ebuild:
+  Fixes for overflows buffers taken from debian
 
-  06 Jan 2010; Brent Baude <ranger@gentoo.org> iptraf-3.0.0-r5.ebuild:
-  Marking iptraf-3.0.0-r5 ppc64 for bug 291491
-
-  29 Dec 2009; Raúl Porcel <armin76@gentoo.org> iptraf-3.0.0-r5.ebuild:
-  arm/s390/sh stable wrt #291491
-
-  06 Dec 2009; Tobias Klausmann <klausman@gentoo.org>
-  iptraf-3.0.0-r5.ebuild:
-  Stable on alpha, bug #291491
-
-  12 Nov 2009; Jeroen Roovers <jer@gentoo.org> iptraf-3.0.0-r5.ebuild:
-  Stable for HPPA (bug #291491).
-
-  12 Nov 2009; Jeroen Roovers <jer@gentoo.org> iptraf-3.0.0-r4.ebuild,
-  iptraf-3.0.0-r5.ebuild:
-  Fix whitespace. Download ipv6 patch conditionally. Separate unpacking and
-  patching (bug #291491 comment #3).
-
-  12 Nov 2009; Tiago Cunha <tcunha@gentoo.org> iptraf-3.0.0-r5.ebuild:
-  stable sparc, bug 291491
-
-  08 Nov 2009; nixnut <nixnut@gentoo.org> iptraf-3.0.0-r5.ebuild:
-  ppc stable #291491
-
-  04 Nov 2009; Markus Meier <maekke@gentoo.org> iptraf-3.0.0-r5.ebuild:
-  amd64/x86 stable, bug #291491
-
-  21 Mar 2009; Jeroen Roovers <jer@gentoo.org>
-  -files/iptraf-2.7.0-2.6.patch, -files/iptraf-2.7.0-atheros.patch,
-  -files/iptraf-2.7.0-ipv6-glibc24.patch, files/iptraf-3.0.0-Makefile.patch,
-  -iptraf-2.7.0-r1.ebuild, iptraf-3.0.0-r5.ebuild:
-  Remove ancient version. Fix parallel make thanks to Davide Pesavento (bug
-  #262971). Explicate RDEPEND.
-
-  08 Mar 2009; Dawid Węgliński <cla@gentoo.org> iptraf-3.0.0-r4.ebuild,
-  iptraf-3.0.0-r5.ebuild:
-  Migrate to EAPI 2
-
-  30 Dec 2008; Peter Volkov <pva@gentoo.org>
-  +files/iptraf-3.0.0-ipv6-glibc24-updated.patch, iptraf-3.0.0-r5.ebuild:
-  Fixed build issue with uclibc, bug #252874, thank Tom Lloyd for report.
-
-  27 Oct 2008; Peter Volkov <pva@gentoo.org> iptraf-3.0.0-r5.ebuild:
-  ~mips keyworded, bug #237773
-
-*iptraf-3.0.0-r5 (24 Oct 2008)
-
-  24 Oct 2008; Peter Volkov <pva@gentoo.org> +files/iptraf-3.0.0-vlan.patch,
-  -iptraf-3.0.0-r3.ebuild, +iptraf-3.0.0-r5.ebuild:
-  Fixes ability to listen on vlan interfaces, bug #231745, thank Tomas Vasek
-  for report and Ross Dougherty for actual tests. Removed old.
-
-  06 Nov 2007; Markus Rothe <corsair@gentoo.org> iptraf-3.0.0-r4.ebuild:
-  Stable on ppc64; bug #197609
-
-  03 Nov 2007; Raúl Porcel <armin76@gentoo.org> iptraf-3.0.0-r4.ebuild:
-  alpha stable wrt #197609
-
-  02 Nov 2007; Lars Weiler <pylon@gentoo.org> iptraf-3.0.0-r4.ebuild:
-  stable ppc, bug #197609
-
-  02 Nov 2007; Steve Dibb <beandog@gentoo.org> iptraf-3.0.0-r4.ebuild:
-  amd64 stable, bug 197609
-
-  31 Oct 2007; Dawid Węgliński <cla@gentoo.org> iptraf-3.0.0-r4.ebuild:
-  Stable on x86 (bug #197609)
-
-  31 Oct 2007; Jeroen Roovers <jer@gentoo.org> iptraf-3.0.0-r4.ebuild:
-  Stable for HPPA (bug #197609).
-
-  31 Oct 2007; Ferris McCormick <fmccor@gentoo.org> iptraf-3.0.0-r4.ebuild:
-  Sparc stable, fix quoting --- Bug #197609 --- Neat!
-
-  06 Sep 2007; Markus Ullmann <jokey@gentoo.org> -iptraf-3.0.0.ebuild:
-  Cleanup
-
-  03 Sep 2007; Jeroen Roovers <jer@gentoo.org> iptraf-3.0.0-r4.ebuild:
-  Back to ~arch (bug #190032).
-
-*iptraf-3.0.0-r4 (02 Sep 2007)
-
-  02 Sep 2007; <pva@gentoo.org> +files/iptraf-3.0.0-add-devnames.patch,
-  -iptraf-3.0.0-r2.ebuild, +iptraf-3.0.0-r4.ebuild:
-  bnep, ath and misc additional devices reported in bug #190032 by Rui Santos
-  <rsantos AT ruisantos.com> are integrated in one patch and added. Cleaned
-  old ebuild.
-
-  27 Jun 2007; Raúl Porcel <armin76@gentoo.org> iptraf-3.0.0-r3.ebuild:
-  alpha stable wrt #183386
-
-  27 Jun 2007; Christoph Mende <angelos@gentoo.org> iptraf-3.0.0-r3.ebuild:
-  Stable on amd64 wrt bug 183386
-
-  01 May 2007; Marius Mauch <genone@gentoo.org> iptraf-3.0.0-r2.ebuild,
-  iptraf-3.0.0-r3.ebuild:
-  Replacing einfo with elog
-
-  24 Apr 2007; Jeroen Roovers <jer@gentoo.org> iptraf-3.0.0-r3.ebuild:
-  Stable for HPPA too.
-
-  16 Apr 2007; Markus Rothe <corsair@gentoo.org> iptraf-3.0.0-r3.ebuild:
-  Stable on ppc64
-
-  06 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org>
-  iptraf-3.0.0-r3.ebuild:
-  ppc stable
-
-  22 Mar 2007; Gustavo Zacarias <gustavoz@gentoo.org>
-  iptraf-3.0.0-r3.ebuild:
-  Stable on sparc
-
-  20 Mar 2007; Raúl Porcel <armin76@gentoo.org> iptraf-3.0.0-r3.ebuild:
-  x86 stable
-
-  15 Nov 2006; Cedric Krier <ced@ced.homedns.org> iptraf-3.0.0-r3.ebuild:
-  Add flag unicode and fix cross-compile
-
-*iptraf-3.0.0-r3 (14 Nov 2006)
-
-  14 Nov 2006; Cedric Krier <ced@ced.homedns.org>
-  +files/iptraf-3.0.0-ncursesw.patch, +files/iptraf-3.0.0-setlocale.patch,
-  +iptraf-3.0.0-r3.ebuild:
-  Fixed UTF-8 display bug 152883
-
-  16 Oct 2006; Jose Luis Rivero <yoswink@gentoo.org> iptraf-3.0.0-r2.ebuild:
-  Stable on alpha wrt bug #146939
-
-  11 Oct 2006; Markus Rothe <corsair@gentoo.org> iptraf-3.0.0-r2.ebuild:
-  Stable on ppc64; bug #146939
-
-  10 Oct 2006; Jeroen Roovers <jer@gentoo.org> iptraf-3.0.0-r2.ebuild:
-  Stable for HPPA (bug #146939).
-
-  10 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-  iptraf-3.0.0-r2.ebuild:
-  Stable on amd64/x86 wrt bug #146939.
-
-  10 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
-  iptraf-3.0.0-r2.ebuild:
-  Stable on sparc wrt #146939
-
-  10 Oct 2006; Markus Ullmann <jokey@gentoo.org> iptraf-3.0.0-r2.ebuild:
-  stable on arm per bug #146939
-
-  10 Oct 2006; Markus Ullmann <jokey@gentoo.org>
-  files/iptraf-3.0.0-headerfix.patch,
-  files/iptraf-3.0.0-ipv6-headerfix.patch, -iptraf-2.7.0-r2.ebuild,
-  -iptraf-3.0.0-r1.ebuild:
-  Adding linux-headers compile fix wrt bug #144205 thanks to Bo Orsted Andresen
-
-  16 Sep 2006; Markus Rothe <corsair@gentoo.org> iptraf-3.0.0-r2.ebuild:
-  Added ~ppc64
-
-  08 Jul 2006; Lars Weiler <pylon@gentoo.org> iptraf-3.0.0-r2.ebuild:
-  Stable on ppc; gcc-4 related; dragonheart is fine with the move.
-
-  20 May 2006; Thomas Cort <tcort@gentoo.org> iptraf-3.0.0-r2.ebuild:
-  Re-added ~alpha keyword.
-
-  27 Apr 2006; Jason Wever <weeve@gentoo.org> iptraf-3.0.0-r2.ebuild:
-  Re-added ~sparc keyword as it mysteriously went missing.
-
-  15 Apr 2006; Markus Ullmann <jokey@gentoo.org>
-  +files/iptraf-3.0.0-headerfix.patch,
-  +files/iptraf-3.0.0-ipv6-headerfix.patch, iptraf-3.0.0-r2.ebuild:
-  Adding header patches to fix bug #128965, thanks to plasmaroo
-
-*iptraf-3.0.0-r2 (21 Mar 2006)
-*iptraf-2.7.0-r2 (21 Mar 2006)
-
-  21 Mar 2006; Markus Ullmann <jokey@gentoo.org>
-  +files/iptraf-2.7.0-ipv6-glibc24.patch,
-  +files/iptraf-3.0.0-ipv6-glibc24.patch, +iptraf-2.7.0-r2.ebuild,
-  +iptraf-3.0.0-r2.ebuild:
-  Fixed glibc-2.4-dep bug #126479 and added suid-root support bug #125681
-
-  05 Mar 2006; Markus Ullmann <jokey@gentoo.org> iptraf-2.7.0-r1.ebuild,
-  iptraf-3.0.0.ebuild:
-  INSTALL cleanup
-
-*iptraf-3.0.0-r1 (29 Jan 2006)
-
-  29 Jan 2006; Markus Ullmann <jokey@gentoo.org>
-  +files/iptraf-3.0.0-Makefile.patch, +files/iptraf-3.0.0-bnep.patch,
-  +iptraf-3.0.0-r1.ebuild:
-  Adding bnepX support bug #118471, thanks to Jan Spitalnik <jan@spitalnik.net>
-  Adding optional ipv6 support bug #106775
-
-*iptraf-3.0.0 (01 Nov 2005)
-
-  01 Nov 2005; Mike Frysinger <vapier@gentoo.org>
-  +files/iptraf-3.0.0-atheros.patch, +files/iptraf-3.0.0-build.patch,
-  +files/iptraf-3.0.0-linux-headers.patch, +iptraf-3.0.0.ebuild:
-  Version bump #106775 by tonich/Tudor Alexandru Dragos.
-
-  16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
-  Converted to UTF-8, fixed encoding screwups
-
-  18 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
-  files/iptraf-2.7.0-2.6.patch, iptraf-2.7.0-r1.ebuild:
-  Update ipv6 patch revision, which can now be applied unconditionally. This
-  fixes the USE=ipv6 compile failure that resulted from the bug 89458 fix.
-  Both patches can now live in harmony.
-
-  17 Jul 2005; Aaron Walker <ka0ttic@gentoo.org>
-  +files/iptraf-2.7.0-2.6.patch, iptraf-2.7.0-r1.ebuild:
-  Add patch from Aurelien Minet in bug 89458 that fixes compile issues when
-  running a 2.6 kernel.
-
-  25 Jun 2005; Marcelo Goes <vanquirius@gentoo.org> -iptraf-2.7.0.ebuild,
-  iptraf-2.7.0-r1.ebuild:
-  Remove old ebuild, add -j1 to emake.
-
-  10 Apr 2005; Andrej Kacian <ticho@gentoo.org> iptraf-2.7.0-r1.ebuild:
-  Stable on amd64.
-
-  07 Mar 2005; Markus Rothe <corsair@gentoo.org> iptraf-2.7.0-r1.ebuild:
-  Stable on ppc64
-
-  26 Feb 2005; <solar@gentoo.org> +files/iptraf-2.7.0-atheros.patch,
-  iptraf-2.7.0-r1.ebuild:
-  - Add atheros interface support
-
-  25 Jan 2005; Markus Rothe <corsair@gentoo.org> iptraf-2.7.0-r1.ebuild:
-  Added ~ppc64 to KEYWORDS; bug #79367
-
-  23 Jul 2004; Eldad Zack <eldad@gentoo.org> iptraf-2.7.0-r1.ebuild:
-  Fixed URL location of ipv6 patch. Closes #58021.
-
-  09 Jul 2004; Eldad Zack <eldad@gentoo.org> iptraf-2.7.0-r1.ebuild,
-  iptraf-2.7.0.ebuild:
-  Tidy. Added missing IUSE
-
-  09 Jun 2004; Aron Griffis <agriffis@gentoo.org> iptraf-2.7.0-r1.ebuild:
-  Fix use invocation
-
-  05 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> iptraf-2.7.0-r1.ebuild:
-  Stable on alpha.
-
-  28 Dec 2003; Joshua Kinard <kumba@gentoo.org> iptraf-2.7.0-r1.ebuild:
-  Move to mips stable (~mips -> mips)
-
-  02 Nov 2003; Christian Birchinger <joker@gentoo.org> iptraf-2.7.0-r1.ebuild:
-  Added sparc stable keyword
-
-  05 Oct 2003; Brad House <brad_mssw@gentoo.org> iptraf-2.7.0-r1.ebuild:
-  add ~amd64 flag
-
-*iptraf-2.7.0-r1 (03 Aug 2003)
-
-  27 Oct 2003; Guy Martin <gmsoft@gentoo.org> iptraf-2.7.0-r1.ebuild :
-  Marked stable on x86 and hppa.
-
-  04 Aug 2003; Guy Martin <gmsoft@gentoo.org> iptraf-2.7.0-r1.ebuild :
-  Updated ipv6 patch to alpha11.
-
-  03 Aug 2003; Guy Martin <gmsoft@gentoo.org> iptraf-2.7.0-r1.ebuild :
-  Added ipv6 support. Fixed a small bug with path. Marked unstable.
-
-*iptraf-2.7.0 (30 Aug 2002)
-
-  01 Aug 2003; Jan Seidel <tuxus@gentoo.org> iptraf-2.7.0.ebuild :
-  Added mips to keywords.
-
-  04 Mar 2003; Martin Holzer <mholzer@gentoo.org> iptraf-2.7.0.ebuild :
-  Changed dodir to keepdir. Closes #16776.
-
-  18 Feb 2003; Guy Martin <gmsoft@gentoo.org> iptraf-2.7.0.ebuild :
-  Added hppa to keywords.
-
-  02 Feb 2003; Daniel Ahlberg <aliz@gentoo.org> iptraf-2.7.0.ebuild :
-  Closes #14654.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  25 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
-  Added alpha to KEYWORDS.
-
-  30 Aug 2002; Sascha Schwabbauer <cybersystem@gentoo.org> iptraf-2.7.0.ebuild:
-  Added ppc to KEYWORDS.
-
-  18 Aug 2002; Daniel Ahlberg <aliz@telia.com> iptraf-2.7.0.ebuild:
-  Moved bins from /usr/bin to /usr/sbin as suggested in #6517.
-
-  20 Jun 2002; J.Alberto Suárez L. iptraf-2.7.0.ebuild :
-
-  Version bumped.
-
-*iptraf-2.4.0-r1 (1 Feb 2002)
-
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index f7d44fd9595a..561c80220a85 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -1,3 +1,7 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX 3.0.0-buffer-overflow.patch 3714 RMD160 209ce8e7d15f95dff049a9ff57f678b920edad40 SHA1 d842737a3abc58ea442123cf44e67a064df6052c SHA256 1a7c4fa213669524c837976fced9fbc3da42bae6bbb660d7da7c05c70f242c24
 AUX iptraf-3.0.0-Makefile.patch 1311 RMD160 9e83755100f8cc5b1b36bbc41dc2af5679621c87 SHA1 528086a05c2ca8ed4e695df19508b77a72621c57 SHA256 91c5131ca7ff3e408355027d03a6c3abf26f7bff5e85972d5441dc7eae246bf0
 AUX iptraf-3.0.0-add-devnames.patch 2765 RMD160 8975f882802558fe042be71c6488468d8550df4c SHA1 74c2181279e93d5e59e8f9a2c1aee1850d7e5887 SHA256 82c41b11130749bbd0b2b977bca4ed421ceaf7262c8ae8a4a9254bc389bac820
 AUX iptraf-3.0.0-build.patch 949 RMD160 15dfd3e0a9385af04c592b71c4a3ca55ace86fee SHA1 dcb596e6d20fe7db043a4a21a63b8f8b294411b2 SHA256 a0fd3a9ae85f565df9322465aea0163b9bee9268d12b173e63a4bf7b44e3bd91
@@ -11,5 +15,13 @@ AUX iptraf-3.0.0-vlan.patch 1090 RMD160 4bb6b575537a924e2561419732202274e433cf0b
 DIST iptraf-3.0.0-ipv6.patch.bz2 10069 RMD160 021161e47e638590c618c0cb5fbb279e5d5503a7 SHA1 f0032c78f72ba1c3fe7ecbb51135142fb7d3318c SHA256 d13c5447d726d01da2c1ce3bc793c9db5e6874b2f6b351114cc28e24be24998b
 DIST iptraf-3.0.0.tar.gz 575169 RMD160 aaef797076056d6b788a9c9eff29500060594526 SHA1 e5032b564593a8ec336751d41c090e5cdb7663a1 SHA256 9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163
 EBUILD iptraf-3.0.0-r5.ebuild 2161 RMD160 7c651013333dcb271143122fc5d80ff961144197 SHA1 e4d6b99229a0db8c834f9fddf7054ea909bacf5d SHA256 731efabfea3c6413d994f1ae4ff93edbbdd500e6eb0acb60a8e83511ca173ec7
-MISC ChangeLog 11171 RMD160 832938a358b8d31d04b84fce7b4a680e1cee4b31 SHA1 3169ae174971c47d4ed301030822160630337102 SHA256 67a3c94ff0377bd9b8c77655aea1f2b8175d7f8eb175670db5d0704e02ad0fc4
+EBUILD iptraf-3.0.0-r6.ebuild 2134 RMD160 ab4256701a55fa5e72f7356aac3fdc166802c3bf SHA1 cb01708cab998912e0289ccbc21f05421a3f6cc2 SHA256 68108ab75370ec1295eebbb2bfc574925ce48828af69b3b11b2c59ce92288d19
+MISC ChangeLog 401 RMD160 bc8cfdb1ac865992194da3283fd0da392947c7b8 SHA1 41dab80e42f80165d1019149393729c8a874530b SHA256 f4f3a17985c23e67def4f559942aff6ff855d5fcac3f1f1fbe52e503a430fb3c
 MISC metadata.xml 236 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 SHA1 a04ff116faafca0e392581b88eb6c2d9afb82102 SHA256 5b6e4809a5c8961695ce4f6c1a9f83e81782c69b244a610c3999bfd3bb9e699f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzyIOMACgkQgAnW8HDreRZ1pQCgp/ViqJj/IDOqGySFxquZMCPn
+DIgAoK/t2kx1ZiTsm5mY37putJcIo4uU
+=V/nv
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/iptraf/files/3.0.0-buffer-overflow.patch b/net-analyzer/iptraf/files/3.0.0-buffer-overflow.patch
new file mode 100644
index 000000000000..8e4cc5248821
--- /dev/null
+++ b/net-analyzer/iptraf/files/3.0.0-buffer-overflow.patch
@@ -0,0 +1,145 @@
+Patch adopted from debians patches
+
+diff --git a/src/hostmon.c b/src/hostmon.c
+index 14df2c8..7e50575 100644
+--- a/src/hostmon.c
++++ b/src/hostmon.c
+@@ -711,7 +711,7 @@ void hostmon(const struct OPTIONS *options, int facilitytime, char *ifptr,
+     int is_ip;
+     int ch;
+ 
+-    char ifname[10];
++    char ifname[18];
+ 
+     struct timeval tv;
+     unsigned long starttime;
+diff --git a/src/ifstats.c b/src/ifstats.c
+index fac4db5..583279a 100644
+--- a/src/ifstats.c
++++ b/src/ifstats.c
+@@ -129,7 +129,7 @@ void initiflist(struct iflist **list)
+ {
+     FILE *fd;
+     char buf[161];
+-    char ifname[10];
++    char ifname[18];
+     struct iflist *itmp = NULL;
+     struct iflist *tail = NULL;
+     unsigned int index = 0;
+@@ -433,7 +433,7 @@ void ifstats(const struct OPTIONS *options, struct filterstate *ofilter,
+     FILE *logfile = NULL;
+ 
+     int br;
+-    char ifname[10];
++    char ifname[18];
+ 
+     int ch;
+ 
+@@ -760,7 +760,7 @@ void detstats(char *iface, const struct OPTIONS *options, int facilitytime,
+     char *tpacket;
+     unsigned int iphlen;
+ 
+-    char ifname[10];
++    char ifname[18];
+     struct sockaddr_ll fromaddr;
+     unsigned short linktype;
+ 
+diff --git a/src/ifstats.h b/src/ifstats.h
+index 350dd13..abcde1e 100644
+--- a/src/ifstats.h
++++ b/src/ifstats.h
+@@ -6,7 +6,7 @@ ifstats.h - structure definitions for interface counts
+ ***/
+ 
+ struct iflist {
+-    char ifname[8];
++    char ifname[18];
+     unsigned int encap;
+     unsigned long long iptotal;
+     unsigned long badtotal;
+diff --git a/src/itrafmon.c b/src/itrafmon.c
+index a54dcc2..044bae1 100644
+--- a/src/itrafmon.c
++++ b/src/itrafmon.c
+@@ -604,7 +604,7 @@ void ipmon(struct OPTIONS *options,
+     int curwin = 0;
+ 
+     int readlen;
+-    char ifname[10];
++    char ifname[18];
+ 
+     unsigned long long total_pkts = 0;
+ 
+diff --git a/src/othptab.h b/src/othptab.h
+index e412562..ab0d5be 100644
+--- a/src/othptab.h
++++ b/src/othptab.h
+@@ -42,7 +42,7 @@ struct othptabent {
+     int s_fstat;
+     int d_fstat;
+     unsigned int protocol;
+-    char iface[8];
++    char iface[18];
+     unsigned int pkt_length;
+ 
+     union {
+diff --git a/src/promisc.c b/src/promisc.c
+index c3ed691..d126243 100644
+--- a/src/promisc.c
++++ b/src/promisc.c
+@@ -49,7 +49,7 @@ void init_promisc_list(struct promisc_states **list)
+ {
+     FILE *fd;
+     int ifd;
+-    char buf[8];
++    char buf[18];
+     struct promisc_states *ptmp;
+     struct promisc_states *tail = NULL;
+     struct ifreq ifr;
+@@ -81,6 +81,7 @@ void init_promisc_list(struct promisc_states **list)
+              */
+ 
+             if ((strncmp(buf, "eth", 3) == 0) ||
++                (strncmp(buf, "ath", 3) == 0) ||
+                 (strncmp(buf, "fddi", 4) == 0) ||
+                 (strncmp(buf, "tr", 2) == 0) ||
+                 (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
+diff --git a/src/promisc.h b/src/promisc.h
+index c3f07a1..a06471c 100644
+--- a/src/promisc.h
++++ b/src/promisc.h
+@@ -9,7 +9,7 @@
+  */
+ 
+ struct promisc_params {
+-    char ifname[8];
++    char ifname[18];
+     int saved_state;
+     int state_valid;
+ };
+diff --git a/src/serv.c b/src/serv.c
+index c8309ad..f7e7daf 100644
+--- a/src/serv.c
++++ b/src/serv.c
+@@ -739,7 +739,7 @@ void servmon(char *ifname, struct porttab *ports,
+     unsigned short linktype;
+     int br;
+ 
+-    char iface[8];
++    char iface[18];
+     unsigned int idx = 1;
+ 
+     unsigned int sport = 0;
+diff --git a/src/tcptable.h b/src/tcptable.h
+index 3e17793..c029c73 100644
+--- a/src/tcptable.h
++++ b/src/tcptable.h
+@@ -64,7 +64,7 @@ struct tcptableent {
+     unsigned long finack;
+     int partial;
+     int finsent;
+-    char ifname[8];
++    char ifname[18];
+     unsigned int index;
+     int reused;
+     int timedout;
diff --git a/net-analyzer/iptraf/iptraf-3.0.0-r6.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r6.ebuild
new file mode 100644
index 000000000000..83015682f829
--- /dev/null
+++ b/net-analyzer/iptraf/iptraf-3.0.0-r6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r6.ebuild,v 1.1 2010/11/28 09:29:02 jlec Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="IPTraf is an ncurses-based IP LAN monitor"
+HOMEPAGE="http://iptraf.seul.org/"
+SRC_URI="ftp://iptraf.seul.org/pub/iptraf/${P}.tar.gz
+	ipv6? ( mirror://gentoo/${P}-ipv6.patch.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="ipv6 suid unicode"
+
+DEPEND=">=sys-libs/ncurses-5.2-r1[unicode?]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-Makefile.patch" \
+		"${FILESDIR}"/${P}-build.patch \
+		"${FILESDIR}"/${P}-add-devnames.patch \
+		"${FILESDIR}"/${P}-linux-headers.patch
+	use unicode && epatch "${FILESDIR}/${P}-ncursesw.patch" #152883
+	epatch \
+		"${FILESDIR}/${P}-setlocale.patch" \
+		"${FILESDIR}"/${P}-headerfix.patch \
+		"${FILESDIR}"/${P}-vlan.patch \
+		"${FILESDIR}"/${PV}-buffer-overflow.patch
+
+	sed -i \
+		-e 's:/var/local/iptraf:/var/lib/iptraf:g' \
+		-e "s:Documentation/:/usr/share/doc/${PF}:g" \
+		Documentation/*.* || die "sed doc paths"
+
+	if use ipv6 ; then
+		epatch "${DISTDIR}"/${P}-ipv6.patch.bz2
+
+		# bug #126479 and bug #252874
+		epatch "${FILESDIR}"/${P}-ipv6-glibc24-updated.patch
+		epatch "${FILESDIR}"/${P}-ipv6-headerfix.patch #128965
+	fi
+}
+
+src_compile() {
+	if use suid ; then
+		append-flags -DALLOWUSERS
+	fi
+	emake -C src CFLAGS="$CFLAGS" CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dosbin src/{iptraf,rawtime,rvnamed} || die
+	dodoc FAQ README* CHANGES RELEASE-NOTES || die
+	doman Documentation/*.8 || die
+	dohtml -r Documentation/* || die
+	keepdir /var/{lib,run,log}/iptraf || die
+}
+
+pkg_postinst() {
+	if use suid ; then
+		elog
+		elog "You've chosen to build iptraf with run-as-user support"
+		elog
+		elog "The app now has this support, but for security reasons"
+		elog "you need to run the following command to allow your users"
+		elog "to suid-run it:"
+		elog
+		elog " # chmod 4755 /usr/sbin/iptraf"
+		elog
+	fi
+}