Adding linux-headers compile fix wrt bug #144205 thanks to Bo Orsted Andresen

(Portage version: 2.1.2_pre2-r6)
 (Signed Manifest commit)

5 files changed, 23 insertions, 161 deletions

diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index e73c0b9ca98e..3875e0bd0615 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX iptraf-2.7.0-2.6.patch 1711 RMD160 f839a835d8553803d47dd9c0905254c41ba6e33b SHA1 9f448ea798350f5c97a8623f4b23ac6799bb4979 SHA256 59441534079f43a381c68d48f1160ddd64bbf0ecdc42bd364559287504e8b57a
 MD5 98fb7659373bc05930f0f3837135c811 files/iptraf-2.7.0-2.6.patch 1711
 RMD160 f839a835d8553803d47dd9c0905254c41ba6e33b files/iptraf-2.7.0-2.6.patch 1711
@@ -26,38 +29,30 @@ AUX iptraf-3.0.0-build.patch 949 RMD160 15dfd3e0a9385af04c592b71c4a3ca55ace86fee
 MD5 20c0e87723c58d6ce51de7fc3af1781a files/iptraf-3.0.0-build.patch 949
 RMD160 15dfd3e0a9385af04c592b71c4a3ca55ace86fee files/iptraf-3.0.0-build.patch 949
 SHA256 a0fd3a9ae85f565df9322465aea0163b9bee9268d12b173e63a4bf7b44e3bd91 files/iptraf-3.0.0-build.patch 949
-AUX iptraf-3.0.0-headerfix.patch 376 RMD160 28db2b6bbfad091c4b1662b6181c3dce5c4fb023 SHA1 2ddbc4b02adb64da7a5c660c3d611828c515debc SHA256 5d667b5186c4135dd569e7ff3613a13498aacc4bc9357b865f40695b87e02cc9
-MD5 b0b0afa24758a3811a34426b28feec3e files/iptraf-3.0.0-headerfix.patch 376
-RMD160 28db2b6bbfad091c4b1662b6181c3dce5c4fb023 files/iptraf-3.0.0-headerfix.patch 376
-SHA256 5d667b5186c4135dd569e7ff3613a13498aacc4bc9357b865f40695b87e02cc9 files/iptraf-3.0.0-headerfix.patch 376
+AUX iptraf-3.0.0-headerfix.patch 728 RMD160 99a4b283f94850dd9365194d86046f35c9042f05 SHA1 176c1a5e4926e8a60e96a5188c652a5cb3f820e0 SHA256 a4f00741052aba3482ddb4d3396b777cda3083e8e77983e200e8aec55b3ce6f8
+MD5 1d7f4a5c81086463452e73dae1799acf files/iptraf-3.0.0-headerfix.patch 728
+RMD160 99a4b283f94850dd9365194d86046f35c9042f05 files/iptraf-3.0.0-headerfix.patch 728
+SHA256 a4f00741052aba3482ddb4d3396b777cda3083e8e77983e200e8aec55b3ce6f8 files/iptraf-3.0.0-headerfix.patch 728
 AUX iptraf-3.0.0-ipv6-glibc24.patch 1324 RMD160 4e88de3dcc03d87508cf7acf83598dcd62419865 SHA1 c02cbc842a1758394abb38bd3cdd27d42fdd92c2 SHA256 a99ad5aacab94dcc7e6358014809211cfbe5eccb1da152bd3a5a873f650320b6
 MD5 d2fea82d823f7372e4d0dad01440ea53 files/iptraf-3.0.0-ipv6-glibc24.patch 1324
 RMD160 4e88de3dcc03d87508cf7acf83598dcd62419865 files/iptraf-3.0.0-ipv6-glibc24.patch 1324
 SHA256 a99ad5aacab94dcc7e6358014809211cfbe5eccb1da152bd3a5a873f650320b6 files/iptraf-3.0.0-ipv6-glibc24.patch 1324
