diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /net-misc/nemesis/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'net-misc/nemesis/files')
-rw-r--r-- | net-misc/nemesis/files/1.4-libnet-1.0.patch | 127 | ||||
-rw-r--r-- | net-misc/nemesis/files/1.4_beta3-libnet-1.0.patch | 123 | ||||
-rw-r--r-- | net-misc/nemesis/files/nemesis-1.4-fileio.patch | 37 | ||||
-rw-r--r-- | net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch | 127 | ||||
-rw-r--r-- | net-misc/nemesis/files/nemesis-1.4-prototcp.patch | 33 |
5 files changed, 447 insertions, 0 deletions
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> 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/nemesis-1.4-fileio.patch b/net-misc/nemesis/files/nemesis-1.4-fileio.patch new file mode 100644 index 000000000000..07c96bc17a74 --- /dev/null +++ b/net-misc/nemesis/files/nemesis-1.4-fileio.patch @@ -0,0 +1,37 @@ +--- nemesis-1.4-orig/source/src/nemesis-fileio.c Fri Oct 31 16:29:36 2003 ++++ nemesis-1.4/source/src/nemesis-fileio.c Fri May 19 17:31:13 2006 +@@ -63,7 +63,7 @@ + fp = stdin; + fd = fileno(fp); + } +- else if ((fd = open(file, O_RDONLY)) < 0) ++ else if ((fp = fopen(file, "rb")) < 0) + { + #if !defined(WIN32) + fprintf(stderr, "ERROR: Unable to open %s file: %s. %s\n", +@@ -82,8 +82,12 @@ + return -1; + } + ++#ifdef DEBUG ++ printf("DEBUG: trying to read max %u bytes from %s\n", maxsize, file); ++#endif ++ + /* read() can return negative values on successful reads, test for -1 */ +- if ((bytesread = read(fd, (void *)memory, maxsize)) == -1) ++ if ((bytesread = fread((void *)memory, 1, maxsize, fp)) == -1) + { + #if !defined(WIN32) + fprintf(stderr, "ERROR: Unable to read %s file: %s. %s\n", +@@ -106,6 +110,11 @@ + if (strncmp(file, "-", 1)) + close(fd); + } ++ ++#ifdef DEBUG ++ printf("DEBUG: bytes read from %s: %u.\n", file, bytesread); ++#endif ++ + return bytesread; + } + diff --git a/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch b/net-misc/nemesis/files/nemesis-1.4-libnet-1.0.patch new file mode 100644 index 000000000000..b4c55c374efa --- /dev/null +++ b/net-misc/nemesis/files/nemesis-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> diff --git a/net-misc/nemesis/files/nemesis-1.4-prototcp.patch b/net-misc/nemesis/files/nemesis-1.4-prototcp.patch new file mode 100644 index 000000000000..0e75a2e43c39 --- /dev/null +++ b/net-misc/nemesis/files/nemesis-1.4-prototcp.patch @@ -0,0 +1,33 @@ +--- nemesis-1.4-orig/source/src/nemesis-proto_tcp.c Fri Oct 31 16:29:38 2003 ++++ nemesis-1.4/source/src/nemesis-proto_tcp.c Fri May 19 17:31:13 2006 +@@ -16,7 +16,7 @@ + FileData *ipod, FileData *tcpod, char *device) + { + int n; +- u_int32_t tcp_packetlen = 0, tcp_meta_packetlen = 0; ++ u_int32_t tcp_packetlen = 0, tcp_meta_packetlen = 0, tcp_headerlen = 0, ip_headerlen = 0; + static u_int8_t *pkt; + static int sockfd = -1; + struct libnet_link_int *l2 = NULL; +@@ -58,13 +58,20 @@ + #endif + } + ++ ip_headerlen = LIBNET_IP_H + ipod->file_s; ++ tcp_headerlen = LIBNET_TCP_H + tcpod->file_s; ++ + tcp_packetlen = link_offset + LIBNET_IP_H + LIBNET_TCP_H + pd->file_s + + ipod->file_s + tcpod->file_s; + +- tcp_meta_packetlen = tcp_packetlen - (link_offset + LIBNET_IP_H); ++ tcp_meta_packetlen = LIBNET_TCP_H + pd->file_s; + + #ifdef DEBUG ++ printf("DEBUG: link offsetlength %u.\n", link_offset); ++ printf("DEBUG: IP header length %u.\n", ip_headerlen); ++ printf("DEBUG: TCP header length %u.\n", tcp_headerlen); + printf("DEBUG: TCP packet length %u.\n", tcp_packetlen); ++ printf("DEBUG: TCP meta length %u.\n", tcp_meta_packetlen); + printf("DEBUG: IP options size %u.\n", ipod->file_s); + printf("DEBUG: TCP options size %u.\n", tcpod->file_s); + printf("DEBUG: TCP payload size %u.\n", pd->file_s); |