diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2010-09-18 23:24:50 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2010-09-18 23:24:50 +0000 |
| commit | 8aa5311c9bc092fc9942fc8f6451c9200af728a2 (patch) | |
| tree | 72e7a62ce841923cdcb90fd37ebec02b7b739bf9 /net-dns/dnshijacker/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-8aa5311c9bc092fc9942fc8f6451c9200af728a2.tar.gz gentoo-2-8aa5311c9bc092fc9942fc8f6451c9200af728a2.tar.bz2 gentoo-2-8aa5311c9bc092fc9942fc8f6451c9200af728a2.zip | |
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)
Diffstat (limited to 'net-dns/dnshijacker/files')
| -rw-r--r-- | net-dns/dnshijacker/files/1.3-libnet-1.0.patch | 53 |
1 files changed, 25 insertions, 28 deletions
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> |