Use separate patches after all to restore the stable version to its former glory (respect CFLAGS).

Package-Manager: portage-2.2_rc83/cvs/Linux i686

5 files changed, 76 insertions, 31 deletions

diff --git a/net-dns/dnshijacker/ChangeLog b/net-dns/dnshijacker/ChangeLog
index 4fc00b0ad29e..f0fcdaa6d18c 100644
--- a/net-dns/dnshijacker/ChangeLog
+++ b/net-dns/dnshijacker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/dnshijacker
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnshijacker/ChangeLog,v 1.13 2010/09/18 23:43:05 jer Exp $
+
+  18 Sep 2010; Jeroen Roovers <jer@gentoo.org> files/1.3-libnet-1.0.patch,
+  dnshijacker-1.3-r2.ebuild, +files/dnshijacker-1.3-gentoo.patch:
+  Use separate patches after all to restore the stable version to its former
+  glory (respect CFLAGS).
 
 *dnshijacker-1.3-r2 (18 Sep 2010)
 
diff --git a/net-dns/dnshijacker/Manifest b/net-dns/dnshijacker/Manifest
index 245f5e5536ff..aff5487fd6b6 100644
--- a/net-dns/dnshijacker/Manifest
+++ b/net-dns/dnshijacker/Manifest
@@ -1,6 +1,7 @@
-AUX 1.3-libnet-1.0.patch 1758 RMD160 8ee45c80e907b38c8ff0a047f912bdccd2b63e9b SHA1 afd56bbca9de526ec1e7f0451a61746e1b680907 SHA256 dbdee16f91a90dd80bba52e71b56afd50e651ea3df8ad1f8f168239ef17ba3fc
+AUX 1.3-libnet-1.0.patch 2089 RMD160 a4b8a3f641ba641af48a19b3da33b83d35edd165 SHA1 ddfd94ddd0a02611777443e260413e8bddb4ddb5 SHA256 a3a0c31fa9dab768f80563051488bb19d5bb0e5733a0bfb19ff9c772e2f91389
+AUX dnshijacker-1.3-gentoo.patch 1758 RMD160 8ee45c80e907b38c8ff0a047f912bdccd2b63e9b SHA1 afd56bbca9de526ec1e7f0451a61746e1b680907 SHA256 dbdee16f91a90dd80bba52e71b56afd50e651ea3df8ad1f8f168239ef17ba3fc
 DIST dnshijacker-1.3.tar.gz 23569 RMD160 4ee8f902b464381a87d7898f074e649d276fe061 SHA1 80373a4d9b545b1e06b1c816d7403b515ba429be SHA256 4040cb211860bec4dd43af09e157da25ebd20189d35884c11639d281ef7cd16a
 EBUILD dnshijacker-1.3-r1.ebuild 821 RMD160 5326a3096342a4b2b2c12d62a7a993bd79051b33 SHA1 d65581e957b77c7407f00c2034625113665b4876 SHA256 15d0b740e3da50a1bd3217e28c606600f84ff31d8b56545f1c44a6f98dd6c838
-EBUILD dnshijacker-1.3-r2.ebuild 813 RMD160 c92315c92da1b405fdb69c0e31b21b11808204b0 SHA1 e01425dd9c727458dd7684be9e376e45ff450351 SHA256 147f164c4b8c2fed865fd5e4f21052c93e0a237d9e6088b7932dcf8360f2dc84
-MISC ChangeLog 1596 RMD160 b6efd5a34b0e53fb6f377a8758b1140b43f94b4f SHA1 83662ca71ba0becad0895b4babd5f6f52ac1df0d SHA256 4fe3c8590631149edeb94407de9240c1bd1fc771899bf1d5bbf475c63c90b823
+EBUILD dnshijacker-1.3-r2.ebuild 808 RMD160 d44bce4c23105d45a5375ac6173606cc71497246 SHA1 0fbfc33e931532abdfcff5f83fa8f8ac808a4244 SHA256 012d18b1aadf814798ca42b9d70ddc1e9fea8f941284875c3002ad779e00771f
+MISC ChangeLog 1841 RMD160 76754a1ac4be6d72ed25fcf5c7e4a1dc15b0c3b3 SHA1 dde9595f1b2f267cac0dd0fbdfc5a6518297b637 SHA256 d3507f13303b2d1190bb2935c3a20a796781ad456a010ff44d38087f031b781c
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
diff --git a/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild b/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
index 48a3cbe99b16..99f94ce9e5ca 100644
--- a/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
+++ b/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild,v 1.2 2010/09/18 23:43:05 jer Exp $
 
 EAPI="2"
 
@@ -21,7 +21,7 @@ DEPEND="net-libs/libpcap
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PV}-libnet-1.0.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_compile() {
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 b9fe3193d1b4..08337d5c8282 100644
--- a/net-dns/dnshijacker/files/1.3-libnet-1.0.patch
+++ b/net-dns/dnshijacker/files/1.3-libnet-1.0.patch
@@ -1,36 +1,39 @@
---- 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
+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
 @@ -4 +4 @@
 -	gcc ask_dns.c -lnet `libnet-config --defines` -o ask_dns
-+	$(CC) $(CFLAGS) $(LDFLAGS) ask_dns.c -lnet-1.0 `libnet-1.0-config --defines` -o ask_dns
++	gcc 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
-+	$(CC) $(CFLAGS) $(LDFLAGS) answer_dns.c -lnet-1.0 `libnet-1.0-config --defines` -o answer_dns
++	gcc 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
-+	$(CC) $(CFLAGS) $(LDFLAGS) dnshijacker.c -lpcap -lnet-1.0 -lresolv `libnet-1.0-config --defines` -o dnshijacker
++	gcc 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
-+	$(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
++	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
 @@ -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>
diff --git a/net-dns/dnshijacker/files/dnshijacker-1.3-gentoo.patch b/net-dns/dnshijacker/files/dnshijacker-1.3-gentoo.patch
new file mode 100644
index 000000000000..b9fe3193d1b4
--- /dev/null
+++ b/net-dns/dnshijacker/files/dnshijacker-1.3-gentoo.patch
@@ -0,0 +1,36 @@
+--- 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
++	$(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
++	$(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
++	$(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
++	$(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