diff options
| -rw-r--r-- | net-analyzer/iptraf/ChangeLog | 10 | ||||
| -rw-r--r-- | net-analyzer/iptraf/Manifest | 27 | ||||
| -rw-r--r-- | net-analyzer/iptraf/files/3.0.0-buffer-overflow.patch | 145 | ||||
| -rw-r--r-- | net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch | 37 | ||||
| -rw-r--r-- | net-analyzer/iptraf/files/iptraf-3.0.0-add-devnames.patch | 62 | ||||
| -rw-r--r-- | net-analyzer/iptraf/files/iptraf-3.0.0-build.patch | 31 | ||||
| -rw-r--r-- | net-analyzer/iptraf/files/iptraf-3.0.0-headerfix.patch | 25 | ||||
| -rw-r--r-- | net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24-updated.patch | 40 | ||||
| -rw-r--r-- | net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-headerfix.patch | 14 | ||||
| -rw-r--r-- | net-analyzer/iptraf/files/iptraf-3.0.0-linux-headers.patch | 41 | ||||
| -rw-r--r-- | net-analyzer/iptraf/files/iptraf-3.0.0-ncursesw.patch | 31 | ||||
| -rw-r--r-- | net-analyzer/iptraf/files/iptraf-3.0.0-setlocale.patch | 19 | ||||
| -rw-r--r-- | net-analyzer/iptraf/files/iptraf-3.0.0-vlan.patch | 28 | ||||
| -rw-r--r-- | net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild | 79 | ||||
| -rw-r--r-- | net-analyzer/iptraf/iptraf-3.0.0-r6.ebuild | 76 | ||||
| -rw-r--r-- | net-analyzer/iptraf/metadata.xml | 6 |
16 files changed, 0 insertions, 671 deletions
diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog deleted file mode 100644 index b151f490fd5c..000000000000 --- a/net-analyzer/iptraf/ChangeLog +++ /dev/null @@ -1,10 +0,0 @@ -# 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.83 2010/11/28 09:29:02 jlec Exp $ - -*iptraf-3.0.0-r6 (28 Nov 2010) - - 28 Nov 2010; Justin Lecher <jlec@gentoo.org> - +files/3.0.0-buffer-overflow.patch, +iptraf-3.0.0-r6.ebuild: - Fixes for overflows buffers taken from debian - diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest deleted file mode 100644 index 561c80220a85..000000000000 --- a/net-analyzer/iptraf/Manifest +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX 3.0.0-buffer-overflow.patch 3714 RMD160 209ce8e7d15f95dff049a9ff57f678b920edad40 SHA1 d842737a3abc58ea442123cf44e67a064df6052c SHA256 1a7c4fa213669524c837976fced9fbc3da42bae6bbb660d7da7c05c70f242c24 -AUX iptraf-3.0.0-Makefile.patch 1311 RMD160 9e83755100f8cc5b1b36bbc41dc2af5679621c87 SHA1 528086a05c2ca8ed4e695df19508b77a72621c57 SHA256 91c5131ca7ff3e408355027d03a6c3abf26f7bff5e85972d5441dc7eae246bf0 -AUX iptraf-3.0.0-add-devnames.patch 2765 RMD160 8975f882802558fe042be71c6488468d8550df4c SHA1 74c2181279e93d5e59e8f9a2c1aee1850d7e5887 SHA256 82c41b11130749bbd0b2b977bca4ed421ceaf7262c8ae8a4a9254bc389bac820 -AUX iptraf-3.0.0-build.patch 949 RMD160 15dfd3e0a9385af04c592b71c4a3ca55ace86fee SHA1 dcb596e6d20fe7db043a4a21a63b8f8b294411b2 SHA256 a0fd3a9ae85f565df9322465aea0163b9bee9268d12b173e63a4bf7b44e3bd91 -AUX iptraf-3.0.0-headerfix.patch 728 RMD160 99a4b283f94850dd9365194d86046f35c9042f05 SHA1 176c1a5e4926e8a60e96a5188c652a5cb3f820e0 SHA256 a4f00741052aba3482ddb4d3396b777cda3083e8e77983e200e8aec55b3ce6f8 -AUX iptraf-3.0.0-ipv6-glibc24-updated.patch 1408 RMD160 30760b73f66577a40c0c0509ee2b0dab90031742 SHA1 55aed266b6c6e22cce267355e470d1639de94f93 SHA256 d712126f83c5996802cb346d557addcdc6993c1c73c00fe62f798884e307896a -AUX iptraf-3.0.0-ipv6-headerfix.patch 460 RMD160 0de05f8d46360c13420c508831e5e9ad45f0a038 SHA1 eb6ea3f504ab78ccddde2bdb1d89ad5d20621658 SHA256 9adae655d64ac02f6b07a08d19083223da602159c8b9532e9863479fe3b321a0 -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-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-3.0.0-r5.ebuild 2161 RMD160 7c651013333dcb271143122fc5d80ff961144197 SHA1 e4d6b99229a0db8c834f9fddf7054ea909bacf5d SHA256 731efabfea3c6413d994f1ae4ff93edbbdd500e6eb0acb60a8e83511ca173ec7 -EBUILD iptraf-3.0.0-r6.ebuild 2134 RMD160 ab4256701a55fa5e72f7356aac3fdc166802c3bf SHA1 cb01708cab998912e0289ccbc21f05421a3f6cc2 SHA256 68108ab75370ec1295eebbb2bfc574925ce48828af69b3b11b2c59ce92288d19 -MISC ChangeLog 401 RMD160 bc8cfdb1ac865992194da3283fd0da392947c7b8 SHA1 41dab80e42f80165d1019149393729c8a874530b SHA256 f4f3a17985c23e67def4f559942aff6ff855d5fcac3f1f1fbe52e503a430fb3c -MISC metadata.xml 236 RMD160 42b34c8fdced6d21f13690c9e15d94f84d23e377 SHA1 a04ff116faafca0e392581b88eb6c2d9afb82102 SHA256 5b6e4809a5c8961695ce4f6c1a9f83e81782c69b244a610c3999bfd3bb9e699f ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.16 (GNU/Linux) - -iEYEARECAAYFAkzyIOMACgkQgAnW8HDreRZ1pQCgp/ViqJj/IDOqGySFxquZMCPn -DIgAoK/t2kx1ZiTsm5mY37putJcIo4uU -=V/nv ------END PGP SIGNATURE----- diff --git a/net-analyzer/iptraf/files/3.0.0-buffer-overflow.patch b/net-analyzer/iptraf/files/3.0.0-buffer-overflow.patch deleted file mode 100644 index 8e4cc5248821..000000000000 --- a/net-analyzer/iptraf/files/3.0.0-buffer-overflow.patch +++ /dev/null @@ -1,145 +0,0 @@ -Patch adopted from debians patches - -diff --git a/src/hostmon.c b/src/hostmon.c -index 14df2c8..7e50575 100644 ---- a/src/hostmon.c -+++ b/src/hostmon.c -@@ -711,7 +711,7 @@ void hostmon(const struct OPTIONS *options, int facilitytime, char *ifptr, - int is_ip; - int ch; - -- char ifname[10]; -+ char ifname[18]; - - struct timeval tv; - unsigned long starttime; -diff --git a/src/ifstats.c b/src/ifstats.c -index fac4db5..583279a 100644 ---- a/src/ifstats.c -+++ b/src/ifstats.c -@@ -129,7 +129,7 @@ void initiflist(struct iflist **list) - { - FILE *fd; - char buf[161]; -- char ifname[10]; -+ char ifname[18]; - struct iflist *itmp = NULL; - struct iflist *tail = NULL; - unsigned int index = 0; -@@ -433,7 +433,7 @@ void ifstats(const struct OPTIONS *options, struct filterstate *ofilter, - FILE *logfile = NULL; - - int br; -- char ifname[10]; -+ char ifname[18]; - - int ch; - -@@ -760,7 +760,7 @@ void detstats(char *iface, const struct OPTIONS *options, int facilitytime, - char *tpacket; - unsigned int iphlen; - -- char ifname[10]; -+ char ifname[18]; - struct sockaddr_ll fromaddr; - unsigned short linktype; - -diff --git a/src/ifstats.h b/src/ifstats.h -index 350dd13..abcde1e 100644 ---- a/src/ifstats.h -+++ b/src/ifstats.h -@@ -6,7 +6,7 @@ ifstats.h - structure definitions for interface counts - ***/ - - struct iflist { -- char ifname[8]; -+ char ifname[18]; - unsigned int encap; - unsigned long long iptotal; - unsigned long badtotal; -diff --git a/src/itrafmon.c b/src/itrafmon.c -index a54dcc2..044bae1 100644 ---- a/src/itrafmon.c -+++ b/src/itrafmon.c -@@ -604,7 +604,7 @@ void ipmon(struct OPTIONS *options, - int curwin = 0; - - int readlen; -- char ifname[10]; -+ char ifname[18]; - - unsigned long long total_pkts = 0; - -diff --git a/src/othptab.h b/src/othptab.h -index e412562..ab0d5be 100644 ---- a/src/othptab.h -+++ b/src/othptab.h -@@ -42,7 +42,7 @@ struct othptabent { - int s_fstat; - int d_fstat; - unsigned int protocol; -- char iface[8]; -+ char iface[18]; - unsigned int pkt_length; - - union { -diff --git a/src/promisc.c b/src/promisc.c -index c3ed691..d126243 100644 ---- a/src/promisc.c -+++ b/src/promisc.c -@@ -49,7 +49,7 @@ void init_promisc_list(struct promisc_states **list) - { - FILE *fd; - int ifd; -- char buf[8]; -+ char buf[18]; - struct promisc_states *ptmp; - struct promisc_states *tail = NULL; - struct ifreq ifr; -@@ -81,6 +81,7 @@ void init_promisc_list(struct promisc_states **list) - */ - - if ((strncmp(buf, "eth", 3) == 0) || -+ (strncmp(buf, "ath", 3) == 0) || - (strncmp(buf, "fddi", 4) == 0) || - (strncmp(buf, "tr", 2) == 0) || - (strncmp(ptmp->params.ifname, "wvlan", 4) == 0) || -diff --git a/src/promisc.h b/src/promisc.h -index c3f07a1..a06471c 100644 ---- a/src/promisc.h -+++ b/src/promisc.h -@@ -9,7 +9,7 @@ - */ - - struct promisc_params { -- char ifname[8]; -+ char ifname[18]; - int saved_state; - int state_valid; - }; -diff --git a/src/serv.c b/src/serv.c -index c8309ad..f7e7daf 100644 ---- a/src/serv.c -+++ b/src/serv.c -@@ -739,7 +739,7 @@ void servmon(char *ifname, struct porttab *ports, - unsigned short linktype; - int br; - -- char iface[8]; -+ char iface[18]; - unsigned int idx = 1; - - unsigned int sport = 0; -diff --git a/src/tcptable.h b/src/tcptable.h -index 3e17793..c029c73 100644 ---- a/src/tcptable.h -+++ b/src/tcptable.h -@@ -64,7 +64,7 @@ struct tcptableent { - unsigned long finack; - int partial; - int finsent; -- char ifname[8]; -+ char ifname[18]; - unsigned int index; - int reused; - int timedout; diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch deleted file mode 100644 index 29f514b0d1cd..000000000000 --- a/net-analyzer/iptraf/files/iptraf-3.0.0-Makefile.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -Naur iptraf-3.0.0~orig/src/Makefile iptraf-3.0.0/src/Makefile ---- iptraf-3.0.0~orig/src/Makefile 2009-03-20 21:50:35.000000000 +0100 -+++ iptraf-3.0.0/src/Makefile 2009-03-20 21:52:35.000000000 +0100 -@@ -29,10 +29,11 @@ - # options to be passed to the compiler. I don't believe they need to be - # modified (except for -m486 on non-Intel x86 platforms). - --CFLAGS = -Wall #-O2 #-m486 --DIRS = -DWORKDIR=\"$(WORKDIR)\" \ -- -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"$(TARGET)\" --LDOPTS = #-static -+#CFLAGS = -Wall #-O2 #-m486 -+DIRS = -DWORKDIR=\"/var/lib/iptraf\" \ -+ -DLOGDIR=\"$(LOGDIR)\" -DEXECDIR=\"/usr/sbin\" -+#LDOPTS = #-static -+LDOPTS = $(LDFLAGS) - - # you may want to change this to point to your ncurses include directory - # if the ncurses include files are not in the default location. -@@ -111,7 +112,7 @@ - $(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) $(LIBS) - - textlib: -- make -C ../support -+ $(MAKE) -C ../support - - %.o: %.c *.h version - $(CC) $(CFLAGS) $(DIRS) $(INCLUDEDIR) $(VERSION) $(PLATFORM) $(PROF) $(DEBUG) $(EXECPERM) $(BSSETTING) -c -o $*.o $< -@@ -130,7 +131,7 @@ - - clean: - rm -f *.o *~ core $(BINS) -- make -C ../support clean -+ $(MAKE) -C ../support clean - - # I just included this rule to clear out the .o files, leaving the - # executables, stripped and ready for packing. diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-add-devnames.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-add-devnames.patch deleted file mode 100644 index 43dc3b607583..000000000000 --- a/net-analyzer/iptraf/files/iptraf-3.0.0-add-devnames.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -Naur iptraf-3.0.0.orig/src/ifaces.c iptraf-3.0.0/src/ifaces.c ---- iptraf-3.0.0.orig/src/ifaces.c 2005-09-13 10:42:54.000000000 +0400 -+++ iptraf-3.0.0/src/ifaces.c 2007-09-02 12:34:21.000000000 +0400 -@@ -32,14 +32,15 @@ - #include "error.h" - - extern int accept_unsupported_interfaces; --#define NUM_SUPPORTED_IFACES 26 -+#define NUM_SUPPORTED_IFACES 35 - - 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", -+ "bnep", "dsl", "modem", "ni", "br", "tap", "dummy", "vmnet" - }; - - char *ltrim(char *buf) -diff -Naur iptraf-3.0.0.orig/src/packet.c iptraf-3.0.0/src/packet.c ---- iptraf-3.0.0.orig/src/packet.c 2005-09-13 10:42:54.000000000 +0400 -+++ iptraf-3.0.0/src/packet.c 2007-09-02 12:37:52.000000000 +0400 -@@ -107,6 +107,20 @@ - 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, "bnep", 4) == 0) -+ result = LINK_ETHERNET; -+ else if (strncmp(ifname, "ni", 2) == 0) -+ result = LINK_ETHERNET; -+ else if (strncmp(ifname, "tap", 3) == 0) -+ result = LINK_ETHERNET; -+ else if (strncmp(ifname, "dummy", 5) == 0) -+ result = LINK_ETHERNET; -+ else if (strncmp(ifname, "br", 2) == 0) -+ result = LINK_ETHERNET; -+ else if (strncmp(ifname, "vmnet", 5) == 0) -+ result = LINK_ETHERNET; - else if ((strncmp(ifname, "isdn", 4) == 0) && (isdn_fd != -1)) { - isdnent = isdn_table_lookup(isdnlist, ifname, isdn_fd); - -diff -Naur iptraf-3.0.0.orig/src/promisc.c iptraf-3.0.0/src/promisc.c ---- iptraf-3.0.0.orig/src/promisc.c 2005-09-13 10:42:54.000000000 +0400 -+++ iptraf-3.0.0/src/promisc.c 2007-09-02 12:38:54.000000000 +0400 -@@ -83,6 +83,13 @@ - if ((strncmp(buf, "eth", 3) == 0) || - (strncmp(buf, "fddi", 4) == 0) || - (strncmp(buf, "tr", 2) == 0) || -+ (strncmp(buf, "ath", 3) == 0) || -+ (strncmp(buf, "bnep", 4) == 0) || -+ (strncmp(buf, "ni", 2) == 0) || -+ (strncmp(buf, "tap", 3) == 0) || -+ (strncmp(buf, "dummy", 5) == 0) || -+ (strncmp(buf, "br", 2) == 0) || -+ (strncmp(buf, "vmnet", 5) == 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-build.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-build.patch deleted file mode 100644 index 2e03d81398f0..000000000000 --- a/net-analyzer/iptraf/files/iptraf-3.0.0-build.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- src/Makefile -+++ src/Makefile -@@ -6,7 +6,5 @@ - # Architecture determination string borrowed from the kernel makefile. - # --ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ -- -e s/arm.*/arm/ -e s/sa110/arm/) --PLATFORM = -DPLATFORM=\"$(shell uname -s)/$(ARCH)\" -+PLATFORM = -DPLATFORM=\"$(CHOST)\" - VERNUMBER := $(shell cat version) - VERSION = -DVERSION=\"$(VERNUMBER)\" -@@ -38,5 +37,5 @@ - # if the ncurses include files are not in the default location. - --INCLUDEDIR = -I/usr/include/ncurses -I../support -+INCLUDEDIR = -I../support - - # You can uncomment this one to disable the backspace key in input fields. ---- support/Makefile -+++ support/Makefile -@@ -1,3 +1,2 @@ --INCLUDEDIR = -I/usr/include/ncurses - - OBJS = input.o menurt.o listbox.o winops.o labels.o \ -@@ -13,5 +12,5 @@ - - %.o: %.c *.h -- gcc -O2 -g -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $< -+ $(CC) $(CFLAGS) -Wall -fPIC $(INCLUDEDIR) -c -o $*.o $< - - clean: diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-headerfix.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-headerfix.patch deleted file mode 100644 index 604d63e26f17..000000000000 --- a/net-analyzer/iptraf/files/iptraf-3.0.0-headerfix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur iptraf-3.0.0-minus/src/othptab.c iptraf-3.0.0/src/othptab.c ---- iptraf-3.0.0-minus/src/othptab.c 2006-09-27 03:30:33.000000000 +0200 -+++ iptraf-3.0.0/src/othptab.c 2006-09-27 03:34:24.000000000 +0200 -@@ -17,6 +17,7 @@ - ***/ - - #include <asm/types.h> -+#include <sys/types.h> - #include <linux/if_ether.h> - #include <winops.h> - #include "arphdr.h" -diff -Naur iptraf-3.0.0-minus/src/tr.c iptraf-3.0.0/src/tr.c ---- iptraf-3.0.0-minus/src/tr.c 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/tr.c 2006-09-27 03:32:54.000000000 +0200 -@@ -7,8 +7,8 @@ - */ - - #include <asm/types.h> --#include <linux/if_tr.h> - #include <netinet/in.h> -+#include <linux/if_tr.h> - - unsigned int get_tr_ip_offset(unsigned char *pkt) - { - diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24-updated.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24-updated.patch deleted file mode 100644 index 52747e063e2f..000000000000 --- a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-glibc24-updated.patch +++ /dev/null @@ -1,40 +0,0 @@ -=== modified file 'src/othptab.c' ---- src/othptab.c 2008-12-30 09:54:16 +0000 -+++ src/othptab.c 2008-12-30 09:57:18 +0000 -@@ -561,8 +561,13 @@ - case ICMP6_DST_UNREACH_ADMIN: - strcpy(additional, "admin"); - break; -+#ifdef ICMP6_DST_UNREACH_NOTNEIGHBOR - case ICMP6_DST_UNREACH_NOTNEIGHBOR: - strcpy(additional, "not neigh"); -+#else -+ case ICMP6_DST_UNREACH_BEYONDSCOPE: -+ strcpy(additional, "beyondscope"); -+#endif - break; - case ICMP6_DST_UNREACH_ADDR: - strcpy(additional, "unreach addr"); -@@ -593,15 +598,21 @@ - case ND_ROUTER_ADVERT: - strcpy(description, "router adv"); - break; -+#ifdef ICMP6_MEMBERSHIP_QUERY - case ICMP6_MEMBERSHIP_QUERY: - strcpy(description, "mbrship query"); - break; -+#endif -+#ifdef ICMP6_MEMBERSHIP_REPORT - case ICMP6_MEMBERSHIP_REPORT: - strcpy(description, "mbrship report"); - break; -+#endif -+#ifdef ICMP6_MEMBERSHIP_REDUCTION - case ICMP6_MEMBERSHIP_REDUCTION: - strcpy(description, "mbrship reduc"); - break; -+#endif - case ND_NEIGHBOR_SOLICIT: - strcpy(description, "neigh sol"); - break; - diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-headerfix.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-headerfix.patch deleted file mode 100644 index 40b95f34a311..000000000000 --- a/net-analyzer/iptraf/files/iptraf-3.0.0-ipv6-headerfix.patch +++ /dev/null @@ -1,14 +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-04-16 00:20:52.000000000 +0200 -+++ ./iptraf-3.0.0/src/othptab.c 2006-04-16 00:22:01.000000000 +0200 -@@ -17,9 +17,9 @@ - - #include <asm/types.h> - #include <sys/types.h> --#include <linux/if_ether.h> - #include <netinet/ip6.h> - #include <netinet/icmp6.h> -+#include <linux/if_ether.h> - #include <winops.h> - #include "arphdr.h" - #include "options.h" diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-linux-headers.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-linux-headers.patch deleted file mode 100644 index 0afffc037a50..000000000000 --- a/net-analyzer/iptraf/files/iptraf-3.0.0-linux-headers.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- iptraf-3.0.0/src/othptab.c -+++ iptraf-3.0.0/src/othptab.c -@@ -17,8 +17,6 @@ - - #include <asm/types.h> - #include <linux/if_ether.h> --#include <linux/if_tr.h> --#include <linux/if_fddi.h> - #include <winops.h> - #include "arphdr.h" - #include "options.h" ---- iptraf-3.0.0/src/packet.c -+++ iptraf-3.0.0/src/packet.c -@@ -32,6 +32,9 @@ - #include <sys/time.h> - #include <net/if_arp.h> - #include <net/if.h> -+#ifdef _NET_IF_H -+#define _LINUX_IF_H -+#endif - #include <sys/ioctl.h> - #include <linux/if_packet.h> - #include <linux/if_ether.h> ---- iptraf-3.0.0/src/tcptable.h -+++ iptraf-3.0.0/src/tcptable.h -@@ -20,11 +20,14 @@ - #include <arpa/inet.h> - #include <net/if_arp.h> - #include <asm/types.h> -+#include <net/if.h> -+#ifdef _NET_IF_H -+#define _LINUX_IF_H -+#endif - #include <linux/if_packet.h> - #include <linux/if_ether.h> - #include <linux/if_fddi.h> - #include <linux/if_tr.h> --#include <net/if.h> - #include <netinet/ip.h> - #include <netinet/udp.h> - #include "servname.h" diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-ncursesw.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-ncursesw.patch deleted file mode 100644 index a75a014762f1..000000000000 --- a/net-analyzer/iptraf/files/iptraf-3.0.0-ncursesw.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -ru iptraf-3.0.0~/src/Makefile iptraf-3.0.0/src/Makefile ---- iptraf-3.0.0~/src/Makefile 2006-11-14 21:14:31.000000000 +0100 -+++ iptraf-3.0.0/src/Makefile 2006-11-14 21:15:12.000000000 +0100 -@@ -18,7 +18,7 @@ - BINDIR = ../../iptraf-$(VERNUMBER).bin.$(ARCH) - - CC = gcc --LIBS = -L../support -ltextbox -lpanel -lncurses # in this order! -+LIBS = -L../support -ltextbox -lpanelw -lncursesw # in this order! - - # comment this one out to omit debug code when done. - -@@ -163,7 +163,7 @@ - # and the compiled programs for release as a ready-to-run distribution. - - dist-bin: all -- $(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanel.a /usr/lib/libncurses.a -+ $(CC) $(LDOPTS) $(PROF) -o iptraf $(OBJS) -L../support -ltextbox /usr/lib/libpanelw.a /usr/lib/libncursesw.a - rm -rf $(BINDIR) - mkdir $(BINDIR) - /bin/cp -p ../CHANGES ../LICENSE ../FAQ ../INSTALL ../README* \ -@@ -179,7 +179,7 @@ - # Just in case anyone needs to link a static binary - # - static: $(OBJS) -- $(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanel -lncurses -+ $(CC) -static $(PROC) -o iptraf $(OBJS) ../support/libtextbox.a -lpanelw -lncursesw - $(CC) -static -o rvnamed rvnamed.o getpath.o - $(CC) -static -o rawtime rawtime.c - -Only in iptraf-3.0.0~/src: Makefile.orig diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-setlocale.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-setlocale.patch deleted file mode 100644 index 073a8c4e4d8f..000000000000 --- a/net-analyzer/iptraf/files/iptraf-3.0.0-setlocale.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- iptraf-3.0.0/src/iptraf.c.orig 2005-09-13 08:42:54.000000000 +0200 -+++ iptraf-3.0.0/src/iptraf.c 2006-01-30 08:38:49.000000000 +0100 -@@ -39,6 +39,7 @@ - #include <menurt.h> - #include <winops.h> - #include <msgboxes.h> -+#include <locale.h> - #include "dirs.h" - #include "deskman.h" - #include "fltdefs.h" -@@ -499,6 +500,8 @@ - } - #endif - -+ setlocale(LC_ALL, ""); -+ - strcpy(current_logfile, ""); - strcpy(graphing_logfile, ""); - strcpy(graphing_filter, ""); diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-vlan.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-vlan.patch deleted file mode 100644 index f0087bf39478..000000000000 --- a/net-analyzer/iptraf/files/iptraf-3.0.0-vlan.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- 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-r5.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild deleted file mode 100644 index ce1006f75b8a..000000000000 --- a/net-analyzer/iptraf/iptraf-3.0.0-r5.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2010 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-r5.ebuild,v 1.14 2010/01/06 19:56:13 ranger Exp $ - -EAPI="2" - -inherit eutils flag-o-matic toolchain-funcs - -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 - ipv6? ( mirror://gentoo/${P}-ipv6.patch.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86" -IUSE="ipv6 suid unicode" - -DEPEND=">=sys-libs/ncurses-5.2-r1 - unicode? ( >=sys-libs/ncurses-5.2-r1[unicode] )" -RDEPEND="${DEPEND}" - -src_unpack() { - unpack ${P}.tar.gz - cd "${S}" -} - -src_prepare() { - 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' \ - -e "s:Documentation/:/usr/share/doc/${PF}:g" \ - Documentation/*.* || die "sed doc paths" - - if use ipv6 ; then - epatch "${DISTDIR}"/${P}-ipv6.patch.bz2 - - # bug #126479 and bug #252874 - epatch "${FILESDIR}"/${P}-ipv6-glibc24-updated.patch - epatch "${FILESDIR}"/${P}-ipv6-headerfix.patch #128965 - fi -} - -src_compile() { - if use suid ; then - append-flags -DALLOWUSERS - fi - emake -C src CFLAGS="$CFLAGS" CC="$(tc-getCC)" || die "emake failed" -} - -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 -} - -pkg_postinst() { - if use suid ; then - elog - elog "You've chosen to build iptraf with run-as-user support" - elog - elog "The app now has this support, but for security reasons" - elog "you need to run the following command to allow your users" - elog "to suid-run it:" - elog - elog " # chmod 4755 /usr/sbin/iptraf" - elog - fi -} diff --git a/net-analyzer/iptraf/iptraf-3.0.0-r6.ebuild b/net-analyzer/iptraf/iptraf-3.0.0-r6.ebuild deleted file mode 100644 index 83015682f829..000000000000 --- a/net-analyzer/iptraf/iptraf-3.0.0-r6.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2010 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-r6.ebuild,v 1.1 2010/11/28 09:29:02 jlec Exp $ - -EAPI="2" - -inherit eutils flag-o-matic toolchain-funcs - -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 - ipv6? ( mirror://gentoo/${P}-ipv6.patch.bz2 )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="ipv6 suid unicode" - -DEPEND=">=sys-libs/ncurses-5.2-r1[unicode?]" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}/${P}-Makefile.patch" \ - "${FILESDIR}"/${P}-build.patch \ - "${FILESDIR}"/${P}-add-devnames.patch \ - "${FILESDIR}"/${P}-linux-headers.patch - use unicode && epatch "${FILESDIR}/${P}-ncursesw.patch" #152883 - epatch \ - "${FILESDIR}/${P}-setlocale.patch" \ - "${FILESDIR}"/${P}-headerfix.patch \ - "${FILESDIR}"/${P}-vlan.patch \ - "${FILESDIR}"/${PV}-buffer-overflow.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 - - # bug #126479 and bug #252874 - epatch "${FILESDIR}"/${P}-ipv6-glibc24-updated.patch - epatch "${FILESDIR}"/${P}-ipv6-headerfix.patch #128965 - fi -} - -src_compile() { - if use suid ; then - append-flags -DALLOWUSERS - fi - emake -C src CFLAGS="$CFLAGS" CC="$(tc-getCC)" || die "emake failed" -} - -src_install() { - dosbin src/{iptraf,rawtime,rvnamed} || die - dodoc FAQ README* CHANGES RELEASE-NOTES || die - doman Documentation/*.8 || die - dohtml -r Documentation/* || die - keepdir /var/{lib,run,log}/iptraf || die -} - -pkg_postinst() { - if use suid ; then - elog - elog "You've chosen to build iptraf with run-as-user support" - elog - elog "The app now has this support, but for security reasons" - elog "you need to run the following command to allow your users" - elog "to suid-run it:" - elog - elog " # chmod 4755 /usr/sbin/iptraf" - elog - fi -} diff --git a/net-analyzer/iptraf/metadata.xml b/net-analyzer/iptraf/metadata.xml deleted file mode 100644 index 06c38a11fbd0..000000000000 --- a/net-analyzer/iptraf/metadata.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<herd>netmon</herd> -<longdescription>IPTraf is an ncurses-based IP LAN monitor</longdescription> -</pkgmetadata> |