Remove unused patches.

(Portage version: 2.2_rc61/cvs/Linux i686)

4 files changed, 6 insertions, 116 deletions

diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog
index 81c4ce3fcb51..755b8f06fd97 100644
--- a/net-analyzer/iptraf/ChangeLog
+++ b/net-analyzer/iptraf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/iptraf
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.81 2010/01/06 20:02:44 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.82 2010/01/06 20:12:05 jer Exp $
+
+  06 Jan 2010; Jeroen Roovers <jer@gentoo.org>
+  -files/iptraf-3.0.0-atheros.patch, -files/iptraf-3.0.0-bnep.patch,
+  -files/iptraf-3.0.0-ipv6-glibc24.patch:
+  Remove unused patches.
 
   06 Jan 2010; Jeroen Roovers <jer@gentoo.org> -iptraf-3.0.0-r4.ebuild:
   Remove old.
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 a903cfda1a38..000000000000
--- 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 881ca92925ac..000000000000
--- 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-ipv6-glibc24.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24.patch
deleted file mode 100644
index 05171fbdb580..000000000000
--- 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;