-AUX iptraf-3.0.0-ipv6-headerfix.patch 442 RMD160 c2703551f6c306a8691fb73f4c10d7c73a016a9b SHA1 c27f1abf3cc15b95e4e77a3e3d33975ac1060a89 SHA256 943fe8ebb745363c90c2a5f1b1c8c1616baad86a12e7ef4c6865c4c0c6f182ae
-MD5 943fa327945f1f752d9d89a03d9c480b files/iptraf-3.0.0-ipv6-headerfix.patch 442
-RMD160 c2703551f6c306a8691fb73f4c10d7c73a016a9b files/iptraf-3.0.0-ipv6-headerfix.patch 442
-SHA256 943fe8ebb745363c90c2a5f1b1c8c1616baad86a12e7ef4c6865c4c0c6f182ae files/iptraf-3.0.0-ipv6-headerfix.patch 442
+AUX iptraf-3.0.0-ipv6-headerfix.patch 460 RMD160 0de05f8d46360c13420c508831e5e9ad45f0a038 SHA1 eb6ea3f504ab78ccddde2bdb1d89ad5d20621658 SHA256 9adae655d64ac02f6b07a08d19083223da602159c8b9532e9863479fe3b321a0
+MD5 3002c74439b74851cea4391dd9d3f2b7 files/iptraf-3.0.0-ipv6-headerfix.patch 460
+RMD160 0de05f8d46360c13420c508831e5e9ad45f0a038 files/iptraf-3.0.0-ipv6-headerfix.patch 460
+SHA256 9adae655d64ac02f6b07a08d19083223da602159c8b9532e9863479fe3b321a0 files/iptraf-3.0.0-ipv6-headerfix.patch 460
 AUX iptraf-3.0.0-linux-headers.patch 963 RMD160 aac7828fdeab874ad44f6f019398497a1e15d4c5 SHA1 79d90657a8b7ff49e4b0c1792406eec294c05625 SHA256 6fa481ad5111e05f4b4ad84f34bf386ae8cc05f998b3d746ece9fb0c79bac6ae
 MD5 59493b3c2f0bb06541a55aeffd9f097c files/iptraf-3.0.0-linux-headers.patch 963
 RMD160 aac7828fdeab874ad44f6f019398497a1e15d4c5 files/iptraf-3.0.0-linux-headers.patch 963
 SHA256 6fa481ad5111e05f4b4ad84f34bf386ae8cc05f998b3d746ece9fb0c79bac6ae files/iptraf-3.0.0-linux-headers.patch 963
 DIST iptraf-2.7.0-ipv6-alpha12.diff 57251 RMD160 5a1851ea0c5fa8d9a5f7910b80c8f35192d8ed6c SHA1 7ea33075729a2a77549fa122749752953ebd7933 SHA256 fca50b42120ae5dd4c86b00880c7867a4c9e6f804cd7d22ea3c8b8d4e1cf05a3
 DIST iptraf-2.7.0.tar.gz 363496 RMD160 49e09c9e74a09828c477cc22d75f9e64114d390b SHA1 f5ec59aaa31721e285e0cd509acf0026d47f4489 SHA256 5a335c8c22d02f7ccc640b37fcc7c0ea6840d4287e532a9efd0d0c9b6f1a16ae
-DIST iptraf-3.0.0-ipv6.patch.bz2 10069 RMD160 021161e47e638590c618c0cb5fbb279e5d5503a7 SHA256 d13c5447d726d01da2c1ce3bc793c9db5e6874b2f6b351114cc28e24be24998b
+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-2.7.0-r1.ebuild 1446 RMD160 3e404caad9c14fe86b82167a8fdb9e2104aee8a6 SHA1 73448ecbfaaaed65559a84fe60ae7bda962bfbdb SHA256 f821f149f1f857f2cda01711c04ec01ddbb10de9fc6e8b82b8a1007feac66f9b
 MD5 0b0ef8d085bb59d6a8804b37c0c9d382 iptraf-2.7.0-r1.ebuild 1446
 RMD160 3e404caad9c14fe86b82167a8fdb9e2104aee8a6 iptraf-2.7.0-r1.ebuild 1446
 SHA256 f821f149f1f857f2cda01711c04ec01ddbb10de9fc6e8b82b8a1007feac66f9b iptraf-2.7.0-r1.ebuild 1446
