diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-05 08:51:09 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-05 08:51:17 +0000 |
commit | 018d22a274ccf86632e86499e67ead22ce9a96d7 (patch) | |
tree | b4f6640ebd7c5b0631ce425f29cd978eb6079c6d | |
parent | 62a99f5fa9c623ae0f5c93517f615b4f97650251 (diff) | |
download | alpine_aports-018d22a274ccf86632e86499e67ead22ce9a96d7.tar.bz2 alpine_aports-018d22a274ccf86632e86499e67ead22ce9a96d7.tar.xz alpine_aports-018d22a274ccf86632e86499e67ead22ce9a96d7.zip |
main/iptraf-ng: upgrade to 1.1.4
-rw-r--r-- | main/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch | 128 | ||||
-rw-r--r-- | main/iptraf-ng/APKBUILD | 17 |
2 files changed, 7 insertions, 138 deletions
diff --git a/main/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch b/main/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch deleted file mode 100644 index e5c04cd891..0000000000 --- a/main/iptraf-ng/0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch +++ /dev/null | |||
@@ -1,128 +0,0 @@ | |||
1 | From 72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab Mon Sep 17 00:00:00 2001 | ||
2 | Message-Id: <72512af1a3f1d55fff73cdfe7b63d9cfe8cc37ab.1337783673.git.npajkovs@redhat.com> | ||
3 | From: Nikola Pajkovsky <npajkovs@redhat.com> | ||
4 | Date: Wed, 23 May 2012 16:32:27 +0200 | ||
5 | Subject: [PATCH] token-ring: kernel v3.5 kill off token-ring support | ||
6 | |||
7 | Signed-off-by: Nikola Pajkovsky <npajkovs@redhat.com> | ||
8 | --- | ||
9 | src/hostmon.c | 10 ---------- | ||
10 | src/iptraf-ng-compat.h | 1 - | ||
11 | src/othptab.c | 6 ------ | ||
12 | src/packet.c | 27 --------------------------- | ||
13 | src/tcptable.c | 4 ---- | ||
14 | 5 files changed, 48 deletions(-) | ||
15 | |||
16 | diff --git a/src/hostmon.c b/src/hostmon.c | ||
17 | index 40a2b95..72b91f8 100644 | ||
18 | --- a/src/hostmon.c | ||
19 | +++ b/src/hostmon.c | ||
20 | @@ -1004,16 +1004,6 @@ void hostmon(const struct OPTIONS *options, time_t facilitytime, char *ifptr, | ||
21 | FDDI_K_ALEN); | ||
22 | list = flist; | ||
23 | break; } | ||
24 | - case ARPHRD_IEEE802: | ||
25 | - case ARPHRD_IEEE802_TR: { | ||
26 | - struct trh_hdr *hdr_trh = | ||
27 | - (struct trh_hdr *)pkt.pkt_buf; | ||
28 | - memcpy(scratch_saddr, hdr_trh->saddr, | ||
29 | - TR_ALEN); | ||
30 | - memcpy(scratch_daddr, hdr_trh->daddr, | ||
31 | - TR_ALEN); | ||
32 | - list = flist; | ||
33 | - break; } | ||
34 | default: | ||
35 | /* unknown link protocol */ | ||
36 | continue; | ||
37 | diff --git a/src/iptraf-ng-compat.h b/src/iptraf-ng-compat.h | ||
38 | index d5aee4a..2d9da96 100644 | ||
39 | --- a/src/iptraf-ng-compat.h | ||
40 | +++ b/src/iptraf-ng-compat.h | ||
41 | @@ -39,7 +39,6 @@ | ||
42 | #include <linux/if_ether.h> | ||
43 | #include <linux/if_packet.h> | ||
44 | #include <linux/if_fddi.h> | ||
45 | -#include <linux/if_tr.h> | ||
46 | #include <linux/types.h> | ||
47 | #include <linux/isdn.h> | ||
48 | |||
49 | diff --git a/src/othptab.c b/src/othptab.c | ||
50 | index d12cdfd..1181eb1 100644 | ||
51 | --- a/src/othptab.c | ||
52 | +++ b/src/othptab.c | ||
53 | @@ -193,12 +193,6 @@ struct othptabent *add_othp_entry(struct othptable *table, struct pkt_hdr *pkt, | ||
54 | saddr), new_entry->smacaddr); | ||
55 | convmacaddr((char *) (((struct fddihdr *) packet)-> | ||
56 | daddr), new_entry->dmacaddr); | ||
57 | - } else if ((pkt->pkt_hatype == ARPHRD_IEEE802) | ||
58 | - || (pkt->pkt_hatype == ARPHRD_IEEE802_TR)) { | ||
59 | - convmacaddr((char *) (((struct trh_hdr *) packet)-> | ||
60 | - saddr), new_entry->smacaddr); | ||
61 | - convmacaddr((char *) (((struct trh_hdr *) packet)-> | ||
62 | - daddr), new_entry->dmacaddr); | ||
63 | } | ||
64 | } | ||
65 | |||
66 | diff --git a/src/packet.c b/src/packet.c | ||
67 | index a43a27a..f3e4304 100644 | ||
68 | --- a/src/packet.c | ||
69 | +++ b/src/packet.c | ||
70 | @@ -51,24 +51,6 @@ static int in_cksum(u_short * addr, int len) | ||
71 | return (u_short) (~sum); | ||
72 | } | ||
73 | |||
74 | -static unsigned int get_tr_ip_offset(char *pkt) | ||
75 | -{ | ||
76 | - struct trh_hdr *trh; | ||
77 | - unsigned int riflen = 0; | ||
78 | - | ||
79 | - trh = (struct trh_hdr *) pkt; | ||
80 | - | ||
81 | - /* | ||
82 | - * Check if this packet has TR routing information and get | ||
83 | - * its length. | ||
84 | - */ | ||
85 | - if (trh->saddr[0] & TR_RII) | ||
86 | - riflen = (ntohs(trh->rcf) & TR_RCF_LEN_MASK) >> 8; | ||
87 | - | ||
88 | - return sizeof(struct trh_hdr) - TR_MAXRIFLEN + riflen + | ||
89 | - sizeof(struct trllc); | ||
90 | -} | ||
91 | - | ||
92 | static int packet_adjust(struct pkt_hdr *pkt) | ||
93 | { | ||
94 | int retval = 0; | ||
95 | @@ -109,15 +91,6 @@ static int packet_adjust(struct pkt_hdr *pkt) | ||
96 | pkt->pkt_payload += sizeof(struct fddihdr); | ||
97 | pkt->pkt_len -= sizeof(struct fddihdr); | ||
98 | break; | ||
99 | - case ARPHRD_IEEE802_TR: | ||
100 | - case ARPHRD_IEEE802: | ||
101 | - pkt->pkt_payload = pkt->pkt_buf; | ||
102 | - /* Token Ring patch supplied by Tomas Dvorak */ | ||
103 | - /* Get the start of the IP packet from the Token Ring frame. */ | ||
104 | - unsigned int dataoffset = get_tr_ip_offset(pkt->pkt_payload); | ||
105 | - pkt->pkt_payload += dataoffset; | ||
106 | - pkt->pkt_len -= dataoffset; | ||
107 | - break; | ||
108 | default: | ||
109 | /* return a NULL packet to signal an unrecognized link */ | ||
110 | /* protocol to the caller. Hopefully, this switch statement */ | ||
111 | diff --git a/src/tcptable.c b/src/tcptable.c | ||
112 | index 56c4780..b0e5ccc 100644 | ||
113 | --- a/src/tcptable.c | ||
114 | +++ b/src/tcptable.c | ||
115 | @@ -620,10 +620,6 @@ void updateentry(struct tcptable *table, struct tcptableent *tableentry, | ||
116 | } else if (linkproto == ARPHRD_FDDI) { | ||
117 | convmacaddr((char *) (((struct fddihdr *) packet)-> | ||
118 | saddr), newmacaddr); | ||
119 | - } else if ((linkproto == ARPHRD_IEEE802) | ||
120 | - || (linkproto == ARPHRD_IEEE802_TR)) { | ||
121 | - convmacaddr((char *) (((struct trh_hdr *) packet)-> | ||
122 | - saddr), newmacaddr); | ||
123 | } | ||
124 | |||
125 | if (tableentry->smacaddr[0] != '\0') { | ||
126 | -- | ||
127 | 1.7.10 | ||
128 | |||
diff --git a/main/iptraf-ng/APKBUILD b/main/iptraf-ng/APKBUILD index 58aac82726..331f0ca4c3 100644 --- a/main/iptraf-ng/APKBUILD +++ b/main/iptraf-ng/APKBUILD | |||
@@ -1,8 +1,8 @@ | |||
1 | # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> | 1 | # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> |
2 | # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> | 2 | # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> |
3 | pkgname=iptraf-ng | 3 | pkgname=iptraf-ng |
4 | pkgver=1.1.3.1 | 4 | pkgver=1.1.4 |
5 | pkgrel=1 | 5 | pkgrel=0 |
6 | pkgdesc="IP Network Monitoring Software (fork of original iptraf)" | 6 | pkgdesc="IP Network Monitoring Software (fork of original iptraf)" |
7 | url="https://fedorahosted.org/iptraf-ng/" | 7 | url="https://fedorahosted.org/iptraf-ng/" |
8 | arch="all" | 8 | arch="all" |
@@ -12,7 +12,7 @@ makedepends="ncurses-dev" | |||
12 | install= | 12 | install= |
13 | subpackages="$pkgname-doc" | 13 | subpackages="$pkgname-doc" |
14 | source="https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz | 14 | source="https://fedorahosted.org/releases/i/p/$pkgname/$pkgname-$pkgver.tar.gz |
15 | 0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch" | 15 | " |
16 | 16 | ||
17 | _builddir="$srcdir"/iptraf-ng-$pkgver | 17 | _builddir="$srcdir"/iptraf-ng-$pkgver |
18 | prepare() { | 18 | prepare() { |
@@ -27,7 +27,7 @@ prepare() { | |||
27 | 27 | ||
28 | build() { | 28 | build() { |
29 | cd "$_builddir" | 29 | cd "$_builddir" |
30 | CFLAGS="$CFLAGS -std=gnu99" ./configure \ | 30 | CFLAGS="$CFLAGS -std=gnu99" ./configure \ |
31 | --build=$CBUILD \ | 31 | --build=$CBUILD \ |
32 | --host=$CHOST \ | 32 | --host=$CHOST \ |
33 | --prefix=/usr \ | 33 | --prefix=/usr \ |
@@ -40,9 +40,6 @@ package() { | |||
40 | make DESTDIR="$pkgdir" install | 40 | make DESTDIR="$pkgdir" install |
41 | } | 41 | } |
42 | 42 | ||
43 | md5sums="1a2c02944b0b012d6a3de96207610fa2 iptraf-ng-1.1.3.1.tar.gz | 43 | md5sums="de27cfeeede96e2acfb0edc8439b034a iptraf-ng-1.1.4.tar.gz" |
44 | e381baa0847040085f4e0db98ecc3416 0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch" | 44 | sha256sums="79140cf07c0cceb1b5723242847a73aa86f5e4f9dccfe8970fda6801d347eb09 iptraf-ng-1.1.4.tar.gz" |
45 | sha256sums="687b5632290d9b4963842df36f3572d97e333656d1fb6c5f341ab7df651dc185 iptraf-ng-1.1.3.1.tar.gz | 45 | sha512sums="8cafb0000cec75eb4071156a9e9350ffe6de99cb6386e8f50d05337113872ee50082a30009d85faa02d83633a8e727039791332d600654321b95ca6cfc881774 iptraf-ng-1.1.4.tar.gz" |
46 | a36aaf8d110611ba8f9bd95a4ecdcb51fc90416b2f23fd708e130d4e87dec15d 0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch" | ||
47 | sha512sums="eb477afa5d01a3c787a4db153669713fe13af866b76446191f5679098d96c2e72b3e21dbeceda202770022204d8c5217b52dc5c25e545129aef6de2de622c04a iptraf-ng-1.1.3.1.tar.gz | ||
48 | 16f0aaa181ba6bc4f1812783eb9bd110bed735ce0066a0db6384447f5c145f87ff0819fb3a6056af4e5cdb6eac2b0391a520d7ee15f7178118a505c245458b2c 0001-token-ring-kernel-v3.5-kill-off-token-ring-support.patch" | ||