fix gcc-4.x compile for bug #152548 and cross-compilation

(Portage version: 2.1.1-r1)

7 files changed, 393 insertions, 2 deletions

diff --git a/net-analyzer/trafd/ChangeLog b/net-analyzer/trafd/ChangeLog
index 492b9939e01a..74b153033aca 100644
--- a/net-analyzer/trafd/ChangeLog
+++ b/net-analyzer/trafd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/trafd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafd/ChangeLog,v 1.9 2006/02/17 16:26:25 jokey Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafd/ChangeLog,v 1.10 2006/11/16 20:46:55 cedk Exp $
+
+*trafd-3.0.1-r1 (16 Nov 2006)
+
+  16 Nov 2006; Cedric Krier <ced@ced.homedns.org>
+  +files/trafd-3.0.1-gentoo.diff, +files/trafd.conf, +files/trafd.init,
+  +trafd-3.0.1-r1.ebuild:
+  fix gcc-4.x compile for bug #152548 and cross-compilation
 
   17 Feb 2006; Markus Ullmann <jokey@gentoo.org> trafd-3.0.1.ebuild:
   Removing virtual/libpcap wrt bug #117898
diff --git a/net-analyzer/trafd/files/digest-trafd-3.0.1 b/net-analyzer/trafd/files/digest-trafd-3.0.1
index 0a1757da8f03..ab004b665075 100644
--- a/net-analyzer/trafd/files/digest-trafd-3.0.1
+++ b/net-analyzer/trafd/files/digest-trafd-3.0.1
@@ -1,3 +1,9 @@
-MD5 6a5abb246e95b68f0d53ebf789bda4fb trafd-3.0.1.tgz 35365
 MD5 c61d8f5b9824763bd5b93708048f4727 tcpdump-richard-1.7.tar.gz 198587
+RMD160 1a1d9adc6bee35eeab84d34f807f12dafa43f6c1 tcpdump-richard-1.7.tar.gz 198587
+SHA256 572a6544182fa57ec7c89e5093f0fd972be751a0145bfd13b93ef4063168c99a tcpdump-richard-1.7.tar.gz 198587
 MD5 4b6f61f2b3fd985efc935d1ec1f52ce2 trafd-3.0.1-gentoo.tar.bz2 2618
