diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2009-12-08 10:00:57 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2009-12-08 10:06:23 +0000 |
| commit | 520ef951dfa299b66e8cc38bb57ba8392dab2a1b (patch) | |
| tree | 16ea7014ae3a9dc130ca8cccd92fba9d4e1694c1 | |
| parent | 94e2fca1d8ea1b7654207a948b58234bed410887 (diff) | |
| download | aports-520ef951dfa299b66e8cc38bb57ba8392dab2a1b.tar.bz2 aports-520ef951dfa299b66e8cc38bb57ba8392dab2a1b.tar.xz | |
main/iptraf: fix for vlan traffic
from http://linux.mantech.ro/IPTraf-fix.html
(cherry picked from commit bee68ae8e6633b07ccb82ce6d60eab687c3ddc70)
| -rw-r--r-- | main/iptraf/APKBUILD | 9 | ||||
| -rw-r--r-- | main/iptraf/iptraf-3.0.0-vlan.patch | 28 |
2 files changed, 34 insertions, 3 deletions
diff --git a/main/iptraf/APKBUILD b/main/iptraf/APKBUILD index 4d1149d1..d4e4b233 100644 --- a/main/iptraf/APKBUILD +++ b/main/iptraf/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leonardo Arena <rnalrd@gmail.com> pkgname=iptraf pkgver=3.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="IP Network Monitoring Software" url="http://iptraf.seoul.org" license="GPL" @@ -10,10 +10,12 @@ depends= makedepends="ncurses-dev" install= subpackages="$pkgname-doc" -source="ftp://iptraf.seul.org/pub/$pkgname/$pkgname-$pkgver.tar.gz" +source="ftp://iptraf.seul.org/pub/$pkgname/$pkgname-$pkgver.tar.gz + iptraf-3.0.0-vlan.patch" build() { cd "$srcdir/$pkgname-$pkgver/src" + patch -p1 -i "$srcdir"/iptraf-3.0.0-vlan.patch || return 1 sed -i -e s:/var/local/iptraf:/var/lib/iptraf: \ -e s:/usr/local/bin:/usr/sbin: dirs.h @@ -34,4 +36,5 @@ build() { done } -md5sums="377371c28ee3c21a76f7024920649ea8 iptraf-3.0.0.tar.gz" +md5sums="377371c28ee3c21a76f7024920649ea8 iptraf-3.0.0.tar.gz +4136483b9e41c8789c629c42f9a67d07 iptraf-3.0.0-vlan.patch" diff --git a/main/iptraf/iptraf-3.0.0-vlan.patch b/main/iptraf/iptraf-3.0.0-vlan.patch new file mode 100644 index 00000000..f0087bf3 --- /dev/null +++ b/main/iptraf/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 */ |