-EBUILD iptraf-2.7.0-r2.ebuild 1912 RMD160 4d1018fa1560003ec0d6a9332d73349b5c6f1149 SHA1 696a4ec3cf296101db67f52a2e277d7ef5efe776 SHA256 d1c315c154eb27110aa5c1e3846d585fa5bef38fa8c8e5e013e2f903c444a842
-MD5 123828496022cf41466a812d1322bb96 iptraf-2.7.0-r2.ebuild 1912
-RMD160 4d1018fa1560003ec0d6a9332d73349b5c6f1149 iptraf-2.7.0-r2.ebuild 1912
-SHA256 d1c315c154eb27110aa5c1e3846d585fa5bef38fa8c8e5e013e2f903c444a842 iptraf-2.7.0-r2.ebuild 1912
-EBUILD iptraf-3.0.0-r1.ebuild 1211 RMD160 3a38fb3aa64099fdf045f644001678ac620525d1 SHA1 8bebe5c0aec187646791782e3edfc9e0beb783cb SHA256 875e521ff99538b66aeb894a38a0f80eb120cfd6fa426a0009e9ae5e18d12aaa
-MD5 28828d5f3b6ea64612609f2f4644bb9a iptraf-3.0.0-r1.ebuild 1211
-RMD160 3a38fb3aa64099fdf045f644001678ac620525d1 iptraf-3.0.0-r1.ebuild 1211
-SHA256 875e521ff99538b66aeb894a38a0f80eb120cfd6fa426a0009e9ae5e18d12aaa iptraf-3.0.0-r1.ebuild 1211
 EBUILD iptraf-3.0.0-r2.ebuild 1913 RMD160 e0340fad5a9ef31b25e014f76eed230720411dc2 SHA1 a7a12f2eaf5f4339ee7a19096ff2262e3dcfd218 SHA256 341b6abde272207bf23eb12f37595e626cb1c65eb82c285fce52f4fce46380a7
 MD5 cb29b487d6aec1673eecdef6c7033ba5 iptraf-3.0.0-r2.ebuild 1913
 RMD160 e0340fad5a9ef31b25e014f76eed230720411dc2 iptraf-3.0.0-r2.ebuild 1913
@@ -66,10 +61,10 @@ EBUILD iptraf-3.0.0.ebuild 1159 RMD160 58705f93422f1fe1cbf0bb4e192b1ae624d60f32
 MD5 31ec4dadb0b55040e589c0048b14298b iptraf-3.0.0.ebuild 1159
 RMD160 58705f93422f1fe1cbf0bb4e192b1ae624d60f32 iptraf-3.0.0.ebuild 1159
 SHA256 eab8f746729101314443f0494c0d65255ef6b15f84329be84520af085acf88a0 iptraf-3.0.0.ebuild 1159
-MISC ChangeLog 5573 RMD160 baa71669fbde04d69fa80cbcc87d5fd6e94df985 SHA1 a4fbbb65e15d95b7c79c70d64134c7c94d4e89b7 SHA256 f1037e2a24d8d4592171d40d72c1dbf4bbca897f17ce8224cb344c9c3069d48c
-MD5 bc9bc96af7a73cdfed63035f04041b26 ChangeLog 5573
-RMD160 baa71669fbde04d69fa80cbcc87d5fd6e94df985 ChangeLog 5573
-SHA256 f1037e2a24d8d4592171d40d72c1dbf4bbca897f17ce8224cb344c9c3069d48c ChangeLog 5573
+MISC ChangeLog 5834 RMD160 e471634ff20845ed9100a2bb7029a663ae745167 SHA1 2119cbc5b4b0f64546eb1502d4a49289890e2b28 SHA256 e06418dc7299a8eb1c3ea5e61d807955621f857b32a8413508164c0776402e98
+MD5 85c1215c1234bbacabfb6b678ae33e60 ChangeLog 5834
+RMD160 e471634ff20845ed9100a2bb7029a663ae745167 ChangeLog 5834
+SHA256 e06418dc7299a8eb1c3ea5e61d807955621f857b32a8413508164c0776402e98 ChangeLog 5834
 MISC metadata.xml 236 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 SHA1 a04ff116faafca0e392581b88eb6c2d9afb82102 SHA256 5b6e4809a5c8961695ce4f6c1a9f83e81782c69b244a610c3999bfd3bb9e699f
 MD5 a94566c6927ccaeca24681c25540624d metadata.xml 236
 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 metadata.xml 236
