patch to compile against SLOT-ed libnet #17772

8 files changed, 268 insertions, 4 deletions

diff --git a/net-misc/nemesis/ChangeLog b/net-misc/nemesis/ChangeLog
index dcebbfabbdfc..36756d07bd94 100644
--- a/net-misc/nemesis/ChangeLog
+++ b/net-misc/nemesis/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/nemesis
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/nemesis/ChangeLog,v 1.7 2003/03/25 05:20:11 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nemesis/ChangeLog,v 1.8 2003/08/21 04:58:19 vapier Exp $
+
+*nemesis-1.4_beta3 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772 + version bump.
 
 *nemesis-1.32 (23 Apr 2002)
 
diff --git a/net-misc/nemesis/files/1.4_beta3-libnet-1.0.patch b/net-misc/nemesis/files/1.4_beta3-libnet-1.0.patch
new file mode 100644
index 000000000000..693ce6b5f1f0
--- /dev/null
+++ b/net-misc/nemesis/files/1.4_beta3-libnet-1.0.patch
@@ -0,0 +1,123 @@
+diff -r -U 0 nemesis-1.4beta3.orig/configure nemesis-1.4beta3/configure
+--- nemesis-1.4beta3.orig/configure	2003-08-19 15:45:45.674664840 -0400
++++ nemesis-1.4beta3/configure	2003-08-19 15:47:50.916625168 -0400
+@@ -2704 +2704 @@
+-CPPFLAGS="${CPPFLAGS} `libnet-config --defines`"
++CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --defines`"
+@@ -2707 +2707 @@
+-if test `libnet-config --cflags | wc -c` = "1"; then
++if test `libnet-1.0-config --cflags | wc -c` = "1"; then
+@@ -2711 +2711 @@
+-    CPPFLAGS="${CPPFLAGS} `libnet-config --cflags`"
++    CPPFLAGS="${CPPFLAGS} `libnet-1.0-config --cflags`"
+@@ -2714,3 +2714,3 @@
+-if test `libnet-config --libs | wc -c` = "1"; then
+-    { echo "$as_me:2715: 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:2715: 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;}
+@@ -2721 +2721 @@
+-    LIBS="${LIBS} `libnet-config --libs | sed s/\-lnet//`"
++    LIBS="${LIBS} `libnet-1.0-config --libs | sed s/\-lnet-1.0//`"
+@@ -3553 +3553 @@
+-for ac_header in libnet.h
++for ac_header in libnet-1.0.h
+@@ -3621 +3621 @@
+-  libnet_dir=`libnet-config --cflags | cut -dI -f2`
++  libnet_dir=`libnet-1.0-config --cflags | cut -dI -f2`
+@@ -3626 +3626 @@
+-  if test -r $i/libnet.h; then
++  if test -r $i/libnet-1.0.h; then
+@@ -3632 +3632 @@
+-  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
+@@ -3643 +3643 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+@@ -3662 +3662 @@
+-   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet.h)"
++   echo "  ERROR: unable to find" "libnet 1.0.2a (libnet-1.0.h)"
+@@ -3699,2 +3699,2 @@
+-echo "$as_me:3699: checking for libnet_build_ip in -lnet" >&5
+-echo $ECHO_N "checking for libnet_build_ip in -lnet... $ECHO_C" >&6
++echo "$as_me:3699: 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
+@@ -3705 +3705 @@
+-LIBS="-lnet  $LIBS"
++LIBS="-lnet-1.0  $LIBS"
+@@ -3753 +3753 @@
+-  LIBS="-lnet $LIBS"
++  LIBS="-lnet-1.0 $LIBS"
+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>
diff --git a/net-misc/nemesis/files/digest-nemesis-1.4_beta3 b/net-misc/nemesis/files/digest-nemesis-1.4_beta3
new file mode 100644
index 000000000000..031fc69996e7
--- /dev/null
+++ b/net-misc/nemesis/files/digest-nemesis-1.4_beta3
@@ -0,0 +1 @@
+MD5 6409bddf2d54cc9400028f491d342aea nemesis-1.4beta3.tar.gz 121017
diff --git a/net-misc/nemesis/nemesis-1.4_beta3.ebuild b/net-misc/nemesis/nemesis-1.4_beta3.ebuild
new file mode 100644
index 000000000000..4f7c14268d8e
--- /dev/null
+++ b/net-misc/nemesis/nemesis-1.4_beta3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/nemesis/nemesis-1.4_beta3.ebuild,v 1.1 2003/08/21 04:58:19 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="A commandline-based, portable human IP stack for UNIX/Linux"
+HOMEPAGE="http://www.packetfactory.net/Projects/nemesis/"
+SRC_URI="http://www.packetfactory.net/Projects/nemesis/${P/_}.tar.gz"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~alpha"
+
+RDEPEND="virtual/glibc
+	>=net-libs/libpcap-0.6.2-r1"
+DEPEND="${RDEPEND}
+	>=net-libs/libnet-1.0.2a-r3
+	<net-libs/libnet-1.1"
+
+S=${WORKDIR}/${P/_}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
+}
+
+src_compile() {
+	econf || die
+	emake || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc ChangeLog README
+}
diff --git a/net-misc/rarpd/ChangeLog b/net-misc/rarpd/ChangeLog
index d182e7aa12f1..c397b22d97d2 100644
--- a/net-misc/rarpd/ChangeLog
+++ b/net-misc/rarpd/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-misc/rarpd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rarpd/ChangeLog,v 1.5 2003/02/12 08:31:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rarpd/ChangeLog,v 1.6 2003/08/21 04:59:43 vapier Exp $
+
+*rarpd-1.1-r1 (21 Aug 2003)
+
+  21 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
+  Patch to compile against SLOT-ed libnet-1.0.x #17772.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *rarpd-1.1 (28 Aug 2002)
 
   03 Sep 2002; Maarten Thibaut <murphy@gentoo.org> rarpd-1.1.ebuild: Fixed libnet
