From: Mike Frysinger Date: Tue, 1 Nov 2005 05:44:04 +0000 (+0000) Subject: Version bump #106775 by tonich/Tudor Alexandru Dragos. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d30ba45a511c5a0e82700ddf4cc5e1e52c6ad350;p=gentoo.git Version bump #106775 by tonich/Tudor Alexandru Dragos. Package-Manager: portage-2.0.53_rc7 --- diff --git a/net-analyzer/iptraf/ChangeLog b/net-analyzer/iptraf/ChangeLog index a587be49ce8d..633d363ff2f0 100644 --- a/net-analyzer/iptraf/ChangeLog +++ b/net-analyzer/iptraf/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-analyzer/iptraf -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.31 2005/09/16 23:11:01 ciaranm Exp $ +# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf/ChangeLog,v 1.32 2005/11/01 05:44:04 vapier Exp $ + +*iptraf-3.0.0 (01 Nov 2005) + + 01 Nov 2005; Mike Frysinger + +files/iptraf-3.0.0-atheros.patch, +files/iptraf-3.0.0-build.patch, + +files/iptraf-3.0.0-linux-headers.patch, +iptraf-3.0.0.ebuild: + Version bump #106775 by tonich/Tudor Alexandru Dragos. 16 Sep 2005; Ciaran McCreesh ChangeLog: Converted to UTF-8, fixed encoding screwups diff --git a/net-analyzer/iptraf/Manifest b/net-analyzer/iptraf/Manifest index d691fba1ee62..99625b0b8a38 100644 --- a/net-analyzer/iptraf/Manifest +++ b/net-analyzer/iptraf/Manifest @@ -1,16 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 2241eff22a9bc92e90270a1ff8c1f034 ChangeLog 3885 +MD5 0778f39c2d1240985f0e8c1ba4f16dc6 ChangeLog 4156 MD5 301043df68f5969e9455c53d409a8c3e files/digest-iptraf-2.7.0-r1 138 +MD5 ddf09316d6ccb3f72355dbf82d9fd1e2 files/digest-iptraf-3.0.0 64 MD5 98fb7659373bc05930f0f3837135c811 files/iptraf-2.7.0-2.6.patch 1711 MD5 1bf72405b3017f7732841188b6914160 files/iptraf-2.7.0-atheros.patch 1644 +MD5 a713b7ba056a4b78e177e3a801246152 files/iptraf-3.0.0-atheros.patch 1508 +MD5 20c0e87723c58d6ce51de7fc3af1781a files/iptraf-3.0.0-build.patch 949 +MD5 59493b3c2f0bb06541a55aeffd9f097c files/iptraf-3.0.0-linux-headers.patch 963 MD5 ff7fbdbad9ee9726c93c7ae00b072900 iptraf-2.7.0-r1.ebuild 1455 +MD5 fbad68fe2caf5b78a9ee437bcd634377 iptraf-3.0.0.ebuild 1188 MD5 a94566c6927ccaeca24681c25540624d metadata.xml 236 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFDZvjlgIKl8Uu19MoRAltUAJ9PcT/0DueM5J1DplKd8o3RQiiPyACeOSMD -KfXnCNyf+gXBWIYomdpRvXM= -=5j/n +iD8DBQFDZwDFgIKl8Uu19MoRAndQAJ9WfkgeHdIvmouTQt7qpswmZIOLRQCaAzYl +m8yM+XfJ9fO/m+Old40/Ib4= +=Vhjt -----END PGP SIGNATURE----- diff --git a/net-analyzer/iptraf/files/digest-iptraf-3.0.0 b/net-analyzer/iptraf/files/digest-iptraf-3.0.0 new file mode 100644 index 000000000000..8fe4288f5b0a --- /dev/null +++ b/net-analyzer/iptraf/files/digest-iptraf-3.0.0 @@ -0,0 +1 @@ +MD5 377371c28ee3c21a76f7024920649ea8 iptraf-3.0.0.tar.gz 575169 diff --git a/net-analyzer/iptraf/files/iptraf-3.0.0-atheros.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-atheros.patch new file mode 100644 index 000000000000..a903cfda1a38 --- /dev/null +++ b/net-analyzer/iptraf/files/iptraf-3.0.0-atheros.patch @@ -0,0 +1,42 @@ +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-build.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-build.patch new file mode 100644 index 000000000000..2e03d81398f0 --- /dev/null +++ b/net-analyzer/iptraf/files/iptraf-3.0.0-build.patch @@ -0,0 +1,31 @@ +--- 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-linux-headers.patch b/net-analyzer/iptraf/files/iptraf-3.0.0-linux-headers.patch new file mode 100644 index 000000000000..0afffc037a50 --- /dev/null +++ b/net-analyzer/iptraf/files/iptraf-3.0.0-linux-headers.patch @@ -0,0 +1,41 @@ +--- iptraf-3.0.0/src/othptab.c ++++ iptraf-3.0.0/src/othptab.c +@@ -17,8 +17,6 @@ + + #include + #include +-#include +-#include + #include + #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 + #include + #include ++#ifdef _NET_IF_H ++#define _LINUX_IF_H ++#endif + #include + #include + #include +--- iptraf-3.0.0/src/tcptable.h ++++ iptraf-3.0.0/src/tcptable.h +@@ -20,11 +20,14 @@ + #include + #include + #include ++#include ++#ifdef _NET_IF_H ++#define _LINUX_IF_H ++#endif + #include + #include + #include + #include +-#include + #include + #include + #include "servname.h" diff --git a/net-analyzer/iptraf/iptraf-3.0.0.ebuild b/net-analyzer/iptraf/iptraf-3.0.0.ebuild new file mode 100644 index 000000000000..b1f062787bb9 --- /dev/null +++ b/net-analyzer/iptraf/iptraf-3.0.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2005 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.ebuild,v 1.1 2005/11/01 05:44:04 vapier Exp $ + +inherit eutils + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +DEPEND=">=sys-libs/ncurses-5.2-r1" + +src_unpack() { + unpack ${P}.tar.gz + cd "${S}" + epatch "${FILESDIR}"/${P}-atheros.patch + epatch "${FILESDIR}"/${P}-build.patch + epatch "${FILESDIR}"/${P}-linux-headers.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" +} + +src_compile() { + emake \ + CFLAGS="${CFLAGS}" \ + LDOPTS="${LDFLAGS}" \ + TARGET="/usr/sbin" \ + WORKDIR="/var/lib/iptraf" \ + -C src || die +} + +src_install() { + dosbin src/{iptraf,rawtime,rvnamed} || die + dodoc FAQ README* CHANGES RELEASE-NOTES INSTALL + doman Documentation/*.8 + dohtml -r Documentation/* + keepdir /var/{lib,run,log}/iptraf +}