expanded patch to fix selftest routine.

6 files changed, 104 insertions, 14 deletions

diff --git a/net-libs/libnet/ChangeLog b/net-libs/libnet/ChangeLog
index 3a584d82bfcc..ccabe482e186 100644
--- a/net-libs/libnet/ChangeLog
+++ b/net-libs/libnet/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/libnet
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.36 2004/07/26 03:48:13 j4rg0n Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/ChangeLog,v 1.37 2005/01/11 14:10:22 dragonheart Exp $
+
+  11 Jan 2005; Daniel Black <dragonheart@gentoo.org> files/1.0.2a-slot.patch:
+  expanded patch to fix selftest routine.
 
   25 Jul 2004; Lina Pezzella <j4rg0n@gentoo.org>
   Fixed Manifest.
diff --git a/net-libs/libnet/Manifest b/net-libs/libnet/Manifest
index 2452c649be33..0f29dd8197e9 100644
--- a/net-libs/libnet/Manifest
+++ b/net-libs/libnet/Manifest
@@ -1,10 +1,20 @@
-MD5 b8e7da7dfd0890ced0cd36607078186d ChangeLog 4780
-MD5 f25fac9c337ce1eae2891b02cd0aa30b libnet-1.0.2a-r3.ebuild 1640
-MD5 ec8ff74cb301e4755dc729d134238626 libnet-1.1.1.ebuild 752
-MD5 0926a713d8b3b8ed644edff8da943c41 libnet-1.1.2.1.ebuild 957
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 a2ed3e86b9708d48e1fa8d7c284fe69b ChangeLog 4906
+MD5 5c590469bd3d44a28a8b6398e04978f5 libnet-1.0.2a-r3.ebuild 1643
+MD5 77697a1030a97807a274548f08f58079 libnet-1.1.1.ebuild 755
 MD5 cd29ba7b7d1d108332a6b28e101ec2d6 metadata.xml 1084
-MD5 03222434915e5cdf87199c89f16fd09e files/1.0.2a-slot.patch 4889
-MD5 356ec47bcb6b32a9ff6e74daf17980f9 files/digest-libnet-1.1.1 64
+MD5 df84810970e192e4dbc4d648db26e76d libnet-1.1.2.1.ebuild 959
+MD5 2c90cae2a7fff0c8bf6fbee5977bfda0 files/1.0.2a-slot.patch 7696
 MD5 69c5edaa98f4890a0b542a8fe9937383 files/digest-libnet-1.0.2a-r3 65
+MD5 356ec47bcb6b32a9ff6e74daf17980f9 files/digest-libnet-1.1.1 64
 MD5 503929f0e619836305f1e58a151baee4 files/libnet-gcc33-fix 563
 MD5 2618eca70575dcefd452e252db8fe704 files/digest-libnet-1.1.2.1 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFB495UmdTrptrqvGERAldAAJ9loIsadfBVoSruBk+JgqM0jMipYgCdGEt8
+FI+Tgs/WxWoCN09fzf9UHBM=
+=fK0+
+-----END PGP SIGNATURE-----
diff --git a/net-libs/libnet/files/1.0.2a-slot.patch b/net-libs/libnet/files/1.0.2a-slot.patch
index af0b92f2c3a1..fa1e5a6508bc 100644
--- a/net-libs/libnet/files/1.0.2a-slot.patch
+++ b/net-libs/libnet/files/1.0.2a-slot.patch
@@ -115,3 +115,80 @@ diff -ur Libnet-1.0.2a.orig/libnet-config.in Libnet-1.0.2a/libnet-config.in
          [--libs]
          [--cflags]
 Only in Libnet-1.0.2a/support/bpf-lkm/OpenBSD: OpenBSD
+--- Libnet-1.0.2a/test/Ethernet/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/Ethernet/Makefile.in	2005-01-11 23:32:08.825695008 +0930
+@@ -10,7 +10,7 @@
+ CFLAGS      =   @CFLAGS@
+ OBJECTS     =   arp.o tcp.o icmp_mask.o get_address.o poink.o
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/ICMP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/ICMP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+@@ -15,7 +15,7 @@
+ 		ping_of_death.o
+ 
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/IP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/IP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+@@ -10,7 +10,7 @@
+ OBJECTS     =   
+ 
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/OSPF/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/OSPF/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+@@ -12,7 +12,7 @@
+ 		ospf_request.o   \
+ 
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/Random/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/Random/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+@@ -9,7 +9,7 @@
+ CFLAGS      =   @CFLAGS@
+ OBJECTS     =   prand_trials.o
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/TCP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/TCP/Makefile.in	2005-01-11 23:32:08.826694856 +0930
+@@ -13,7 +13,7 @@
+                 tcp+data+ipopt.o
+ 
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
+--- Libnet-1.0.2a/test/UDP/Makefile.in.orig	2000-05-25 09:58:49.000000000 +0930
++++ Libnet-1.0.2a/test/UDP/Makefile.in	2005-01-11 23:32:08.827694704 +0930
+@@ -11,7 +11,7 @@
+                 udp+data.o
+ 
+ DEFINES     +=  @DEFS@
+-LIBS        =   -L../../lib/ -lnet @ADDITIONAL_LIBS@
++LIBS        =   -L../../lib/ -lnet-1.0 @ADDITIONAL_LIBS@
+ 
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES) -c $< -o $@
diff --git a/net-libs/libnet/libnet-1.0.2a-r3.ebuild b/net-libs/libnet/libnet-1.0.2a-r3.ebuild
index 076610217839..30c1d02244f5 100644
--- a/net-libs/libnet/libnet-1.0.2a-r3.ebuild
+++ b/net-libs/libnet/libnet-1.0.2a-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.0.2a-r3.ebuild,v 1.11 2004/06/24 23:13:27 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.0.2a-r3.ebuild,v 1.12 2005/01/11 14:10:22 dragonheart Exp $
 
 inherit eutils
 
diff --git a/net-libs/libnet/libnet-1.1.1.ebuild b/net-libs/libnet/libnet-1.1.1.ebuild
index cf55d946cfcc..d97402c3525a 100644
--- a/net-libs/libnet/libnet-1.1.1.ebuild
+++ b/net-libs/libnet/libnet-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.1.1.ebuild,v 1.7 2004/07/15 00:55:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.1.1.ebuild,v 1.8 2005/01/11 14:10:22 dragonheart Exp $
 
 DESCRIPTION="library to provide an API for commonly used low-level network functions (mainly packet injection)"
 HOMEPAGE="http://www.packetfactory.net/libnet/"
diff --git a/net-libs/libnet/libnet-1.1.2.1.ebuild b/net-libs/libnet/libnet-1.1.2.1.ebuild
index 25cf60672286..e53974548cb6 100644
--- a/net-libs/libnet/libnet-1.1.2.1.ebuild
+++ b/net-libs/libnet/libnet-1.1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.1.2.1.ebuild,v 1.10 2004/10/23 07:50:07 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libnet/libnet-1.1.2.1.ebuild,v 1.11 2005/01/11 14:10:22 dragonheart Exp $
 
 inherit gnuconfig