diff --git a/net-misc/rarpd/files/1.1-libnet-1.0.patch b/net-misc/rarpd/files/1.1-libnet-1.0.patch
new file mode 100644
index 000000000000..45bacd669423
--- /dev/null
+++ b/net-misc/rarpd/files/1.1-libnet-1.0.patch
@@ -0,0 +1,60 @@
+diff -U 0 -r rarpd-1.1.orig/aclocal.m4 rarpd-1.1/aclocal.m4
+--- rarpd-1.1.orig/aclocal.m4	2003-08-19 15:55:45.204522448 -0400
++++ rarpd-1.1/aclocal.m4	2003-08-19 15:58:54.344768760 -0400
+@@ -278 +278 @@
+-if test -f "$1/libnet-config" ; then
++if test -f "$1/libnet-1.0-config" ; then
+@@ -299 +299 @@
+-if test -f "$1/libnet.h" ; then
++if test -f "$1/libnet-1.0.h" ; then
+@@ -321 +321 @@
+-LIBS="$saved_LIBS -L$1 -lnet"
++LIBS="$saved_LIBS -L$1 -lnet-1.0"
+@@ -375 +375 @@
+-            if test -f "$with_libnet/libnet-config"; then
++            if test -f "$with_libnet/libnet-1.0-config"; then
+@@ -413 +413 @@
+-	  LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-config
++	  LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-1.0-config
+diff -U 0 -r rarpd-1.1.orig/cmulocal/libnet.m4 rarpd-1.1/cmulocal/libnet.m4
+--- rarpd-1.1.orig/cmulocal/libnet.m4	2003-08-19 15:55:45.205522296 -0400
++++ rarpd-1.1/cmulocal/libnet.m4	2003-08-19 15:58:54.346768456 -0400
+@@ -7 +7 @@
+-if test -f "$1/libnet-config" ; then
++if test -f "$1/libnet-1.0-config" ; then
+@@ -28 +28 @@
+-if test -f "$1/libnet.h" ; then
++if test -f "$1/libnet-1.0.h" ; then
+@@ -50 +50 @@
+-LIBS="$saved_LIBS -L$1 -lnet"
++LIBS="$saved_LIBS -L$1 -lnet-1.0"
+@@ -104 +104 @@
+-            if test -f "$with_libnet/libnet-config"; then
++            if test -f "$with_libnet/libnet-1.0-config"; then
+@@ -142 +142 @@
+-	  LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-config
++	  LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-1.0-config
+diff -U 0 -r rarpd-1.1.orig/configure rarpd-1.1/configure
+--- rarpd-1.1.orig/configure	2003-08-19 15:55:45.205522296 -0400
++++ rarpd-1.1/configure	2003-08-19 15:58:54.370764808 -0400
+@@ -1670 +1670 @@
+-            if test -f "$with_libnet/libnet-config"; then
++            if test -f "$with_libnet/libnet-1.0-config"; then
+@@ -1690 +1690 @@
+-if test -f "$i/libnet-config" ; then
++if test -f "$i/libnet-1.0-config" ; then
+@@ -1716 +1716 @@
+-LIBS="$saved_LIBS -L$i -lnet"
++LIBS="$saved_LIBS -L$i -lnet-1.0"
+@@ -1789 +1789 @@
+-if test -f "$i/libnet.h" ; then
++if test -f "$i/libnet-1.0.h" ; then
+@@ -1812 +1812 @@
+-	  LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-config
++	  LIBNET_CONFIG=$ac_cv_libnet_where_cfg/libnet-1.0-config
+diff -U 0 -r rarpd-1.1.orig/rarpd.c rarpd-1.1/rarpd.c
+--- rarpd-1.1.orig/rarpd.c	2003-08-19 15:55:45.205522296 -0400
++++ rarpd-1.1/rarpd.c	2003-08-19 15:58:54.374764200 -0400
+@@ -34 +34 @@
+-#include <libnet.h>
++#include <libnet-1.0.h>
diff --git a/net-misc/rarpd/files/digest-rarpd-1.1-r1 b/net-misc/rarpd/files/digest-rarpd-1.1-r1
new file mode 100644
index 000000000000..bd90889fe960
--- /dev/null
+++ b/net-misc/rarpd/files/digest-rarpd-1.1-r1
@@ -0,0 +1 @@
+MD5 04e2ca849e758d0b88c8281775ec3b58 rarpd-1.1.tar.gz 32053
diff --git a/net-misc/rarpd/rarpd-1.1-r1.ebuild b/net-misc/rarpd/rarpd-1.1-r1.ebuild
new file mode 100644
index 000000000000..e2e2704b2d50
--- /dev/null
+++ b/net-misc/rarpd/rarpd-1.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rarpd/rarpd-1.1-r1.ebuild,v 1.1 2003/08/21 04:59:43 vapier Exp $
+
+inherit eutils
+
+DESCRIPTION="reverse address resolution protocol daemon"
+HOMEPAGE="ftp://ftp.dementia.org/pub/net-tools"
+SRC_URI="ftp://ftp.dementia.org/pub/net-tools/${P}.tar.gz"
+
+DEPEND=">=net-libs/libnet-1.0.2a-r3
+	<net-libs/libnet-1.1
+	>=net-libs/libpcap-0.7.1"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+src_unpack() {
+	unpack ${A}
+	epatch ${FILESDIR}/${PV}-libnet-1.0.patch
+}
+
+src_compile() {
+	econf || die
+	emake || die
+}
+
+src_install() {
+	#make install DESTDIR=${D} || die # only installs rarpd to /
+	dosbin rarpd
+	doman rarpd.8
+	dodoc AUTHORS COPYING README TODO VERSION INSTALL
+}