Add in patch, fixes bug #165255.

Package-Manager: portage-2.1.2-r6

3 files changed, 139 insertions, 5 deletions

diff --git a/net-misc/nemesis/ChangeLog b/net-misc/nemesis/ChangeLog
index 593b66d7f168..70fea3d7db90 100644
--- a/net-misc/nemesis/ChangeLog
+++ b/net-misc/nemesis/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/nemesis
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nemesis/ChangeLog,v 1.15 2007/02/03 21:33:32 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nemesis/ChangeLog,v 1.16 2007/02/04 14:48:37 weeve Exp $
+
+  04 Feb 2007; Jason Wever <weeve@gentoo.org> +files/1.4-libnet-1.0.patch:
+  Add in patch, fixes bug #165255.
 
 *nemesis-1.4 (03 Feb 2007)
 
diff --git a/net-misc/nemesis/Manifest b/net-misc/nemesis/Manifest
index edb45d4a9f28..7231ee519bda 100644
--- a/net-misc/nemesis/Manifest
+++ b/net-misc/nemesis/Manifest
@@ -1,3 +1,7 @@
+AUX 1.4-libnet-1.0.patch 6278 RMD160 5ac988a784f595a10f4f09d19a4ef41785f4e696 SHA1 8844853ffeef97ae7fd7a4286431634e257c0b10 SHA256 1e79c8c0a9d848a657c2e14d062f7c6d0a51fe66a7c9d56266dd65952acfdafc
+MD5 a863760bb95e2c6760ef8a89b820b713 files/1.4-libnet-1.0.patch 6278
+RMD160 5ac988a784f595a10f4f09d19a4ef41785f4e696 files/1.4-libnet-1.0.patch 6278
+SHA256 1e79c8c0a9d848a657c2e14d062f7c6d0a51fe66a7c9d56266dd65952acfdafc files/1.4-libnet-1.0.patch 6278
 AUX 1.4_beta3-libnet-1.0.patch 6121 RMD160 750fdbfe04cc6aed69e409db79778def22162b4f SHA1 ae5263263008fb21986224566bcd75e863e52ec6 SHA256 f9bd73b5e551340d98b1c1bb4a8017dd06d5536e57b4ae62e49530243cefdd5d
 MD5 6ef15c54cfa32b816e14908e1e4f5547 files/1.4_beta3-libnet-1.0.patch 6121
 RMD160 750fdbfe04cc6aed69e409db79778def22162b4f files/1.4_beta3-libnet-1.0.patch 6121
@@ -12,10 +16,10 @@ EBUILD nemesis-1.4_beta3.ebuild 794 RMD160 360df90b1ed3dee1702aebcf41e0076344c87
 MD5 6b5ba0f6622c28e86d031bc3d1a76fc5 nemesis-1.4_beta3.ebuild 794
 RMD160 360df90b1ed3dee1702aebcf41e0076344c877bd nemesis-1.4_beta3.ebuild 794
 SHA256 50dd6f4559f951e661243f26384f2941890b398de3abd020611abdd3b4237811 nemesis-1.4_beta3.ebuild 794
-MISC ChangeLog 1759 RMD160 9c58377fe7dea21521fb7c12fe2e8812306375ec SHA1 52dcaf7031552cf89cf06d6bc65965c9aa7b4aff SHA256 13187365bff522b767998bb5e8b645fb83da2e6c4ef9b00ee8683214e98be164
-MD5 7da57b1653d3a44b0178ff2f264ffdc8 ChangeLog 1759
-RMD160 9c58377fe7dea21521fb7c12fe2e8812306375ec ChangeLog 1759
-SHA256 13187365bff522b767998bb5e8b645fb83da2e6c4ef9b00ee8683214e98be164 ChangeLog 1759
+MISC ChangeLog 1870 RMD160 8bda1076c2f5e26a505051c21b0f3e41eb5c6360 SHA1 527e4f7a32720fca425ead431c305804f0cd7000 SHA256 14115ee1ea61dba481ae511278226b36881b35b4f46b67bb57a42f876bda07b6
+MD5 ed79227ff0b72b492e487c3701e6ccbb ChangeLog 1870
+RMD160 8bda1076c2f5e26a505051c21b0f3e41eb5c6360 ChangeLog 1870
+SHA256 14115ee1ea61dba481ae511278226b36881b35b4f46b67bb57a42f876bda07b6 ChangeLog 1870
 MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7
 MD5 38cacf4270b8a100918bf328ed9154d3 metadata.xml 314
 RMD160 25181cde297628576a9545bea3a76601485bfaf3 metadata.xml 314