@@ -77,15 +72,16 @@ SHA256 5b6e4809a5c8961695ce4f6c1a9f83e81782c69b244a610c3999bfd3bb9e699f metadata
 MD5 65e102b7957229dfe2075b4d76c2f9fe files/digest-iptraf-2.7.0-r1 506
 RMD160 15ac4fd6a3a2fe747dc1f98b9a856239513384f1 files/digest-iptraf-2.7.0-r1 506
 SHA256 ccd3a95582730408892aed8b56a36bf5145c020fd1df7c35b17b811fa1b477f1 files/digest-iptraf-2.7.0-r1 506
-MD5 65e102b7957229dfe2075b4d76c2f9fe files/digest-iptraf-2.7.0-r2 506
-RMD160 15ac4fd6a3a2fe747dc1f98b9a856239513384f1 files/digest-iptraf-2.7.0-r2 506
-SHA256 ccd3a95582730408892aed8b56a36bf5145c020fd1df7c35b17b811fa1b477f1 files/digest-iptraf-2.7.0-r2 506
 MD5 16c1b380a279ec90d454cdeef55f369b files/digest-iptraf-3.0.0 238
 RMD160 81c9462ab9a3c82a34996b5c6ef52b945046a8a5 files/digest-iptraf-3.0.0 238
 SHA256 5df7e88a160f3a9b5411467810527af2ae0cb3bc1f381c8f9827d086985f44cb files/digest-iptraf-3.0.0 238
