summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Volkov <pva@gentoo.org>2008-10-24 15:28:19 +0000
committerPeter Volkov <pva@gentoo.org>2008-10-24 15:28:19 +0000
commit42cfe8c940e5e2828a6fb3363dd49a3a8ec9a2e7 (patch)
treefd691aa64ac28f411bbddab043f1386cec98dafc /net-analyzer
parentAdding dillo-2.0 and dependent library. Crashing here thus no go into the mai... (diff)
downloadpva-42cfe8c940e5e2828a6fb3363dd49a3a8ec9a2e7.tar.gz
pva-42cfe8c940e5e2828a6fb3363dd49a3a8ec9a2e7.tar.bz2
pva-42cfe8c940e5e2828a6fb3363dd49a3a8ec9a2e7.zip
Added to the tree
svn path=/; revision=205
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/iptraf/ChangeLog249
-rw-r--r--net-analyzer/iptraf/Manifest20
-rw-r--r--net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch56
-rw-r--r--net-analyzer/iptraf/files/iptraf-2.7.0-atheros.patch43
-rw-r--r--net-analyzer/iptraf/files/iptraf-2.7.0-ipv6-glibc24.patch30
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch18
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-add-devnames.patch62
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-atheros.patch42
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-bnep.patch43
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-build.patch31
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-headerfix.patch25
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24.patch30
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-headerfix.patch14
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-linux-headers.patch41
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-ncursesw.patch31
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-setlocale.patch19
-rw-r--r--net-analyzer/iptraf/files/iptraf-3.0.0-vlan.patch28
-rw-r--r--net-analyzer/iptraf/iptraf-3.0.0-r4.ebuild84
-rw-r--r--net-analyzer/iptraf/metadata.xml6
19 files changed, 0 insertions, 872 deletions
diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
deleted file mode 100644
index 6683111..0000000
--- a/net-analyzer/iptraf/ChangeLog
+++ /dev/null
@@ -1,249 +0,0 @@
-# ChangeLog for net-analyzer/iptraf
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.67 2007/11/06 17:26:07 corsair Exp $
-
- 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
deleted file mode 100644
index ccd6a0f..0000000
--- a/net-analyzer/iptraf/Manifest
+++ /dev/null
@@ -1,20 +0,0 @@
-AUX iptraf-2.7.0-2.6.patch 1711 RMD160 f839a835d8553803d47dd9c0905254c41ba6e33b SHA1 9f448ea798350f5c97a8623f4b23ac6799bb4979 SHA256 59441534079f43a381c68d48f1160ddd64bbf0ecdc42bd364559287504e8b57a
-AUX iptraf-2.7.0-atheros.patch 1644 RMD160 90c21cbced797182f39c22713bef74e110fe004a SHA1 fef0a734e3ca856e1ab78a7e7c3d9cd112cb9500 SHA256 17d3d64c204297dca178e546b49f5ab980377b3f7a6cfa53c7e724de44eed127
-AUX iptraf-2.7.0-ipv6-glibc24.patch 1299 RMD160 881d15260024a062277abdd88e2f80666fb4722a SHA1 a6c645a18dfc5f3f648b26cf99f7b8695d27f739 SHA256 ef4430bed8ec7fa1ed83f79d537e8520f505279d74e115bafca27e7b88299023
-AUX iptraf-3.0.0-Makefile.patch 740 RMD160 5d7b61d42843c2c2e70e7b33358e11caf4ee73be SHA1 86c65171654f54d7585e39e6bd60a17ca0439bc8 SHA256 d4246568afb834b35deca81e49860335cfa1c57d2f6848d0f3713c34843a9835
-AUX iptraf-3.0.0-add-devnames.patch 2765 RMD160 8975f882802558fe042be71c6488468d8550df4c SHA1 74c2181279e93d5e59e8f9a2c1aee1850d7e5887 SHA256 82c41b11130749bbd0b2b977bca4ed421ceaf7262c8ae8a4a9254bc389bac820
-AUX iptraf-3.0.0-atheros.patch 1508 RMD160 b27416c045e1f0c9de5ea1d3ca3eb1390c87f7ca SHA1 703de9ea7c4674fb6bccfb89ba833caf51846637 SHA256 b7201f79837046fcb787c4e76bafada04236a4c90b45ba5f140eca05c66b33b6
-AUX iptraf-3.0.0-bnep.patch 2156 RMD160 3a054a51015f93f6115758c4cb088e450036665b SHA1 e40e6070ee4c0ab5ece8e5adbc7e61e282dc268e SHA256 dcd54d8dd2cb5c92448359f9ffe9312d6171586fb47a2d091a3c933040713531
-AUX iptraf-3.0.0-build.patch 949 RMD160 15dfd3e0a9385af04c592b71c4a3ca55ace86fee SHA1 dcb596e6d20fe7db043a4a21a63b8f8b294411b2 SHA256 a0fd3a9ae85f565df9322465aea0163b9bee9268d12b173e63a4bf7b44e3bd91
-AUX iptraf-3.0.0-headerfix.patch 728 RMD160 99a4b283f94850dd9365194d86046f35c9042f05 SHA1 176c1a5e4926e8a60e96a5188c652a5cb3f820e0 SHA256 a4f00741052aba3482ddb4d3396b777cda3083e8e77983e200e8aec55b3ce6f8
-AUX iptraf-3.0.0-ipv6-glibc24.patch 1324 RMD160 4e88de3dcc03d87508cf7acf83598dcd62419865 SHA1 c02cbc842a1758394abb38bd3cdd27d42fdd92c2 SHA256 a99ad5aacab94dcc7e6358014809211cfbe5eccb1da152bd3a5a873f650320b6
-AUX iptraf-3.0.0-ipv6-headerfix.patch 460 RMD160 0de05f8d46360c13420c508831e5e9ad45f0a038 SHA1 eb6ea3f504ab78ccddde2bdb1d89ad5d20621658 SHA256 9adae655d64ac02f6b07a08d19083223da602159c8b9532e9863479fe3b321a0
-AUX iptraf-3.0.0-linux-headers.patch 963 RMD160 aac7828fdeab874ad44f6f019398497a1e15d4c5 SHA1 79d90657a8b7ff49e4b0c1792406eec294c05625 SHA256 6fa481ad5111e05f4b4ad84f34bf386ae8cc05f998b3d746ece9fb0c79bac6ae
-AUX iptraf-3.0.0-ncursesw.patch 1296 RMD160 d0c2648b15d0c0e76278f6ba47c7a3da39ebdbb2 SHA1 876073e52255ab283402c984d5dd33bb8df4f415 SHA256 87ff765718a45518c74ae23427a6f3e5b65dfa9c44774b67e9404ec12e8d5e0f
-AUX iptraf-3.0.0-setlocale.patch 474 RMD160 dafa0ce1dce44c1108c1a8e76ce03cde0a918a4f SHA1 6a2bc2ddd4f3b99cf4cbfa90dd32df4ddb94fcc0 SHA256 3e2b39946039d39ed35a17752790ac06be4c7726e71721224d9534d736f71f3a
-AUX iptraf-3.0.0-vlan.patch 1090 RMD160 4bb6b575537a924e2561419732202274e433cf0b SHA1 e958027df27996a867b0f095efbd43ca669ab7d6 SHA256 33e127970c581d88d001b68090242e6ed4ea7581453cb844b75e831bc05fc130
-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-r4.ebuild 2276 RMD160 d62cca3e2bec43f28ee43afcd9a8ea48562b3456 SHA1 cf8693004c8b34cc7fc8215d2e534c67606fbd07 SHA256 fc767d1598f254c275857f8bdd98c19d7572dada6a52c14316266ed43e92815c
-MISC ChangeLog 8889 RMD160 a0f7d04df3c19977b5594a1d9fa24013cc2bad05 SHA1 eebc408981c188fa90d22a6e09509a4b067c02be SHA256 80920bfda03bef09c7a2dbca55f9363963f05a6739df45eb0a8c04a244f8437d
-MISC metadata.xml 236 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 SHA1 a04ff116faafca0e392581b88eb6c2d9afb82102 SHA256 5b6e4809a5c8961695ce4f6c1a9f83e81782c69b244a610c3999bfd3bb9e699f
diff --git a/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch b/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch
deleted file mode 100644
index 35808f5..0000000
--- a/net-analyzer/iptraf/files/iptraf-2.7.0-2.6.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN iptraf-2.7.0.orig/src/othptab.c iptraf-2.7.0/src/othptab.c
---- iptraf-2.7.0.orig/src/othptab.c 2005-07-18 18:55:28.000000000 -0400
-+++ iptraf-2.7.0/src/othptab.c 2005-07-18 18:57:39.000000000 -0400
-@@ -17,9 +17,6 @@
- ***/
-
- #include <asm/types.h>
--#include <linux/if_ether.h>
--#include <linux/if_tr.h>
--#include <linux/if_fddi.h>
-
- #ifdef USE_IPV6
- # include <netinet/ip6.h>
-@@ -27,9 +24,9 @@
- #endif
-
- #include <winops.h>
-+#include "tcptable.h"
- #include "arphdr.h"
- #include "options.h"
--#include "tcptable.h"
- #include "othptab.h"
- #include "deskman.h"
- #include "attrs.h"
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN iptraf-2.7.0.orig/src/packet.c iptraf-2.7.0/src/packet.c
---- iptraf-2.7.0.orig/src/packet.c 2005-07-18 18:55:28.000000000 -0400
-+++ iptraf-2.7.0/src/packet.c 2005-07-18 18:56:13.000000000 -0400
-@@ -35,6 +35,9 @@
- #include <sys/time.h>
- #include <net/if_arp.h>
- #include <net/if.h>
-+#ifdef _NET_IF_H
-+#define _LINUX_IF_H
-+#endif
- #include <sys/ioctl.h>
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
-diff --exclude='*~' --exclude='.*' -I '$Id:' -urN iptraf-2.7.0.orig/src/tcptable.h iptraf-2.7.0/src/tcptable.h
---- iptraf-2.7.0.orig/src/tcptable.h 2005-07-18 18:55:28.000000000 -0400
-+++ iptraf-2.7.0/src/tcptable.h 2005-07-18 18:57:01.000000000 -0400
-@@ -20,11 +20,14 @@
- #include <arpa/inet.h>
- #include <net/if_arp.h>
- #include <asm/types.h>
-+#include <net/if.h>
-+#ifdef _NET_IF_H
-+#define _LINUX_IF_H
-+#endif
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
- #include <linux/if_fddi.h>
- #include <linux/if_tr.h>
--#include <net/if.h>
- #include <netinet/ip.h>
- #include <netinet/udp.h>
- #include "servname.h"
diff --git a/net-analyzer/iptraf/files/iptraf-2.7.0-atheros.patch b/net-analyzer/iptraf/files/iptraf-2.7.0-atheros.patch
deleted file mode 100644
index 3c79401..0000000
--- a/net-analyzer/iptraf/files/iptraf-2.7.0-atheros.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -ur iptraf-2.7.0/src/ifaces.c iptraf-2.7.0-ath0/src/ifaces.c
---- iptraf-2.7.0/src/ifaces.c 2002-05-08 02:43:27.000000000 -0700
-+++ iptraf-2.7.0-ath0/src/ifaces.c 2004-08-05 12:48:53.000000000 -0700
-@@ -32,14 +32,14 @@
- #include "error.h"
-
- extern int accept_unsupported_interfaces;
--#define NUM_SUPPORTED_IFACES 20
-+#define NUM_SUPPORTED_IFACES 21
-
- extern int daemonized;
-
- char ifaces[][6] =
- { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
- "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
-- "pent", "lec" };
-+ "pent", "lec", "ath" };
-
- char *ltrim(char *buf)
- {
-diff -ur iptraf-2.7.0/src/packet.c iptraf-2.7.0-ath0/src/packet.c
---- iptraf-2.7.0/src/packet.c 2002-05-08 02:44:08.000000000 -0700
-+++ iptraf-2.7.0-ath0/src/packet.c 2004-08-05 12:56:57.000000000 -0700
-@@ -80,6 +80,8 @@
- case ARPHRD_ETHER:
- if (strncmp(ifname, "eth", 3) == 0)
- result = LINK_ETHERNET;
-+ else if (strncmp(ifname, "ath", 3) == 0)
-+ result = LINK_ETHERNET;
- else if (strncmp(ifname, "plip", 4) == 0)
- result = LINK_PLIP;
- else if (strncmp(ifname, "fddi", 4) == 0) /* For some Ethernet- */
-diff -ur iptraf-2.7.0/src/promisc.c iptraf-2.7.0-ath0/src/promisc.c
---- iptraf-2.7.0/src/promisc.c 2002-01-15 17:51:03.000000000 -0800
-+++ iptraf-2.7.0-ath0/src/promisc.c 2004-08-05 12:57:20.000000000 -0700
-@@ -81,6 +81,7 @@
- */
-
- if ((strncmp(buf, "eth", 3) == 0) ||
-+ (strncmp(buf, "ath", 3) == 0) ||
- (strncmp(buf, "fddi", 4) == 0) ||
- (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
- (strncmp(ptmp->params.ifname, "lec", 3) == 0) ||
diff --git a/net-analyzer/iptraf/files/iptraf-2.7.0-ipv6-glibc24.patch b/net-analyzer/iptraf/files/iptraf-2.7.0-ipv6-glibc24.patch
deleted file mode 100644
index 5f50209..0000000
--- a/net-analyzer/iptraf/files/iptraf-2.7.0-ipv6-glibc24.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN ./iptraf-2.7.0.orig/src/othptab.c ./iptraf-2.7.0/src/othptab.c
---- ./iptraf-2.7.0.orig/src/othptab.c 2006-03-21 23:13:42.000000000 +0100
-+++ ./iptraf-2.7.0/src/othptab.c 2006-03-21 23:18:58.000000000 +0100
-@@ -595,8 +595,8 @@
- case ICMP6_DST_UNREACH_ADMIN:
- strcpy(additional, "admin");
- break;
-- case ICMP6_DST_UNREACH_NOTNEIGHBOR:
-- strcpy(additional, "not neigh");
-+ case ICMP6_DST_UNREACH_BEYONDSCOPE:
-+ strcpy(additional, "beyondscope");
- break;
- case ICMP6_DST_UNREACH_ADDR:
- strcpy(additional, "unreach addr");
-@@ -627,15 +627,6 @@
- case ND_ROUTER_ADVERT:
- strcpy(description, "router adv");
- break;
-- case ICMP6_MEMBERSHIP_QUERY:
-- strcpy(description, "mbrship query");
-- break;
-- case ICMP6_MEMBERSHIP_REPORT:
-- strcpy(description, "mbrship report");
-- break;
-- case ICMP6_MEMBERSHIP_REDUCTION:
-- strcpy(description, "mbrship reduc");
-- break;
- case ND_NEIGHBOR_SOLICIT:
- strcpy(description, "neigh sol");
- break;
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch
deleted file mode 100644
index 9a5274d..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./iptraf-3.0.0.orig/src/Makefile 2006-01-10 07:51:13.000000000 +0100
-+++ ./iptraf-3.0.0/src/Makefile 2006-01-10 07:53:33.000000000 +0100
-@@ -29,10 +29,11 @@
- # options to be passed to the compiler. I don't believe they need to be
- # modified (except for -m486 on non-Intel x86 platforms).
-
--CFLAGS = -Wall #-O2 #-m486
--DIRS = -DWORKDIR=\"$(WORKDIR)\" \
-- -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"$(TARGET)\"
--LDOPTS = #-static
-+#CFLAGS = -Wall #-O2 #-m486
-+DIRS = -DWORKDIR=\"/var/lib/iptraf\" \
-+ -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"/usr/sbin\"
-+#LDOPTS = #-static
-+LDOPTS = $(LDFLAGS)
-
- # you may want to change this to point to your ncurses include directory
- # if the ncurses include files are not in the default location.
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-add-devnames.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-add-devnames.patch
deleted file mode 100644
index 43dc3b6..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-add-devnames.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Naur iptraf-3.0.0.orig/src/ifaces.c iptraf-3.0.0/src/ifaces.c
---- iptraf-3.0.0.orig/src/ifaces.c 2005-09-13 10:42:54.000000000 +0400
-+++ iptraf-3.0.0/src/ifaces.c 2007-09-02 12:34:21.000000000 +0400
-@@ -32,14 +32,15 @@
- #include "error.h"
-
- extern int accept_unsupported_interfaces;
--#define NUM_SUPPORTED_IFACES 26
-+#define NUM_SUPPORTED_IFACES 35
-
- extern int daemonized;
-
- char ifaces[][6] =
- { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
- "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
-- "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan"
-+ "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "ath",
-+ "bnep", "dsl", "modem", "ni", "br", "tap", "dummy", "vmnet"
- };
-
- char *ltrim(char *buf)
-diff -Naur iptraf-3.0.0.orig/src/packet.c iptraf-3.0.0/src/packet.c
---- iptraf-3.0.0.orig/src/packet.c 2005-09-13 10:42:54.000000000 +0400
-+++ iptraf-3.0.0/src/packet.c 2007-09-02 12:37:52.000000000 +0400
-@@ -107,6 +107,20 @@
- result = LINK_ETHERNET;
- else if (strncmp(ifname, "tap", 3) == 0)
- result = LINK_ETHERNET;
-+ else if (strncmp(ifname, "ath", 3) == 0)
-+ result = LINK_ETHERNET;
-+ else if (strncmp(ifname, "bnep", 4) == 0)
-+ result = LINK_ETHERNET;
-+ else if (strncmp(ifname, "ni", 2) == 0)
-+ result = LINK_ETHERNET;
-+ else if (strncmp(ifname, "tap", 3) == 0)
-+ result = LINK_ETHERNET;
-+ else if (strncmp(ifname, "dummy", 5) == 0)
-+ result = LINK_ETHERNET;
-+ else if (strncmp(ifname, "br", 2) == 0)
-+ result = LINK_ETHERNET;
-+ else if (strncmp(ifname, "vmnet", 5) == 0)
-+ result = LINK_ETHERNET;
- else if ((strncmp(ifname, "isdn", 4) == 0) && (isdn_fd != -1)) {
- isdnent = isdn_table_lookup(isdnlist, ifname, isdn_fd);
-
-diff -Naur iptraf-3.0.0.orig/src/promisc.c iptraf-3.0.0/src/promisc.c
---- iptraf-3.0.0.orig/src/promisc.c 2005-09-13 10:42:54.000000000 +0400
-+++ iptraf-3.0.0/src/promisc.c 2007-09-02 12:38:54.000000000 +0400
-@@ -83,6 +83,13 @@
- if ((strncmp(buf, "eth", 3) == 0) ||
- (strncmp(buf, "fddi", 4) == 0) ||
- (strncmp(buf, "tr", 2) == 0) ||
-+ (strncmp(buf, "ath", 3) == 0) ||
-+ (strncmp(buf, "bnep", 4) == 0) ||
-+ (strncmp(buf, "ni", 2) == 0) ||
-+ (strncmp(buf, "tap", 3) == 0) ||
-+ (strncmp(buf, "dummy", 5) == 0) ||
-+ (strncmp(buf, "br", 2) == 0) ||
-+ (strncmp(buf, "vmnet", 5) == 0) ||
- (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
- (strncmp(ptmp->params.ifname, "lec", 3) == 0) ||
- (accept_unsupported_interfaces)) {
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-atheros.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-atheros.patch
deleted file mode 100644
index a903cfd..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-atheros.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Add support for 'ath' interfaces
-
---- iptraf-3.0.0/src/ifaces.c
-+++ iptraf-3.0.0/src/ifaces.c
-@@ -32,14 +32,14 @@
- #include "error.h"
-
- extern int accept_unsupported_interfaces;
--#define NUM_SUPPORTED_IFACES 26
-+#define NUM_SUPPORTED_IFACES 27
-
- extern int daemonized;
-
- char ifaces[][6] =
- { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
- "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
-- "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan"
-+ "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "ath"
- };
-
- char *ltrim(char *buf)
---- iptraf-3.0.0/src/packet.c
-+++ iptraf-3.0.0/src/packet.c
-@@ -110,6 +110,8 @@
- result = LINK_ETHERNET;
- else if (strncmp(ifname, "tap", 3) == 0)
- result = LINK_ETHERNET;
-+ else if (strncmp(ifname, "ath", 3) == 0)
-+ result = LINK_ETHERNET;
- else if ((strncmp(ifname, "isdn", 4) == 0) && (isdn_fd != -1)) {
- isdnent = isdn_table_lookup(isdnlist, ifname, isdn_fd);
-
---- iptraf-3.0.0/src/promisc.c
-+++ iptraf-3.0.0/src/promisc.c
-@@ -83,6 +83,7 @@
- if ((strncmp(buf, "eth", 3) == 0) ||
- (strncmp(buf, "fddi", 4) == 0) ||
- (strncmp(buf, "tr", 2) == 0) ||
-+ (strncmp(buf, "ath", 3) == 0) ||
- (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
- (strncmp(ptmp->params.ifname, "lec", 3) == 0) ||
- (accept_unsupported_interfaces)) {
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-bnep.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-bnep.patch
deleted file mode 100644
index 881ca92..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-bnep.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --exclude=CVS --exclude=.svn -up --new-file --recursive iptraf-3.0.0.old/src/ifaces.c iptraf-3.0.0/src/ifaces.c
---- iptraf-3.0.0.old/src/ifaces.c 2006-01-10 01:13:49.000000000 +0100
-+++ iptraf-3.0.0/src/ifaces.c 2006-01-10 01:14:41.000000000 +0100
-@@ -32,14 +32,14 @@ details.
- #include "error.h"
-
- extern int accept_unsupported_interfaces;
--#define NUM_SUPPORTED_IFACES 27
-+#define NUM_SUPPORTED_IFACES 28
-
- extern int daemonized;
-
- char ifaces[][6] =
- { "lo", "eth", "sl", "ppp", "ippp", "plip", "fddi", "isdn", "dvb",
- "pvc", "hdlc", "ipsec", "sbni", "tr", "wvlan", "wlan", "sm2", "sm3",
-- "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "ath"
-+ "pent", "lec", "brg", "tun", "tap", "cipcb", "tunl", "vlan", "ath", "bnep"
- };
-
- char *ltrim(char *buf)
-diff --exclude=CVS --exclude=.svn -up --new-file --recursive iptraf-3.0.0.old/src/packet.c iptraf-3.0.0/src/packet.c
---- iptraf-3.0.0.old/src/packet.c 2006-01-10 01:13:49.000000000 +0100
-+++ iptraf-3.0.0/src/packet.c 2006-01-10 01:15:51.000000000 +0100
-@@ -112,6 +112,8 @@ unsigned short getlinktype(unsigned shor
- result = LINK_ETHERNET;
- else if (strncmp(ifname, "ath", 3) == 0)
- result = LINK_ETHERNET;
-+ else if (strncmp(ifname, "bnep", 4) == 0)
-+ result = LINK_ETHERNET;
- else if ((strncmp(ifname, "isdn", 4) == 0) && (isdn_fd != -1)) {
- isdnent = isdn_table_lookup(isdnlist, ifname, isdn_fd);
-
-diff --exclude=CVS --exclude=.svn -up --new-file --recursive iptraf-3.0.0.old/src/promisc.c iptraf-3.0.0/src/promisc.c
---- iptraf-3.0.0.old/src/promisc.c 2006-01-10 01:13:49.000000000 +0100
-+++ iptraf-3.0.0/src/promisc.c 2006-01-10 01:17:02.000000000 +0100
-@@ -84,6 +84,7 @@ void init_promisc_list(struct promisc_st
- (strncmp(buf, "fddi", 4) == 0) ||
- (strncmp(buf, "tr", 2) == 0) ||
- (strncmp(buf, "ath", 3) == 0) ||
-+ (strncmp(buf, "bnep", 4) == 0) ||
- (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) ||
- (strncmp(ptmp->params.ifname, "lec", 3) == 0) ||
- (accept_unsupported_interfaces)) {
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-build.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-build.patch
deleted file mode 100644
index 2e03d81..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-build.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/Makefile
-+++ src/Makefile
-@@ -6,7 +6,5 @@
- # Architecture determination string borrowed from the kernel makefile.
- #
--ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
-- -e s/arm.*/arm/ -e s/sa110/arm/)
--PLATFORM = -DPLATFORM=\"$(shell uname -s)/$(ARCH)\"
-+PLATFORM = -DPLATFORM=\"$(CHOST)\"
- VERNUMBER := $(shell cat version)
- VERSION = -DVERSION=\"$(VERNUMBER)\"
-@@ -38,5 +37,5 @@
- # if the ncurses include files are not in the default location.
-
--INCLUDEDIR = -I/usr/include/ncurses -I../support
-+INCLUDEDIR = -I../support
-
- # You can uncomment this one to disable the backspace key in input fields.
---- support/Makefile
-+++ support/Makefile
-@@ -1,3 +1,2 @@
--INCLUDEDIR = -I/usr/include/ncurses
-
- OBJS = input.o menurt.o listbox.o winops.o labels.o \
-@@ -13,5 +12,5 @@
-
- %.o: %.c *.h
-- gcc -O2 -g -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $<
-+ $(CC) $(CFLAGS) -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $<
-
- clean:
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-headerfix.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-headerfix.patch
deleted file mode 100644
index 604d63e..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-headerfix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -Naur iptraf-3.0.0-minus/src/othptab.c iptraf-3.0.0/src/othptab.c
---- iptraf-3.0.0-minus/src/othptab.c 2006-09-27 03:30:33.000000000 +0200
-+++ iptraf-3.0.0/src/othptab.c 2006-09-27 03:34:24.000000000 +0200
-@@ -17,6 +17,7 @@
- ***/
-
- #include <asm/types.h>
-+#include <sys/types.h>
- #include <linux/if_ether.h>
- #include <winops.h>
- #include "arphdr.h"
-diff -Naur iptraf-3.0.0-minus/src/tr.c iptraf-3.0.0/src/tr.c
---- iptraf-3.0.0-minus/src/tr.c 2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/tr.c 2006-09-27 03:32:54.000000000 +0200
-@@ -7,8 +7,8 @@
- */
-
- #include <asm/types.h>
--#include <linux/if_tr.h>
- #include <netinet/in.h>
-+#include <linux/if_tr.h>
-
- unsigned int get_tr_ip_offset(unsigned char *pkt)
- {
-
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24.patch
deleted file mode 100644
index 05171fb..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -urN ./iptraf-3.0.0.orig/src/othptab.c ./iptraf-3.0.0/src/othptab.c
---- ./iptraf-3.0.0.orig/src/othptab.c 2006-03-21 23:41:53.000000000 +0100
-+++ ./iptraf-3.0.0/src/othptab.c 2006-03-21 23:42:30.000000000 +0100
-@@ -560,8 +560,8 @@
- case ICMP6_DST_UNREACH_ADMIN:
- strcpy(additional, "admin");
- break;
-- case ICMP6_DST_UNREACH_NOTNEIGHBOR:
-- strcpy(additional, "not neigh");
-+ case ICMP6_DST_UNREACH_BEYONDSCOPE:
-+ strcpy(additional, "beyondscope");
- break;
- case ICMP6_DST_UNREACH_ADDR:
- strcpy(additional, "unreach addr");
-@@ -592,15 +592,6 @@
- case ND_ROUTER_ADVERT:
- strcpy(description, "router adv");
- break;
-- case ICMP6_MEMBERSHIP_QUERY:
-- strcpy(description, "mbrship query");
-- break;
-- case ICMP6_MEMBERSHIP_REPORT:
-- strcpy(description, "mbrship report");
-- break;
-- case ICMP6_MEMBERSHIP_REDUCTION:
-- strcpy(description, "mbrship reduc");
-- break;
- case ND_NEIGHBOR_SOLICIT:
- strcpy(description, "neigh sol");
- break;
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-headerfix.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-headerfix.patch
deleted file mode 100644
index 40b95f3..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-headerfix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN ./iptraf-3.0.0.orig/src/othptab.c ./iptraf-3.0.0/src/othptab.c
---- ./iptraf-3.0.0.orig/src/othptab.c 2006-04-16 00:20:52.000000000 +0200
-+++ ./iptraf-3.0.0/src/othptab.c 2006-04-16 00:22:01.000000000 +0200
-@@ -17,9 +17,9 @@
-
- #include <asm/types.h>
- #include <sys/types.h>
--#include <linux/if_ether.h>
- #include <netinet/ip6.h>
- #include <netinet/icmp6.h>
-+#include <linux/if_ether.h>
- #include <winops.h>
- #include "arphdr.h"
- #include "options.h"
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-linux-headers.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-linux-headers.patch
deleted file mode 100644
index 0afffc0..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-linux-headers.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- iptraf-3.0.0/src/othptab.c
-+++ iptraf-3.0.0/src/othptab.c
-@@ -17,8 +17,6 @@
-
- #include <asm/types.h>
- #include <linux/if_ether.h>
--#include <linux/if_tr.h>
--#include <linux/if_fddi.h>
- #include <winops.h>
- #include "arphdr.h"
- #include "options.h"
---- iptraf-3.0.0/src/packet.c
-+++ iptraf-3.0.0/src/packet.c
-@@ -32,6 +32,9 @@
- #include <sys/time.h>
- #include <net/if_arp.h>
- #include <net/if.h>
-+#ifdef _NET_IF_H
-+#define _LINUX_IF_H
-+#endif
- #include <sys/ioctl.h>
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
---- iptraf-3.0.0/src/tcptable.h
-+++ iptraf-3.0.0/src/tcptable.h
-@@ -20,11 +20,14 @@
- #include <arpa/inet.h>
- #include <net/if_arp.h>
- #include <asm/types.h>
-+#include <net/if.h>
-+#ifdef _NET_IF_H
-+#define _LINUX_IF_H
-+#endif
- #include <linux/if_packet.h>
- #include <linux/if_ether.h>
- #include <linux/if_fddi.h>
- #include <linux/if_tr.h>
--#include <net/if.h>
- #include <netinet/ip.h>
- #include <netinet/udp.h>
- #include "servname.h"
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-ncursesw.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-ncursesw.patch
deleted file mode 100644
index a75a014..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-ncursesw.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ru iptraf-3.0.0~/src/Makefile iptraf-3.0.0/src/Makefile
---- iptraf-3.0.0~/src/Makefile 2006-11-14 21:14:31.000000000 +0100
-+++ iptraf-3.0.0/src/Makefile 2006-11-14 21:15:12.000000000 +0100
-@@ -18,7 +18,7 @@
- BINDIR = ../../iptraf-$(VERNUMBER).bin.$(ARCH)
-
- CC = gcc
--LIBS = -L../support -ltextbox -lpanel -lncurses # in this order!
-+LIBS = -L../support -ltextbox -lpanelw -lncursesw # in this order!
-
- # comment this one out to omit debug code when done.
-
-@@ -163,7 +163,7 @@
- # and the compiled programs for release as a ready-to-run distribution.
-
- dist-bin: all
-- $(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanel.a /usr/lib/libncurses.a
-+ $(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanelw.a /usr/lib/libncursesw.a
- rm -rf $(BINDIR)
- mkdir $(BINDIR)
- /bin/cp -p ../CHANGES ../LICENSE ../FAQ ../INSTALL ../README* \
-@@ -179,7 +179,7 @@
- # Just in case anyone needs to link a static binary
- #
- static: $(OBJS)
-- $(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanel -lncurses
-+ $(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanelw -lncursesw
- $(CC) -static -o rvnamed rvnamed.o getpath.o
- $(CC) -static -o rawtime rawtime.c
-
-Only in iptraf-3.0.0~/src: Makefile.orig
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-setlocale.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-setlocale.patch
deleted file mode 100644
index 073a8c4..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-setlocale.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- iptraf-3.0.0/src/iptraf.c.orig 2005-09-13 08:42:54.000000000 +0200
-+++ iptraf-3.0.0/src/iptraf.c 2006-01-30 08:38:49.000000000 +0100
-@@ -39,6 +39,7 @@
- #include <menurt.h>
- #include <winops.h>
- #include <msgboxes.h>
-+#include <locale.h>
- #include "dirs.h"
- #include "deskman.h"
- #include "fltdefs.h"
-@@ -499,6 +500,8 @@
- }
- #endif
-
-+ setlocale(LC_ALL, "");
-+
- strcpy(current_logfile, "");
- strcpy(graphing_logfile, "");
- strcpy(graphing_filter, "");
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-vlan.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-vlan.patch
deleted file mode 100644
index f0087bf..0000000
--- a/net-analyzer/iptraf/files/iptraf-3.0.0-vlan.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- src/packet.c.orig 2008-03-07 17:56:48.000000000 +0200
-+++ src/packet.c 2008-03-07 18:05:41.000000000 +0200
-@@ -101,8 +101,8 @@
- result = LINK_ETHERNET;
- else if (strncmp(ifname, "tun", 3) == 0)
- result = LINK_ETHERNET;
-- else if (strncmp(ifname, "vlan", 3) == 0)
-- result = LINK_VLAN;
-+ else if (strncmp(ifname, "vlan", 4) == 0)
-+ result = LINK_ETHERNET;
- else if (strncmp(ifname, "brg", 3) == 0)
- result = LINK_ETHERNET;
- else if (strncmp(ifname, "tap", 3) == 0)
-@@ -231,14 +231,6 @@
- case LINK_IPIP:
- *packet = tpacket;
- break;
-- case LINK_VLAN:
-- *packet = tpacket + VLAN_ETH_HLEN;
-- readlen -= VLAN_ETH_HLEN;
-- /*
-- * Move IP datagram into an aligned buffer.
-- */
-- memmove(aligned_buf, *packet, min(SNAPSHOT_LEN, *readlen));
-- *packet = aligned_buf;
- default:
- *packet = (char *) NULL; /* return a NULL packet to signal */
- break; /* an unrecognized link protocol */
diff --git a/net-analyzer/iptraf/iptraf-3.0.0-r4.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r4.ebuild
deleted file mode 100644
index f11b7a1..0000000
--- a/net-analyzer/iptraf/iptraf-3.0.0-r4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2008 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-r4.ebuild,v 1.10 2008/01/10 09:11:00 vapier Exp $
-
-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
- mirror://gentoo/${P}-ipv6.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
-IUSE="ipv6 suid unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2-r1"
-
-pkg_setup() {
- if use unicode && ! built_with_use sys-libs/ncurses unicode; then
- eerror "sys-libs/ncurses must be build with unicode"
- die "${PN} requires sys-libs/ncurses with USE=unicode"
- fi
-}
-
-src_unpack() {
- unpack ${P}.tar.gz
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-Makefile.patch"
- epatch "${FILESDIR}"/${P}-build.patch
- epatch "${FILESDIR}"/${P}-add-devnames.patch
- epatch "${FILESDIR}"/${P}-linux-headers.patch
- use unicode && epatch "${FILESDIR}/${P}-ncursesw.patch" #152883
- epatch "${FILESDIR}/${P}-setlocale.patch"
- epatch "${FILESDIR}"/${P}-headerfix.patch #128965
- epatch "${FILESDIR}"/${P}-vlan.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
- if has_version '>=sys-libs/glibc-2.4' ; then
- epatch "${FILESDIR}"/${P}-ipv6-glibc24.patch
- fi
-
- # bug 128965
- epatch "${FILESDIR}"/${P}-ipv6-headerfix.patch
- 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
- doman Documentation/*.8
- dohtml -r Documentation/*
- keepdir /var/{lib,run,log}/iptraf
-}
-
-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
-}
diff --git a/net-analyzer/iptraf/metadata.xml b/net-analyzer/iptraf/metadata.xml
deleted file mode 100644
index 06c38a1..0000000
--- a/net-analyzer/iptraf/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>netmon</herd>
-<longdescription>IPTraf is an ncurses-based IP LAN monitor</longdescription>
-</pkgmetadata>