diff --git a/net-misc/nemesis/files/1.4-libnet-1.0.patch b/net-misc/nemesis/files/1.4-libnet-1.0.patch
new file mode 100644
index 000000000000..b4c55c374efa
--- /dev/null
+++ b/net-misc/nemesis/files/1.4-libnet-1.0.patch
@@ -0,0 +1,127 @@
+--- nemesis-1.4.orig/configure	2006-12-15 13:56:46.000000000 -0700
++++ nemesis-1.4/configure	2006-12-15 14:17:33.000000000 -0700
+@@ -4150 +4150 @@
+-CPPFLAGS="${CPPFLAGS} `libnet-config --defines`"
++CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --defines`"
+@@ -4153 +4153 @@
+-if test `libnet-config --cflags | wc -c` = "1"; then
++if test `libnet-1.0-config --cflags | wc -c` = "1"; then
+@@ -4157 +4157 @@
+-    CPPFLAGS="${CPPFLAGS} `libnet-config --cflags`"
++    CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --cflags`"
+@@ -4160,3 +4160,3 @@
+-if test `libnet-config --libs | wc -c` = "1"; then
+-    { echo "$as_me:$LINENO: WARNING: libnet-config --libs is broken on your system.  If you" >&5
+-echo "$as_me: WARNING: libnet-config --libs is broken on your system.  If you" >&2;}
++if test `libnet-1.0-config --libs | wc -c` = "1"; then
++    { echo "$as_me:$LINENO: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&5
++echo "$as_me: WARNING: libnet-1.0-config --libs is broken on your system.  If you" >&2;}
+@@ -4167 +4167 @@
+-    LIBS="${LIBS} `libnet-config --libs | sed s/\-lnet//`"
++    LIBS="${LIBS} `libnet-1.0-config --libs | sed s/\-lnet-1.0//`"
+@@ -4712,2 +4712,2 @@
+-echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet" >&5
+-echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for libnet_build_ip in -lnet-1.0" >&5
++echo $ECHO_N "checking for libnet_build_ip in -lnet-1.0... $ECHO_C" >&6
+@@ -4718 +4718 @@
+-LIBS="-lnet  $LIBS"
++LIBS="-lnet-1.0  $LIBS"
+@@ -4781 +4781 @@
+-  LIBS="-lnet $LIBS"
++  LIBS="-lnet-1.0 $LIBS"
+@@ -5263 +5263 @@
+-for ac_header in libnet.h
++for ac_header in libnet-1.0.h
+@@ -5433 +5433 @@
+-    libnet_dir=`libnet-config --cflags | cut -dI -f2`
++    libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
+@@ -5438 +5438 @@
+-    if test -r $i/libnet.h; then
++    if test -r $i/libnet-1.0.h; then
+@@ -5444 +5444 @@
+-    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet.h | grep -v 1.0.2a >/dev/null"; then
++    if eval "grep LIBNET_VERSION $LIBNET_INC_DIR/libnet-1.0.h | grep -v 1.0.2a >/dev/null"; then
+@@ -5455 +5455 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+@@ -5474 +5474 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-arp.h nemesis-1.4beta3/src/nemesis-arp.h
+--- nemesis-1.4beta3.orig/src/nemesis-arp.h	2003-08-19 15:45:45.675664688 -0400
++++ nemesis-1.4beta3/src/nemesis-arp.h	2003-08-19 15:47:07.631205552 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-dns.h nemesis-1.4beta3/src/nemesis-dns.h
+--- nemesis-1.4beta3.orig/src/nemesis-dns.h	2003-08-19 15:45:45.675664688 -0400
++++ nemesis-1.4beta3/src/nemesis-dns.h	2003-08-19 15:47:07.638204488 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ethernet.h nemesis-1.4beta3/src/nemesis-ethernet.h
+--- nemesis-1.4beta3.orig/src/nemesis-ethernet.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-ethernet.h	2003-08-19 15:47:07.641204032 -0400
+@@ -29 +29 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-functions.c nemesis-1.4beta3/src/nemesis-functions.c
+--- nemesis-1.4beta3.orig/src/nemesis-functions.c	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-functions.c	2003-08-19 15:47:07.656201752 -0400
+@@ -37 +37 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-icmp.h nemesis-1.4beta3/src/nemesis-icmp.h
+--- nemesis-1.4beta3.orig/src/nemesis-icmp.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-icmp.h	2003-08-19 15:47:07.665200384 -0400
+@@ -31 +31 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-igmp.h nemesis-1.4beta3/src/nemesis-igmp.h
+--- nemesis-1.4beta3.orig/src/nemesis-igmp.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-igmp.h	2003-08-19 15:47:07.670199624 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ip.h nemesis-1.4beta3/src/nemesis-ip.h
+--- nemesis-1.4beta3.orig/src/nemesis-ip.h	2003-08-19 15:45:45.676664536 -0400
++++ nemesis-1.4beta3/src/nemesis-ip.h	2003-08-19 15:47:07.677198560 -0400
+@@ -26 +26 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-ospf.h nemesis-1.4beta3/src/nemesis-ospf.h
+--- nemesis-1.4beta3.orig/src/nemesis-ospf.h	2003-08-19 15:45:45.677664384 -0400
++++ nemesis-1.4beta3/src/nemesis-ospf.h	2003-08-19 15:47:07.684197496 -0400
+@@ -33 +33 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-rip.h nemesis-1.4beta3/src/nemesis-rip.h
+--- nemesis-1.4beta3.orig/src/nemesis-rip.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis-rip.h	2003-08-19 15:47:07.717192480 -0400
+@@ -33 +33 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-tcp.h nemesis-1.4beta3/src/nemesis-tcp.h
+--- nemesis-1.4beta3.orig/src/nemesis-tcp.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis-tcp.h	2003-08-19 15:47:07.723191568 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis-udp.h nemesis-1.4beta3/src/nemesis-udp.h
+--- nemesis-1.4beta3.orig/src/nemesis-udp.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis-udp.h	2003-08-19 15:47:07.728190808 -0400
+@@ -30 +30 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+diff -r -U 0 nemesis-1.4beta3.orig/src/nemesis.h nemesis-1.4beta3/src/nemesis.h
+--- nemesis-1.4beta3.orig/src/nemesis.h	2003-08-19 15:45:45.678664232 -0400
++++ nemesis-1.4beta3/src/nemesis.h	2003-08-19 15:47:07.731190352 -0400
+@@ -15 +15 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
+--- nemesis-1.4.orig/src/nemesis-printout.c	2006-12-15 13:56:46.000000000 -0700
++++ nemesis-1.4/src/nemesis-printout.c	2006-12-15 14:47:14.000000000 -0700
+@@ -34 +34 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>