* [gentoo-commits] gentoo-x86 commit in net-dns/dnshijacker/files: 1.3-libnet-1.0.patch
@ 2010-09-18 23:24 Jeroen Roovers (jer)
0 siblings, 0 replies; only message in thread
From: Jeroen Roovers (jer) @ 2010-09-18 23:24 UTC (permalink / raw
To: gentoo-commits
jer 10/09/18 23:24:50
Modified: 1.3-libnet-1.0.patch
Log:
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)
Revision Changes Path
1.2 net-dns/dnshijacker/files/1.3-libnet-1.0.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnshijacker/files/1.3-libnet-1.0.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnshijacker/files/1.3-libnet-1.0.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-dns/dnshijacker/files/1.3-libnet-1.0.patch?r1=1.1&r2=1.2
Index: 1.3-libnet-1.0.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-dns/dnshijacker/files/1.3-libnet-1.0.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 1.3-libnet-1.0.patch 21 Aug 2003 05:04:32 -0000 1.1
+++ 1.3-libnet-1.0.patch 18 Sep 2010 23:24:50 -0000 1.2
@@ -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>
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-09-18 23:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-18 23:24 [gentoo-commits] gentoo-x86 commit in net-dns/dnshijacker/files: 1.3-libnet-1.0.patch Jeroen Roovers (jer)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox