Fixes ability to listen on vlan interfaces, bug #231745, thank Tomas Vasek for report and Ross Dougherty for actual tests. Removed old.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-openvz.git-777e816 i686

4 files changed, 56 insertions, 22 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index 6683111740c3..923bdfbf3869 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,13 @@
 # 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 $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.68 2008/10/24 15:23:57 pva Exp $
+
+*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
diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest
index f6319adb151a..36cbe43e8cb9 100644
--- a/net-analyzer/iptraf/Manifest
+++ b/net-analyzer/iptraf/Manifest
@@ -12,12 +12,13 @@ AUX iptraf-3.0.0-ipv6-headerfix.patch 460 RMD160 0de05f8d46360c13420c508831e5e9a
 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-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 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
-EBUILD iptraf-3.0.0-r3.ebuild 2264 RMD160 7003fc3f2eca64df867595f237c36662fe5d7454 SHA1 60a32ce07227b58590eed195c1cce961b1b5de23 SHA256 c79cedb23fa7d80537e9880b2e539b990d4d86e1e2839ff7853f80ce53a9747f
 EBUILD iptraf-3.0.0-r4.ebuild 2252 RMD160 e72abf0fa04046d740d569330c2f4b48879d158f SHA1 72c6a72b3bb50a92166efa00864940b9d4af346f SHA256 7dcf4e1bfbd4c7ca521454e45507bdcde68972bee2b29efca521eac5d2f72245
-MISC ChangeLog 8889 RMD160 a0f7d04df3c19977b5594a1d9fa24013cc2bad05 SHA1 eebc408981c188fa90d22a6e09509a4b067c02be SHA256 80920bfda03bef09c7a2dbca55f9363963f05a6739df45eb0a8c04a244f8437d
+EBUILD iptraf-3.0.0-r5.ebuild 2280 RMD160 f7cb6a30c40cc148f27e4cc676725e5313bc2fa7 SHA1 d3b415628bc94f88ed5e77924956b2a348204fd1 SHA256 4be0ea331ed39237d7a497f53cee14d0e8ea6e95de99a328bf994950b020b009
+MISC ChangeLog 9187 RMD160 5a89dcc25e830688e3111685746a5e517bad25c7 SHA1 de2c16c31292669f324a3995b97e658761e8f476 SHA256 af025ce84988270d64d2464d48d2fd6d34a36678a19d84a983ad0c8f072722b5
 MISC metadata.xml 236 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 SHA1 a04ff116faafca0e392581b88eb6c2d9afb82102 SHA256 5b6e4809a5c8961695ce4f6c1a9f83e81782c69b244a610c3999bfd3bb9e699f
diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-vlan.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-vlan.patch
new file mode 100644
index 000000000000..f0087bf39478
--- /dev/null
+++ b/net-analyzer/iptraf/files/iptraf-3.0.0-vlan.patch
@@ -0,0 +1,28 @@
+--- 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-r3.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild
index b4ad643af3d0..3b96d4393f98 100644
--- a/net-analyzer/iptraf/iptraf-3.0.0-r3.ebuild
+++ b/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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-r3.ebuild,v 1.11 2007/06/27 16:15:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild,v 1.1 2008/10/24 15:23:57 pva Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="ftp://iptraf.seul.org/pub/iptraf/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6 suid unicode"
 
 DEPEND=">=sys-libs/ncurses-5.2-r1"
@@ -25,18 +25,16 @@ pkg_setup() {
 
 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
-	# bug 152883
-	use unicode && epatch "${FILESDIR}/${P}-ncursesw.patch"
-	epatch "${FILESDIR}/${P}-setlocale.patch"
+	cd "${S}"
 
-	# bug 128965
-	epatch ${FILESDIR}/${P}-headerfix.patch
+	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' \
@@ -44,15 +42,15 @@ src_unpack() {
 		Documentation/*.* || die "sed doc paths"
 
 	if use ipv6 ; then
-		epatch ${DISTDIR}/${P}-ipv6.patch.bz2
+		epatch "${DISTDIR}"/${P}-ipv6.patch.bz2
 
 		# bug 126479
 		if has_version '>=sys-libs/glibc-2.4' ; then
-			epatch ${FILESDIR}/${P}-ipv6-glibc24.patch
+			epatch "${FILESDIR}"/${P}-ipv6-glibc24.patch
 		fi
 
 		# bug 128965
-		epatch ${FILESDIR}/${P}-ipv6-headerfix.patch
+		epatch "${FILESDIR}"/${P}-ipv6-headerfix.patch
 	fi
 }
 
@@ -60,7 +58,7 @@ src_compile() {
 	if use suid ; then
 		append-flags -DALLOWUSERS
 	fi
-	emake CFLAGS="$CFLAGS" CC="$(tc-getCC)" -C src || die "emake failed"
+	emake -C src CFLAGS="$CFLAGS" CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install() {