patch to compile against SLOT-ed libnet #17772

4 files changed, 78 insertions, 7 deletions

diff --git a/net-analyzer/tcptraceroute/ChangeLog b/net-analyzer/tcptraceroute/ChangeLog
index b68af384cfb1..802821101cb8 100644
--- a/net-analyzer/tcptraceroute/ChangeLog
+++ b/net-analyzer/tcptraceroute/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/tcptraceroute
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/ChangeLog,v 1.9 2003/06/25 17:25:55 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/ChangeLog,v 1.10 2003/08/21 04:56:04 vapier Exp $
+
+*tcptraceroute-1.4-r2 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
 
 *tcptraceroute-1.4-r1 (25 Jun 2003)
 
@@ -18,21 +23,15 @@
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
 
   18 Aug 2002; Bruce A. Locke <blocke@shivan.org> tcptraceroute-1.4.ebuild:
-
   Version Bump.
 
 *tcptraceroute-1.2 (1 Feb 2002)
 
   06 Aug 2002; Mark Guertin <gerk@gentoo.org> :
-
   Added ppc to keywords
 
   28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
-
   moved to net-analyzer - added SLOT - added LICENSE
 
   27 Mar 2002; Seemant Kulleen <seemant@gentoo.org> tcptraceroute-1.2.ebuild :
-
   Ungzipped HTML documentation.
-
-
diff --git a/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch b/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch
new file mode 100644
index 000000000000..6ac2b305ab47
--- /dev/null
+++ b/net-analyzer/tcptraceroute/files/1.4-libnet-1.0.patch
@@ -0,0 +1,34 @@
+--- Makefile.orig	2003-08-19 01:31:28.963869296 -0400
++++ Makefile	2003-08-19 01:31:45.567345184 -0400
+@@ -11 +11 @@
+-	$(CC) $(CFLAGS) `libnet-config --defines` \
++	$(CC) $(CFLAGS) `libnet-1.0-config --defines` \
+@@ -13 +13 @@
+-		`libnet-config --libs` -lpcap
++		`libnet-1.0-config --libs` -lpcap
+--- tcptraceroute.c.orig	2003-08-19 01:31:32.991257040 -0400
++++ tcptraceroute.c	2003-08-19 01:32:02.723737016 -0400
+@@ -27,2 +27,2 @@
+- *	gcc -O2 -Wall `libnet-config --defines` \
+- *		-o tcptraceroute tcptraceroute.c `libnet-config --libs` -lpcap
++ *	gcc -O2 -Wall `libnet-1.0-config --defines` \
++ *		-o tcptraceroute tcptraceroute.c `libnet-1.0-config --libs` -lpcap
+@@ -201 +201 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+@@ -394,4 +394,4 @@
+-    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]
+-       [-l <packet length>] [-q <number of queries>] [-t <tos>]
+-       [-m <max ttl>] [-pP] <source port>] [-s <source address>]
+-       [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
++    fatal("Usage: %s [-nNFSAE] [-i <interface>] [-f <first ttl>]\n"\
++"       [-l <packet length>] [-q <number of queries>] [-t <tos>]\n"\
++"       [-m <max ttl>] [-pP] <source port>] [-s <source address>]\n"\
++"       [-w <wait time>] <host> [destination port] [packet length]\n\n", name);
+@@ -1185,3 +1185,3 @@
+-	safe_snprintf(filter, TEXTSIZE, "
+-		(tcp and src host %s and src port %d and dst host %s)
+-		or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
++	safe_snprintf(filter, TEXTSIZE, \
++"		(tcp and src host %s and src port %d and dst host %s)\n"\
++"		or ((icmp[0] == 11 or icmp[0] == 3) and dst host %s)",
diff --git a/net-analyzer/tcptraceroute/files/digest-tcptraceroute-1.4-r2 b/net-analyzer/tcptraceroute/files/digest-tcptraceroute-1.4-r2
new file mode 100644
index 000000000000..239760bcca0e
--- /dev/null
+++ b/net-analyzer/tcptraceroute/files/digest-tcptraceroute-1.4-r2
@@ -0,0 +1 @@
+MD5 35c5e7d960f2b073db0109e0004e134e tcptraceroute-1.4.tar.gz 31918
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.4-r2.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.4-r2.ebuild
new file mode 100644
index 000000000000..cf6b031923ac
--- /dev/null
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.4-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcptraceroute/tcptraceroute-1.4-r2.ebuild,v 1.1 2003/08/21 04:56:04 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="tcptraceroute is a traceroute implementation using TCP packets"
+HOMEPAGE="http://michael.toren.net/code/tcptraceroute/"
+SRC_URI="http://michael.toren.net/code/tcptraceroute/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~arm"
+
+DEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.0.2a-r3
+	<net-libs/libnet-1.1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
+}
+
+src_compile() {
+	make CFLAGS="$CFLAGS" || die
+}
+
+src_install() {
+	dobin tcptraceroute
+	fperms u+s /usr/bin/tcptraceroute
+
+	doman tcptraceroute.8
+	dodoc examples.txt COPYING README changelog
+	dohtml -r ./
+}