From 3d2c8e6d26b0ed21164c36a7b2d92270fc9c4324 Mon Sep 17 00:00:00 2001
From: minskim <minskim>
Date: Thu, 31 Oct 2013 02:25:16 +0000
Subject: Update tcpreplay to 3.4.4.

Changes:
- Set default timing method to either gtod or abstime (#404)
- Fix IPv6 parsing of CIDR's (#405)
- Add support for preloading the memory cache (#410)
- Generate more useful error when packets are too small (#411)
- Update to libopts/Autogen 5.9.9 (#412)
- Ship Win32Readme.txt file (#413)
- Update copyright notice to 2010 (#416)
- Dramatically enhance --portmap option (#417)
- Update autotools (#423)
- Add support for printing statistics periodically during the run (#424)
- Warn user when pcap snaplen < 65535 (#425)
- Add 802.1q processing support tcpprep (#428)
- Link libnl when newer versions of libpcap require it (#397)
- Ship m4 directory (#398)
- Upgrade to latest autotools scripts (#400)
- Fix error message when running autogen.sh (#401)
- Added extensive IPv6 support to tcprewrite & tcpreplay-edit (#11)
- Add IPv6 fragroute support (#388)
- Add IPv6 decoding support to tcpprep (#11)
- Fix compile time error in err.h (#390)
- Add --endpoints support in tcpreplay-edit (#393)
---
 net/tcpreplay/Makefile                             |  5 +--
 net/tcpreplay/distinfo                             | 18 ++++++---
 net/tcpreplay/patches/patch-aa                     | 45 ++++++++++------------
 net/tcpreplay/patches/patch-ab                     | 24 +++++++++---
 net/tcpreplay/patches/patch-lib_Makefile.in        | 14 +++++++
 net/tcpreplay/patches/patch-src_common_Makefile.in | 22 +++++++++++
 net/tcpreplay/patches/patch-src_common_cidr.c      | 14 +++++++
 net/tcpreplay/patches/patch-src_common_tcpdump.c   | 14 +++++++
 net/tcpreplay/patches/patch-src_defines.h.in       | 14 +++++++
 net/tcpreplay/patches/patch-src_tcpprep.c          | 14 +++++++
 10 files changed, 144 insertions(+), 40 deletions(-)
 create mode 100644 net/tcpreplay/patches/patch-lib_Makefile.in
 create mode 100644 net/tcpreplay/patches/patch-src_common_Makefile.in
 create mode 100644 net/tcpreplay/patches/patch-src_common_cidr.c
 create mode 100644 net/tcpreplay/patches/patch-src_common_tcpdump.c
 create mode 100644 net/tcpreplay/patches/patch-src_defines.h.in
 create mode 100644 net/tcpreplay/patches/patch-src_tcpprep.c

(limited to 'net')

diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile
index 96598ce55ac..ca81dc8c6ad 100644
--- a/net/tcpreplay/Makefile
+++ b/net/tcpreplay/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2013/02/06 19:31:01 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2013/10/31 02:25:16 minskim Exp $
 
-DISTNAME=	tcpreplay-3.4.1
-PKGREVISION=	1
+DISTNAME=	tcpreplay-3.4.4
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tcpreplay/}
 
diff --git a/net/tcpreplay/distinfo b/net/tcpreplay/distinfo
index ac815ae8ede..a9a14a9afb6 100644
--- a/net/tcpreplay/distinfo
+++ b/net/tcpreplay/distinfo
@@ -1,7 +1,13 @@
-$NetBSD: distinfo,v 1.9 2009/05/02 17:35:43 minskim Exp $
+$NetBSD: distinfo,v 1.10 2013/10/31 02:25:16 minskim Exp $
 
-SHA1 (tcpreplay-3.4.1.tar.gz) = f5984c6bea651bf52fe1d5ba1224e74727e9e859
-RMD160 (tcpreplay-3.4.1.tar.gz) = 454bb5bce242311161964f487b5b9b5dfd1298bb
-Size (tcpreplay-3.4.1.tar.gz) = 872412 bytes
-SHA1 (patch-aa) = d3549d5e77c1d639deb55f00cebafc355879b4bd
-SHA1 (patch-ab) = f01ac80d1c659bff4f1cfdb582f424f86dc5d28c
+SHA1 (tcpreplay-3.4.4.tar.gz) = 9e4cca81cfbfb919f8759e1a27ce1b3b963ff3b8
+RMD160 (tcpreplay-3.4.4.tar.gz) = 672812755ff39b284044b08cba32c574ab2b7e70
+Size (tcpreplay-3.4.4.tar.gz) = 947179 bytes
+SHA1 (patch-aa) = 377cd7e829b00df9aff0aeed4c4136317602334a
+SHA1 (patch-ab) = 78063660f925229cf10df88462128664f080c6c0
+SHA1 (patch-lib_Makefile.in) = 9a59f2652c08efb87944e132998a3c0778a5b5a7
+SHA1 (patch-src_common_Makefile.in) = 7cd6878eecd94d735e314768a0302298ac415ffc
+SHA1 (patch-src_common_cidr.c) = 77694f71876916e9e77a0257ce91bf7bb2f140a2
+SHA1 (patch-src_common_tcpdump.c) = f46d713dc57db02845173dc92c4f2ec94c158298
+SHA1 (patch-src_defines.h.in) = 58fa82a29f997662d5e793461f4d3cfccd593eb0
+SHA1 (patch-src_tcpprep.c) = 2c5ce09986c4e215230472791a99c4c183223c85
diff --git a/net/tcpreplay/patches/patch-aa b/net/tcpreplay/patches/patch-aa
index 5b386db5271..dcc607610a2 100644
--- a/net/tcpreplay/patches/patch-aa
+++ b/net/tcpreplay/patches/patch-aa
@@ -1,30 +1,30 @@
-$NetBSD: patch-aa,v 1.3 2009/05/02 17:35:43 minskim Exp $
+$NetBSD: patch-aa,v 1.4 2013/10/31 02:25:17 minskim Exp $
 
---- configure.ac.orig	2009-02-04 13:18:11.000000000 -0800
+--- configure.ac.orig	2010-04-05 00:58:05.000000000 +0000
 +++ configure.ac
-@@ -350,9 +350,9 @@ AC_ARG_WITH(libpcap,
-         	LPCAPINC="${testdir}/include/pcap.h"
- 	        LPCAPINCDIR="${testdir}/include"
- 	        if test $dynamic_link = yes; then
--				if test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then
-+				if test -e "${testdir}/lib64/libpcap${shrext_cmds}" ; then
- 		            LPCAPLIB="-L${testdir}/lib64 -lpcap"
--				elif test -f "${testdir}/lib/libpcap${shrext_cmds}" ; then
-+				elif test -e "${testdir}/lib/libpcap${shrext_cmds}" ; then
- 					LPCAPLIB="-L${testdir}/lib -lpcap"
- 				else
- 					AC_ERROR([Unable to find libpcap in ${testdir}])
-@@ -773,7 +773,7 @@ libdnet_version=
+@@ -351,9 +351,9 @@ for testdir in $trypcapdir /usr/local /o
+         LPCAPINC="${testdir}/include/pcap.h"
+         LPCAPINCDIR="${testdir}/include"
+         if test $dynamic_link = yes; then
+-            if test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then
++            if test -e "${testdir}/lib64/libpcap${shrext_cmds}" ; then
+                 LPCAPLIB="-L${testdir}/lib64 -lpcap"
+-            elif test -f "${testdir}/lib/libpcap${shrext_cmds}" ; then
++            elif test -e "${testdir}/lib/libpcap${shrext_cmds}" ; then
+                 LPCAPLIB="-L${testdir}/lib -lpcap"
+             else
+                 AC_ERROR([Unable to find libpcap in ${testdir}])
+@@ -810,7 +810,7 @@ libdnet_version=
  enable_fragroute=no
  trydnetdir=/usr/local
  
 -if test $have_cygwin == no ; then
 +if test $have_cygwin = no ; then
- 	AC_MSG_CHECKING(for libdnet)
- 	AC_ARG_WITH(libdnet,
- 	    AC_HELP_STRING([--with-libdnet=DIR], [Use libdnet in DIR]),
-@@ -1122,7 +1122,7 @@ case $host in
- 	;;
+     AC_MSG_CHECKING(for libdnet)
+     AC_ARG_WITH(libdnet,
+         AC_HELP_STRING([--with-libdnet=DIR], [Use libdnet in DIR]),
+@@ -1161,7 +1161,7 @@ case $host in
+     ;;
  esac])
  
 -AM_CONDITIONAL([ENABLE_OSX_FRAMEWORKS], test "$osx_frameworks" == "yes")
@@ -32,8 +32,3 @@ $NetBSD: patch-aa,v 1.3 2009/05/02 17:35:43 minskim Exp $
  
  AC_ARG_WITH(testnic2,
      AC_HELP_STRING([--with-testnic2=NIC2], [Select an optional 2nd network card to use for testing]),
-@@ -1211,4 +1211,3 @@ Please see: http://tcpreplay.synfin.net/
- Please report any bugs!	http://tcpreplay.synfin.net/trac/newticket])
- 	;;
- esac
--
diff --git a/net/tcpreplay/patches/patch-ab b/net/tcpreplay/patches/patch-ab
index f9596ec5312..007ad1933fd 100644
--- a/net/tcpreplay/patches/patch-ab
+++ b/net/tcpreplay/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2009/05/02 17:35:43 minskim Exp $
+$NetBSD: patch-ab,v 1.2 2013/10/31 02:25:17 minskim Exp $
 
---- configure.orig	2009-02-04 13:07:26.000000000 -0800
+--- configure.orig	2010-04-05 00:58:26.000000000 +0000
 +++ configure
-@@ -9824,7 +9824,11 @@ darwin* | rhapsody*)
+@@ -9872,7 +9872,11 @@ darwin* | rhapsody*)
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -15,16 +15,28 @@ $NetBSD: patch-ab,v 1.1 2009/05/02 17:35:43 minskim Exp $
  
    sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
    sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-@@ -22072,7 +22076,7 @@ libdnet_version=
+@@ -17353,9 +17357,9 @@ for testdir in $trypcapdir /usr/local /o
+         LPCAPINC="${testdir}/include/pcap.h"
+         LPCAPINCDIR="${testdir}/include"
+         if test $dynamic_link = yes; then
+-            if test -f "${testdir}/lib64/libpcap${shrext_cmds}" ; then
++            if test -e "${testdir}/lib64/libpcap${shrext_cmds}" ; then
+                 LPCAPLIB="-L${testdir}/lib64 -lpcap"
+-            elif test -f "${testdir}/lib/libpcap${shrext_cmds}" ; then
++            elif test -e "${testdir}/lib/libpcap${shrext_cmds}" ; then
+                 LPCAPLIB="-L${testdir}/lib -lpcap"
+             else
+                 as_fn_error "Unable to find libpcap in ${testdir}" "$LINENO" 5
+@@ -18172,7 +18176,7 @@ libdnet_version=
  enable_fragroute=no
  trydnetdir=/usr/local
  
 -if test $have_cygwin == no ; then
 +if test $have_cygwin = no ; then
- 	{ $as_echo "$as_me:$LINENO: checking for libdnet" >&5
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libdnet" >&5
  $as_echo_n "checking for libdnet... " >&6; }
  
-@@ -22806,7 +22810,7 @@ esac
+@@ -18751,7 +18755,7 @@ esac
  fi
  
  
diff --git a/net/tcpreplay/patches/patch-lib_Makefile.in b/net/tcpreplay/patches/patch-lib_Makefile.in
new file mode 100644
index 00000000000..378cd710483
--- /dev/null
+++ b/net/tcpreplay/patches/patch-lib_Makefile.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-lib_Makefile.in,v 1.1 2013/10/31 02:25:17 minskim Exp $
+
+--- lib/Makefile.in.orig	2010-04-05 00:58:24.000000000 +0000
++++ lib/Makefile.in
+@@ -217,7 +217,8 @@ tcpdump_path = @tcpdump_path@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-noinst_LIBRARIES = libstrl.a
++@SYSTEM_STRLCPY_FALSE@noinst_LIBRARIES = libstrl.a
++@SYSTEM_STRLCPY_TRUE@noinst_LIBRARIES =
+ libstrl_a_SOURCES = strlcat.c strlcpy.c
+ noinst_HEADERS = strlcpy.h tree.h queue.h sll.h
+ MOSTLYCLEANFILES = *~ *.o *.a
diff --git a/net/tcpreplay/patches/patch-src_common_Makefile.in b/net/tcpreplay/patches/patch-src_common_Makefile.in
new file mode 100644
index 00000000000..3f5d7e4c420
--- /dev/null
+++ b/net/tcpreplay/patches/patch-src_common_Makefile.in
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_common_Makefile.in,v 1.1 2013/10/31 02:25:17 minskim Exp $
+
+--- src/common/Makefile.in.orig	2010-04-05 00:58:25.000000000 +0000
++++ src/common/Makefile.in
+@@ -52,7 +52,7 @@ CONFIG_CLEAN_VPATH_FILES =
+ LIBRARIES = $(noinst_LIBRARIES)
+ ARFLAGS = cru
+ libcommon_a_AR = $(AR) $(ARFLAGS)
+-libcommon_a_DEPENDENCIES = ../../lib/libstrl.a
++@SYSTEM_STRLCPY_FALSE@libcommon_a_DEPENDENCIES = ../../lib/libstrl.a
+ am__libcommon_a_SOURCES_DIST = cidr.c err.c list.c cache.c services.c \
+ 	get.c fakepcap.c fakepcapnav.c fakepoll.c xX.c utils.c timer.c \
+ 	svn_version.c abort.c sendpacket.c dlt_names.c mac.c \
+@@ -238,7 +238,7 @@ libcommon_a_SOURCES = cidr.c err.c list.
+ 	svn_version.c abort.c sendpacket.c dlt_names.c mac.c \
+ 	interface.c rdtsc.c $(am__append_1)
+ AM_CFLAGS = -I.. -I../.. $(LNAV_CFLAGS) @LDNETINC@
+-libcommon_a_LIBADD = ../../lib/libstrl.a
++@SYSTEM_STRLCPY_FALSE@libcommon_a_LIBADD = ../../lib/libstrl.a
+ noinst_HEADERS = cidr.h err.h list.h cache.h services.h get.h \
+ 		 fakepcap.h fakepcapnav.h fakepoll.h xX.h utils.h \
+ 		 tcpdump.h timer.h abort.h pcap_dlt.h sendpacket.h \
diff --git a/net/tcpreplay/patches/patch-src_common_cidr.c b/net/tcpreplay/patches/patch-src_common_cidr.c
new file mode 100644
index 00000000000..9951a295d15
--- /dev/null
+++ b/net/tcpreplay/patches/patch-src_common_cidr.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_common_cidr.c,v 1.1 2013/10/31 02:25:17 minskim Exp $
+
+--- src/common/cidr.c.orig	2010-04-05 00:58:01.000000000 +0000
++++ src/common/cidr.c
+@@ -34,7 +34,9 @@
+ #include "config.h"
+ #include "defines.h"
+ #include "common.h"
++#ifndef HAVE_STRLCPY
+ #include "lib/strlcpy.h"
++#endif
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/net/tcpreplay/patches/patch-src_common_tcpdump.c b/net/tcpreplay/patches/patch-src_common_tcpdump.c
new file mode 100644
index 00000000000..f4e86f22128
--- /dev/null
+++ b/net/tcpreplay/patches/patch-src_common_tcpdump.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_common_tcpdump.c,v 1.1 2013/10/31 02:25:17 minskim Exp $
+
+--- src/common/tcpdump.c.orig	2010-04-05 00:58:01.000000000 +0000
++++ src/common/tcpdump.c
+@@ -59,7 +59,9 @@
+ #endif
+ 
+ #include "tcpdump.h"
++#ifndef HAVE_STRLCPY
+ #include "lib/strlcpy.h"
++#endif
+ 
+ #ifdef DEBUG
+ extern int debug;
diff --git a/net/tcpreplay/patches/patch-src_defines.h.in b/net/tcpreplay/patches/patch-src_defines.h.in
new file mode 100644
index 00000000000..d417cd5b90f
--- /dev/null
+++ b/net/tcpreplay/patches/patch-src_defines.h.in
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_defines.h.in,v 1.1 2013/10/31 02:25:17 minskim Exp $
+
+--- src/defines.h.in.orig	2010-04-05 00:58:02.000000000 +0000
++++ src/defines.h.in
+@@ -26,7 +26,9 @@
+ 
+ #include "@LPCAPINC@"
+ 
++#ifndef HAVE_STRLCPY
+ #include "lib/strlcpy.h"
++#endif
+ #include "common/list.h"
+ #include "common/cidr.h"
+ 
diff --git a/net/tcpreplay/patches/patch-src_tcpprep.c b/net/tcpreplay/patches/patch-src_tcpprep.c
new file mode 100644
index 00000000000..609c5539ca5
--- /dev/null
+++ b/net/tcpreplay/patches/patch-src_tcpprep.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_tcpprep.c,v 1.1 2013/10/31 02:25:17 minskim Exp $
+
+--- src/tcpprep.c.orig	2010-04-05 00:58:02.000000000 +0000
++++ src/tcpprep.c
+@@ -61,7 +61,9 @@
+ #include "lib/tree.h"
+ #include "tree.h"
+ #include "lib/sll.h"
++#ifndef HAVE_STRLCPY
+ #include "lib/strlcpy.h"
++#endif
+ 
+ /*
+  * global variables
-- 
cgit v1.2.3