+RMD160 4399242036aa3c6e1196bd6070eeb5c6653729b0 trafd-3.0.1-gentoo.tar.bz2 2618
+SHA256 45904e1251772e703da24b7e51f298f6cfbb4c84bb4dc0f812da5f3a01ca26db trafd-3.0.1-gentoo.tar.bz2 2618
+MD5 6a5abb246e95b68f0d53ebf789bda4fb trafd-3.0.1.tgz 35365
+RMD160 65ac4b09cbb6f014ce6e643f3607a280d13dcd7f trafd-3.0.1.tgz 35365
+SHA256 29164f69e6fcfeeefa6fe7f3bb07f415de03a45fa7985cfc76a99c423bc39db9 trafd-3.0.1.tgz 35365
diff --git a/net-analyzer/trafd/files/digest-trafd-3.0.1-r1 b/net-analyzer/trafd/files/digest-trafd-3.0.1-r1
new file mode 100644
index 000000000000..e536c2d5b83f
--- /dev/null
+++ b/net-analyzer/trafd/files/digest-trafd-3.0.1-r1
@@ -0,0 +1,6 @@
+MD5 c61d8f5b9824763bd5b93708048f4727 tcpdump-richard-1.7.tar.gz 198587
+RMD160 1a1d9adc6bee35eeab84d34f807f12dafa43f6c1 tcpdump-richard-1.7.tar.gz 198587
+SHA256 572a6544182fa57ec7c89e5093f0fd972be751a0145bfd13b93ef4063168c99a tcpdump-richard-1.7.tar.gz 198587
+MD5 6a5abb246e95b68f0d53ebf789bda4fb trafd-3.0.1.tgz 35365
+RMD160 65ac4b09cbb6f014ce6e643f3607a280d13dcd7f trafd-3.0.1.tgz 35365
+SHA256 29164f69e6fcfeeefa6fe7f3bb07f415de03a45fa7985cfc76a99c423bc39db9 trafd-3.0.1.tgz 35365
diff --git a/net-analyzer/trafd/files/trafd-3.0.1-gentoo.diff b/net-analyzer/trafd/files/trafd-3.0.1-gentoo.diff
new file mode 100644
index 000000000000..a90fdfd7c75b
--- /dev/null
+++ b/net-analyzer/trafd/files/trafd-3.0.1-gentoo.diff
@@ -0,0 +1,304 @@
+diff -ru trafd-3.0.1~/lib/interfaces.c trafd-3.0.1/lib/interfaces.c
+--- trafd-3.0.1~/lib/interfaces.c	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/lib/interfaces.c	2006-11-16 21:22:18.000000000 +0100
+@@ -43,6 +43,7 @@
+ 
+ #include <stdio.h>
+ #include <pcap.h>
++#include <string.h>
+ 
+ #include "ethertype.h"
+ #include "interface.h"
+diff -ru trafd-3.0.1~/lib/savestr.c trafd-3.0.1/lib/savestr.c
+--- trafd-3.0.1~/lib/savestr.c	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/lib/savestr.c	2006-11-16 21:22:18.000000000 +0100
+@@ -29,6 +29,7 @@
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "gnuc.h"
+ 
+diff -ru trafd-3.0.1~/Makefile trafd-3.0.1/Makefile
+--- trafd-3.0.1~/Makefile	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/Makefile	2006-11-16 21:34:14.000000000 +0100
+@@ -12,22 +12,27 @@
+ #
+ 
+ # Target directory for install execution files.
+-PATH_BINDIR=/usr/local/bin
++PATH_BINDIR=/usr/bin
++
++# Installation path
++PATH_BINDIR_INSTALL=${DESTDIR}usr/bin
++PATH_CONF_INSTALL=${DESTDIR}etc
+ 
+ # Target directory for install man pages.
+-PATH_MANDIR=/usr/local/man/man1
++PATH_MANDIR=/usr/share/man/man1
++PATH_INSTALL_DOC=${DESTDIR}usr/share/doc/trafd-3.0.1
+ 
+ # Trailing slash directory, summary traffic log files will be put there.
+ PATH_TOSAVE=/var/trafd/
+ 
+ # Full pathname where locate tarfstat program.
+-PATH_TRAFSTAT=/usr/local/bin/trafstat
++PATH_TRAFSTAT=/usr/bin/trafstat
+ 
+ # Where locate trafstatd log file, if you want log then file must exist.
+ PATH_TRAFSTAT_LOG=/var/log/trafstat.log
+ 
+ # File with user defined descriptions of the traflog output format.
+-PATH_TRAFLOG_FMT=/usr/local/etc/traflog.format
++PATH_TRAFLOG_FMT=/etc/traflog.format
+ 
+ # Only group wheel can execute binary files.
+ SHELL	= /bin/sh
+@@ -42,9 +47,9 @@
+ #DEFINE += -DHAVE_MEMORY_H=1
+ #DEFINE += -DHAVE_MALLOC_H=1
+ 
+-LDFLAGS	= -L../lib -lbpft -lpcap -lcurses -ltermcap -ll
++LDFLAGS+=-L../lib -lbpft -lpcap -lcurses -ltermcap -lfl
+ 
+-INCLUDE	= -I../include
++INCLUDE	= -I../include -I../../tcpdump-richard-1.7/linux-include -I../../tcpdump-richard-1.7/libpcap-0.0/bpf/
+ CFLAGS	= ${FLAGS} ${INCLUDE} ${DEFINE} \
+ 	-DPATH_TOSAVE=\"${PATH_TOSAVE}\"\
+ 	-DPATH_TRAFSTAT=\"${PATH_TRAFSTAT}\"\
+@@ -64,15 +69,17 @@
+ 	@echo "Done."
+ 
+ install: all
+-	install -s -o root -g ${GROUP} -m ${MODE} trafd/trafd ${PATH_BINDIR}
+-	install -c -o root -g ${GROUP} -m ${MODE} trafd/trafstart ${PATH_BINDIR}
+-	install -c -o root -g ${GROUP} -m ${MODE} trafd/trafstop ${PATH_BINDIR}
+-	install -c -o root -g ${GROUP} -m ${MODE} trafd/trafsave ${PATH_BINDIR}
+-	install -c -o root -g ${GROUP} -m ${MODE} trafd/trafdump ${PATH_BINDIR}
+-	install -s -o root -g ${GROUP} -m ${MODE} trafstat/trafstat ${PATH_BINDIR}
+-	install -s -o root -g ${GROUP} -m ${MODE} trafstatd/trafstatd ${PATH_BINDIR}
+-	install -s -o root -g ${GROUP} -m ${MODE} traflog/traflog ${PATH_BINDIR}
+-	install -c -o root -g ${GROUP} -m ${MODE} traflog/traflog.format ${PATH_TRAFLOG_FMT}
++	install -o root -g ${GROUP} -m ${MODE} trafd/trafd ${PATH_BINDIR_INSTALL}
++	install -c -o root -g ${GROUP} -m ${MODE} trafd/trafstart ${PATH_BINDIR_INSTALL}
++	install -c -o root -g ${GROUP} -m ${MODE} trafd/trafstop ${PATH_BINDIR_INSTALL}
++	install -c -o root -g ${GROUP} -m ${MODE} trafd/trafsave ${PATH_BINDIR_INSTALL}
++	install -c -o root -g ${GROUP} -m ${MODE} trafd/trafdump ${PATH_BINDIR_INSTALL}
++	install -c -o root -g ${GROUP} -m ${MODE} traflog/traflog ${PATH_BINDIR_INSTALL}
++	install -o root -g ${GROUP} -m ${MODE} trafstat/trafstat ${PATH_BINDIR_INSTALL}
++	install -o root -g ${GROUP} -m ${MODE} trafstatd/trafstatd ${PATH_BINDIR_INSTALL}
++	install -o root -g ${GROUP} -m ${MODE} traflog/traflog ${PATH_BINDIR_INSTALL}
++	install -c -o root -g ${GROUP} -m ${MODE} traflog/traflog.format ${PATH_CONF_INSTALL}
++	install -c -o root -g ${GROUP} -m 644 README ${PATH_INSTALL_DOC}
+ 	@echo Done.
+ 
+ clean:
+diff -ru trafd-3.0.1~/trafd/main.c trafd-3.0.1/trafd/main.c
+--- trafd-3.0.1~/trafd/main.c	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/trafd/main.c	2006-11-16 21:22:18.000000000 +0100
+@@ -86,7 +86,7 @@
+ 
+ static pcap_t *pd;
+ 
+-void
++int
+ main(argc, argv)
+ 	int argc;
+ 	char **argv;
+diff -ru trafd-3.0.1~/trafd/Makefile trafd-3.0.1/trafd/Makefile
+--- trafd-3.0.1~/trafd/Makefile	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/trafd/Makefile	2006-11-16 21:31:43.000000000 +0100
+@@ -5,7 +5,7 @@
+ PROG	= trafd
+ SRC	= main.c traffic.c
+ OBJ	= $(SRC:.c=.o)
+-LIB	= -lpcap -ll
++LIB	= -lpcap -lfl
+ CC	= gcc
+ FLAGS	= -g
+ DEFINE	=
+diff -ru trafd-3.0.1~/trafd/trafdump trafd-3.0.1/trafd/trafdump
+--- trafd-3.0.1~/trafd/trafdump	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/trafd/trafdump	2006-11-16 21:22:18.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ #	trafdump	Copyright (c)1993 CAD lab
+ #
+@@ -18,6 +19,7 @@
+ for iface in $*; do
+ 	PID_FILE=$WHERE_PID$iface
+ 	if [ -f $PID_FILE ]; then
++		echo dumping $iface ...
+ 		kill -HUP `cat $PID_FILE`
+ 		if [ $? = 0 ]; then
+ 			echo `date +"%b %e %H:%M:%S"` `hostname -s` trafdump: \
+diff -ru trafd-3.0.1~/trafd/traffic.c trafd-3.0.1/trafd/traffic.c
+--- trafd-3.0.1~/trafd/traffic.c	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/trafd/traffic.c	2006-11-16 21:22:18.000000000 +0100
+@@ -56,10 +56,10 @@
+ #include <netinet/tcpip.h>
+ #include <netdb.h>
+ #include <pcap.h>
++#include <stdlib.h>
+ 
+ #include "interface.h"
+ #include "traffic.h"
+-#include "trafd.h"
+ 
+ #ifdef USE_PIPE
+ static jmp_buf after_pipe;
+@@ -72,6 +72,8 @@
+ static struct timeval begin_time;
+ static u_char s_port_big[IPPORT_RESERVED];
+ 
++#include "trafd.h"
++
+ /*
+  * Initialize traffic collector.
+  */
+@@ -214,7 +216,7 @@
+ 		t.p_port = tp->th_sport, t.who_srv = 1;
+ 	else if (tp->th_sport > tp->th_dport)
+ 		t.p_port = tp->th_dport, t.who_srv = 2;
+-	else if (tp->th_sport = tp->th_dport)
++	else if (tp->th_sport == tp->th_dport)
+ 		t.p_port = tp->th_sport, t.who_srv = 3;
+ 	if (t.p_port > IPPORT_RESERVED) {
+ 		if (s_port_big[tp->th_sport & (IPPORT_RESERVED-1)] & IPPROTO_TCP) {
+@@ -224,7 +226,7 @@
+ 				t.p_port = tp->th_dport;
+ 				t.who_srv = 2;
+ 			}
+-		if (tp->th_sport = tp->th_dport) t.who_srv = 3;
++		if (tp->th_sport == tp->th_dport) t.who_srv = 3;
+ 	}
+ 	traf_add(insertentry(&t), t.n_bytes, t.n_psize);
+ 
+@@ -261,7 +263,7 @@
+ 		t.p_port = up->uh_sport, t.who_srv = 1;
+ 	else if (up->uh_sport > up->uh_dport)
+ 		t.p_port = up->uh_dport, t.who_srv = 2;
+-	else if (up->uh_sport = up->uh_dport)
++	else if (up->uh_sport == up->uh_dport)
+ 		t.p_port = up->uh_sport, t.who_srv = 3;
+ 	if (t.p_port > IPPORT_RESERVED) {
+ 		if (s_port_big[up->uh_sport & (IPPORT_RESERVED-1)] & IPPROTO_UDP) {
+@@ -271,7 +273,7 @@
+ 				t.p_port = up->uh_dport;
+ 				t.who_srv = 2;
+ 			}
+-		if (up->uh_sport = up->uh_dport) t.who_srv = 3;
++		if (up->uh_sport == up->uh_dport) t.who_srv = 3;
+ 	}
+ 	traf_add(insertentry(&t), t.n_bytes, t.n_psize);
+ 
+diff -ru trafd-3.0.1~/trafd/trafsave trafd-3.0.1/trafd/trafsave
+--- trafd-3.0.1~/trafd/trafsave	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/trafd/trafsave	2006-11-16 21:22:18.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ #	trafsave	Copyright (c)1993 CAD lab
+ #
+@@ -19,6 +20,7 @@
+ for iface in $*; do
+ 	PID_FILE=$WHERE_PID$iface
+ 	if [ -f $PID_FILE ]; then
++		echo saving $iface ...
+ 		kill -INT `cat $PID_FILE`
+ 		if [ $? = 0 ]; then
+ 			echo `date +"%b %e %H:%M:%S"` `hostname -s` trafsave: \
+diff -ru trafd-3.0.1~/trafd/trafstart trafd-3.0.1/trafd/trafstart
+--- trafd-3.0.1~/trafd/trafstart	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/trafd/trafstart	2006-11-16 21:22:18.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ #	trafstart	Copyright (c)1993 CAD lab
+ #
+@@ -18,7 +19,8 @@
+ #trafd -r -i sl0
+ # 	count all ftp traffic passthrough ne0 interface -
+ #trafd -i ne0 port ftp or ftp-data
+-./trafd -p -r -i xl0
++echo starting trafd eth0 ...
++/usr/bin/trafd -p -r -i eth0
+ #
+ #echo I am storage, before use invoke editor and edit as your need.
+ #trafd -?
+diff -ru trafd-3.0.1~/trafd/trafstop trafd-3.0.1/trafd/trafstop
+--- trafd-3.0.1~/trafd/trafstop	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/trafd/trafstop	2006-11-16 21:22:18.000000000 +0100
+@@ -1,3 +1,4 @@
++#!/bin/sh
+ #
+ #	trafstop	Copyright (c)1993 CAD lab
+ #
+@@ -19,6 +20,7 @@
+ for iface in $*; do
+ 	PID_FILE=$WHERE_PID$iface
+ 	if [ -f $PID_FILE ]; then
++		echo stopping $iface ...
+ 		kill -TERM `cat $PID_FILE`
+ 		if [ $? = 0 ]; then
+ 			echo `date +"%b %e %H:%M:%S"` `hostname -s` trafstop: \
+diff -ru trafd-3.0.1~/traflog/main.c trafd-3.0.1/traflog/main.c
+--- trafd-3.0.1~/traflog/main.c	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/traflog/main.c	2006-11-16 21:22:18.000000000 +0100
+@@ -42,6 +42,7 @@
+ #include <sys/stat.h>
+ #include <sys/param.h>
+ #include <pcap.h>
++#include <time.h>
+ 
+ #include "../include/interface.h"
+ #include "../include/addrtoname.h"
+diff -ru trafd-3.0.1~/traflog/Makefile trafd-3.0.1/traflog/Makefile
+--- trafd-3.0.1~/traflog/Makefile	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/traflog/Makefile	2006-11-16 21:22:18.000000000 +0100
+@@ -5,7 +5,7 @@
+ PROG	= traflog
+ SRC	= main.c traflog.c
+ OBJ	= $(SRC:.c=.o)
+-LIB	= -L../lib -lbpft -ll -lpcap
++LIB	= -L../lib -lbpft -lfl -lpcap
+ CC	= gcc
+ FLAGS	= -g
+ DEFINE	=
+diff -ru trafd-3.0.1~/traflog/traflog.c trafd-3.0.1/traflog/traflog.c
+--- trafd-3.0.1~/traflog/traflog.c	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/traflog/traflog.c	2006-11-16 21:22:18.000000000 +0100
+@@ -48,6 +48,7 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #include <pcap.h>
++#include <time.h>
+ 
+ #include "interface.h"
+ #include "addrtoname.h"
+diff -ru trafd-3.0.1~/trafstat/main.c trafd-3.0.1/trafstat/main.c
+--- trafd-3.0.1~/trafstat/main.c	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/trafstat/main.c	2006-11-16 21:22:18.000000000 +0100
+@@ -72,7 +72,7 @@
+ 
+ static jmp_buf after_alarm;
+ 
+-void
++int
+ main(argc, argv)
+ 	int argc;
+ 	char **argv;
+diff -ru trafd-3.0.1~/trafstatd/trafstatd.c trafd-3.0.1/trafstatd/trafstatd.c
+--- trafd-3.0.1~/trafstatd/trafstatd.c	2006-11-16 21:21:56.000000000 +0100
++++ trafd-3.0.1/trafstatd/trafstatd.c	2006-11-16 21:22:18.000000000 +0100
+@@ -39,7 +39,7 @@
+ #define	LINELEN		1024
+ #define	ENTRIES		50
+ 
+-void
++int
+ main()
+ {
+ 	register FILE *fp;
diff --git a/net-analyzer/trafd/files/trafd.conf b/net-analyzer/trafd/files/trafd.conf
new file mode 100644
index 000000000000..03da04047dfd
--- /dev/null
+++ b/net-analyzer/trafd/files/trafd.conf
@@ -0,0 +1,2 @@
+# what interface to run on
+IFACE=eth0
diff --git a/net-analyzer/trafd/files/trafd.init b/net-analyzer/trafd/files/trafd.init
new file mode 100644
index 000000000000..9c8dc4f4da00
--- /dev/null
+++ b/net-analyzer/trafd/files/trafd.init
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafd/files/trafd.init,v 1.3 2006/11/16 20:46:55 cedk Exp $
+
+depend() {
+	need net
+	use cupsd
+}
+
+start() {
+	ebegin "Starting trafd"
+	/usr/bin/trafd -p -r -i ${IFACE}
+	result=$?
+	eend $result
+}
+
+stop() {
+	ebegin "Stopping trafd"
+	/usr/bin/trafstop ${IFACE} > /dev/null
+	result=$?
+	eend $result
+}
diff --git a/net-analyzer/trafd/trafd-3.0.1-r1.ebuild b/net-analyzer/trafd/trafd-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..015a94c53362
--- /dev/null
+++ b/net-analyzer/trafd/trafd-3.0.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/trafd/trafd-3.0.1-r1.ebuild,v 1.1 2006/11/16 20:46:55 cedk Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="The BPF Traffic Collector"
+SRC_URI="ftp://ftp.riss-telecom.ru/pub/dev/trafd/${P}.tgz
+	http://metalab.unc.edu/pub/Linux/system/network/management/tcpdump-richard-1.7.tar.gz"
+HOMEPAGE="ftp://ftp.riss-telecom.ru/pub/dev/trafd/"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~x86"
+IUSE=""
+
+# -lbpft -lpcap -lcurses -ltermcap -lfl
+DEPEND="net-libs/libpcap
+	sys-libs/ncurses
+	sys-devel/flex"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gentoo.diff"
+}
+
+src_compile() {
+	emake FLAGS="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install () {
+	dodir /usr/bin /etc /usr/share/doc/trafd-3.0.1 /var/trafd
+	emake install DESTDIR="${D}" || die "emake install failed"
+	newinitd "${FILESDIR}/trafd.init" trafd
+	newconfd "${FILESDIR}/trafd.conf" trafd
+}
+
+pkg_postinst() {
+	ewarn "NOTE: if you want to run trafd on boot then execute"
+	ewarn "rc-update add trafd default"
+	ewarn "change interfaces in /etc/conf.d/trafd (default is eth0)"
+}