-MD5 d17a4675bb2066a4624512c84292e321 files/digest-iptraf-3.0.0-r1 497
-RMD160 5bcc0c5ecc6945b3abfd43dcc11dc409ae5af4c8 files/digest-iptraf-3.0.0-r1 497
-SHA256 3a40ce7007c51191bedddacfcab6de40e1e66c2a00dff68832e22126f8f410c8 files/digest-iptraf-3.0.0-r1 497
 MD5 d17a4675bb2066a4624512c84292e321 files/digest-iptraf-3.0.0-r2 497
 RMD160 5bcc0c5ecc6945b3abfd43dcc11dc409ae5af4c8 files/digest-iptraf-3.0.0-r2 497
 SHA256 3a40ce7007c51191bedddacfcab6de40e1e66c2a00dff68832e22126f8f410c8 files/digest-iptraf-3.0.0-r2 497
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFK6R4z974XjDVpbkRAljeAJ97O286NNoDOZk9jwNHgjN+BcGXGgCg2Amr
+AcT1PHcOjAkEcEfz6ENAVSY=
+=7vu4
+-----END PGP SIGNATURE-----
diff --git a/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r2 b/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r2
deleted file mode 100644
index 3f6628f4452f..000000000000
--- a/net-analyzer/iptraf/files/digest-iptraf-2.7.0-r2
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 34081a07879af189cca6865bc3b28c29 iptraf-2.7.0-ipv6-alpha12.diff 57251
-RMD160 5a1851ea0c5fa8d9a5f7910b80c8f35192d8ed6c iptraf-2.7.0-ipv6-alpha12.diff 57251
-SHA256 fca50b42120ae5dd4c86b00880c7867a4c9e6f804cd7d22ea3c8b8d4e1cf05a3 iptraf-2.7.0-ipv6-alpha12.diff 57251
-MD5 7ff0bc933a0a57a4ca9e2b0443307539 iptraf-2.7.0.tar.gz 363496
-RMD160 49e09c9e74a09828c477cc22d75f9e64114d390b iptraf-2.7.0.tar.gz 363496
-SHA256 5a335c8c22d02f7ccc640b37fcc7c0ea6840d4287e532a9efd0d0c9b6f1a16ae iptraf-2.7.0.tar.gz 363496
diff --git a/net-analyzer/iptraf/files/digest-iptraf-3.0.0-r1 b/net-analyzer/iptraf/files/digest-iptraf-3.0.0-r1
deleted file mode 100644
index a97bd2feb121..000000000000
--- a/net-analyzer/iptraf/files/digest-iptraf-3.0.0-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1cea10de695741befcdf9d3d4c31b9b8 iptraf-3.0.0-ipv6.patch.bz2 10069
-RMD160 021161e47e638590c618c0cb5fbb279e5d5503a7 iptraf-3.0.0-ipv6.patch.bz2 10069
-SHA256 d13c5447d726d01da2c1ce3bc793c9db5e6874b2f6b351114cc28e24be24998b iptraf-3.0.0-ipv6.patch.bz2 10069
-MD5 377371c28ee3c21a76f7024920649ea8 iptraf-3.0.0.tar.gz 575169
-RMD160 aaef797076056d6b788a9c9eff29500060594526 iptraf-3.0.0.tar.gz 575169
-SHA256 9ee433d95573d612539da4b452e6cdcbca6ab6674a88bfbf6eaf12d4902b5163 iptraf-3.0.0.tar.gz 575169
diff --git a/net-analyzer/iptraf/iptraf-2.7.0-r2.ebuild b/net-analyzer/iptraf/iptraf-2.7.0-r2.ebuild
deleted file mode 100644
index 6bf1950aa6e8..000000000000
--- a/net-analyzer/iptraf/iptraf-2.7.0-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-2.7.0-r2.ebuild,v 1.1 2006/03/21 23:01:42 jokey Exp $
-
-inherit eutils flag-o-matic
-
-V6PATCH_LEVEL=alpha12
-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
-	http://dev.gentoo.org/~gmsoft/patches/${P}-ipv6-${V6PATCH_LEVEL}.diff"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="ipv6 suid"
-
-DEPEND=">=sys-libs/ncurses-5.2-r1"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/${P}-atheros.patch
-	epatch ${DISTDIR}/${P}-ipv6-${V6PATCH_LEVEL}.diff
-
-	# bug 89458
-	if has_version '>=sys-kernel/linux-headers-2.6.11-r2' ; then
-		epatch ${FILESDIR}/${P}-2.6.patch
-	fi
-
-	# bug 126479
-	if has_version '>=sys-libs/glibc-2.4' ; then
-		epatch ${FILESDIR}/${P}-ipv6-glibc24.patch
-	fi
-
-	cd src
-	cp dirs.h dirs.h.orig
-	sed -e s:/var/local/iptraf:/var/lib/iptraf: -e s:/usr/local/bin:/usr/sbin: dirs.h.orig > dirs.h
-}
-
-src_compile() {
-	cd src
-
-	if use ipv6 ; then
-		append-flags -DUSE_IPV6
-	fi
-
-	if use suid ; then
-		append-flags -DALLOWUSERS
-	fi
-
-	emake -j1 CFLAGS="$CFLAGS" DEBUG="" TARGET="/usr/sbin" WORKDIR="/var/lib/iptraf" \
-	clean all || die "emake failed"
-}
-
-src_install() {
-	dosbin src/{iptraf,cfconv,rvnamed} || die
-	dodoc  FAQ README* CHANGES RELEASE-NOTES
-	doman Documentation/*.8
-	dohtml Documentation/*.html
-	keepdir /var/{lib,run,log}/iptraf
-}
-
-pkg_postinst() {
-	if use suid ; then
-		einfo
-		einfo "You've chosen to build iptraf with run-as-user support"
-		einfo
-		einfo "The app now has this support, but for security reasons"
-		einfo "you need to run the following command to allow your users"
-		einfo "to suid-run it:"
-		einfo
-		einfo " # chmod 4755 /usr/sbin/iptraf"
-		einfo
-	fi
-}
diff --git a/net-analyzer/iptraf/iptraf-3.0.0-r1.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r1.ebuild
deleted file mode 100644
index a19afb5ff9e4..000000000000
--- a/net-analyzer/iptraf/iptraf-3.0.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2006 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-r1.ebuild,v 1.1 2006/01/29 13:47:36 jokey Exp $
-
-inherit eutils
-
-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="~x86 ~amd64"
-IUSE="ipv6"
-
-DEPEND=">=sys-libs/ncurses-5.2-r1"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/${P}-atheros.patch
-	epatch ${FILESDIR}/${P}-build.patch
-	epatch ${FILESDIR}/${P}-linux-headers.patch
-	epatch ${FILESDIR}/${P}-bnep.patch
-	epatch ${FILESDIR}/${P}-Makefile.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
-	fi
-}
-
-src_compile() {
-	emake -C src || die
-}
-
-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
-}