Respect LDFLAGS (bug #336187), CC and CFLAGS (by adapting the patch, mostly). Fix one compiler warning. Clean up patch.

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

3 files changed, 72 insertions, 30 deletions

diff --git a/net-dns/dnshijacker/ChangeLog b/net-dns/dnshijacker/ChangeLog
index 437851218458..4fc00b0ad29e 100644
--- a/net-dns/dnshijacker/ChangeLog
+++ b/net-dns/dnshijacker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/dnshijacker
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnshijacker/ChangeLog,v 1.11 2008/01/21 18:36:04 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnshijacker/ChangeLog,v 1.12 2010/09/18 23:24:50 jer Exp $
+
+*dnshijacker-1.3-r2 (18 Sep 2010)
+
+  18 Sep 2010; Jeroen Roovers <jer@gentoo.org> files/1.3-libnet-1.0.patch,
+  +dnshijacker-1.3-r2.ebuild:
+  Respect LDFLAGS (bug #336187), CC and CFLAGS (by adapting the patch,
+  mostly). Fix one compiler warning. Clean up patch.
 
   21 Jan 2008; Raúl Porcel <armin76@gentoo.org> -dnshijacker-1.3.ebuild:
   old
diff --git a/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild b/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
new file mode 100644
index 000000000000..48a3cbe99b16
--- /dev/null
+++ b/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild,v 1.1 2010/09/18 23:24:50 jer Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="a libnet/libpcap based packet sniffer and spoofer"
+HOMEPAGE="http://pedram.redhive.com/projects.php"
+SRC_URI="http://pedram.redhive.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+DEPEND="net-libs/libpcap
+	>=net-libs/libnet-1.0.2a-r3
+	<net-libs/libnet-1.1"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-libnet-1.0.patch
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) || die
+}
+
+src_install() {
+	dosbin dnshijacker ask_dns answer_dns
+
+	insinto /etc/dnshijacker
+	doins ftable
+
+	dodoc README
+}
diff --git a/net-dns/dnshijacker/files/1.3-libnet-1.0.patch b/net-dns/dnshijacker/files/1.3-libnet-1.0.patch
index 08337d5c8282..b9fe3193d1b4 100644
--- a/net-dns/dnshijacker/files/1.3-libnet-1.0.patch
+++ b/net-dns/dnshijacker/files/1.3-libnet-1.0.patch
@@ -1,39 +1,36 @@
-diff -U 0 -r dnshijacker-1.3.orig/Makefile dnshijacker-1.3/Makefile
---- dnshijacker-1.3.orig/Makefile	2003-08-19 15:39:54.068117160 -0400
-+++ dnshijacker-1.3/Makefile	2003-08-19 15:40:26.836135664 -0400
+--- a/answer_dns.c	2002-10-28 02:58:37.000000000 +0100
++++ b/answer_dns.c	2010-09-19 01:16:28.000000000 +0200
+@@ -5 +5 @@
+-#include <libnet.h>

++#include <libnet-1.0.h>

+--- a/ask_dns.c	2002-10-28 02:58:34.000000000 +0100
++++ b/ask_dns.c	2010-09-19 01:16:28.000000000 +0200
+@@ -5 +5 @@
+-#include <libnet.h>

++#include <libnet-1.0.h>

+--- a/dnshijacker.h	2002-11-18 05:21:48.000000000 +0100
++++ b/dnshijacker.h	2010-09-19 01:16:28.000000000 +0200
+@@ -10 +10 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+@@ -70,0 +71 @@
++int dn_expand(u_char * dns, u_char *packet, char *data, char *name, int length);
+--- a/Makefile	2002-12-02 01:51:09.000000000 +0100
++++ b/Makefile	2010-09-19 01:16:28.000000000 +0200
 @@ -4 +4 @@
 -	gcc ask_dns.c -lnet `libnet-config --defines` -o ask_dns
-+	gcc ask_dns.c -lnet-1.0 `libnet-1.0-config --defines` -o ask_dns
++	$(CC) $(CFLAGS) $(LDFLAGS) ask_dns.c -lnet-1.0 `libnet-1.0-config --defines` -o ask_dns
 @@ -7 +7 @@
 -	gcc answer_dns.c -lnet `libnet-config --defines` -o answer_dns
-+	gcc answer_dns.c -lnet-1.0 `libnet-1.0-config --defines` -o answer_dns
++	$(CC) $(CFLAGS) $(LDFLAGS) answer_dns.c -lnet-1.0 `libnet-1.0-config --defines` -o answer_dns
 @@ -10 +10 @@
 -	gcc dnshijacker.c -lpcap -lnet -lresolv `libnet-config --defines` -o dnshijacker
-+	gcc dnshijacker.c -lpcap -lnet-1.0 -lresolv `libnet-1.0-config --defines` -o dnshijacker
++	$(CC) $(CFLAGS) $(LDFLAGS) dnshijacker.c -lpcap -lnet-1.0 -lresolv `libnet-1.0-config --defines` -o dnshijacker
 @@ -13 +13 @@
 -	gcc dnshijacker.c -lpcap -lnet -lresolv `libnet-config --defines` -o dnshijacker -DDEBUG -ggdb
-+	gcc dnshijacker.c -lpcap -lnet-1.0 -lresolv `libnet-1.0-config --defines` -o dnshijacker -DDEBUG -ggdb
-diff -U 0 -r dnshijacker-1.3.orig/README dnshijacker-1.3/README
---- dnshijacker-1.3.orig/README	2003-08-19 15:39:54.068117160 -0400
-+++ dnshijacker-1.3/README	2003-08-19 15:40:26.840135056 -0400
++	$(CC) $(CFLAGS) $(LDFLAGS) dnshijacker.c -lpcap -lnet-1.0 -lresolv `libnet-1.0-config --defines` -o dnshijacker -DDEBUG -ggdb
+--- a/README	2002-10-30 06:12:09.000000000 +0100
++++ b/README	2010-09-19 01:16:28.000000000 +0200
 @@ -61 +61 @@
 -	gcc dnshijacker.c -lpcap -lnet `libnet-config --defines` -o dnshijacker
 +	gcc dnshijacker.c -lpcap -lnet-1.0 `libnet-1.0-config --defines` -o dnshijacker
-diff -U 0 -r dnshijacker-1.3.orig/answer_dns.c dnshijacker-1.3/answer_dns.c
---- dnshijacker-1.3.orig/answer_dns.c	2003-08-19 15:39:54.069117008 -0400
-+++ dnshijacker-1.3/answer_dns.c	2003-08-19 15:40:48.815794248 -0400
-@@ -5 +5 @@
--#include <libnet.h>

-+#include <libnet-1.0.h>

-diff -U 0 -r dnshijacker-1.3.orig/ask_dns.c dnshijacker-1.3/ask_dns.c
---- dnshijacker-1.3.orig/ask_dns.c	2003-08-19 15:39:54.068117160 -0400
-+++ dnshijacker-1.3/ask_dns.c	2003-08-19 15:40:48.816794096 -0400
-@@ -5 +5 @@
--#include <libnet.h>

-+#include <libnet-1.0.h>

-diff -U 0 -r dnshijacker-1.3.orig/dnshijacker.h dnshijacker-1.3/dnshijacker.h
---- dnshijacker-1.3.orig/dnshijacker.h	2003-08-19 15:39:54.068117160 -0400
-+++ dnshijacker-1.3/dnshijacker.h	2003-08-19 15:40:48.818793792 -0400
-@@ -10 +10 @@
--#include <libnet.h>
-+#include <libnet-1.0.h>