Browse Source

Drop patches, applied upstream

Christoph Biedl 4 years ago
parent
commit
20dfe16aba

+ 0 - 35
debian/patches/configure-pcap.patch

@@ -1,35 +0,0 @@
-Author: gregor herrmann <gregoa@debian.org>
-Date: 2012-03-14 18:44:39 +0100
-
-	Fix configure to find libpcap
-
---- tcpreplay-3.4.4/configure.ac.orig	2010-04-05 02:58:05.000000000 +0200
-+++ tcpreplay-3.4.4/configure.ac	2012-07-06 23:27:29.000000000 +0200
-@@ -39,6 +39,7 @@
- AC_SUBST(host)
- AC_SUBST(build)
- AC_SUBST(target)
-+MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
- 
- have_cygwin=no
- AC_MSG_CHECKING([for cygwin development environment])
-@@ -355,6 +356,8 @@
-                 LPCAPLIB="-L${testdir}/lib64 -lpcap"
-             elif test -f "${testdir}/lib/libpcap${shrext_cmds}" ; then
-                 LPCAPLIB="-L${testdir}/lib -lpcap"
-+            elif test -f "${testdir}/lib/$MULTIARCH/libpcap${shrext_cmds}" ; then
-+                LPCAPLIB="-L${testdir}/lib/$MULTIARCH/lib -lpcap"
-             else
-                 AC_ERROR([Unable to find libpcap in ${testdir}])
-             fi
-@@ -364,6 +367,9 @@
-             LPCAPLIB="${testdir}/lib/libpcap.${libext}"
-         elif test -f "${testdir}/lib/libwpcap.${libext}" ; then
-             LPCAPLIB="${testdir}/lib/libwpcap.${libext}"
-+        elif test -f "${testdir}/lib/$MULTIARCH/libpcap.${libext}" ; then
-+            LPCAPLIB="${testdir}/lib/$MULTIARCH/libpcap.${libext}"
-+
-             AC_DEFINE([HAVE_WINPCAP], [1], [Do we have WinPcap?])
-         else
-             AC_ERROR([Unable to find matching library for header file in ${testdir}])
-

+ 0 - 30
debian/patches/enforce-maxpacket.patch

@@ -1,30 +0,0 @@
-Subject: tcprewrite: Handle frames of 65535 octets size
-Author: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
-Date: Mon Jun 29 17:08:24 2015 +0200
-
-diff --git a/src/defines.h.in b/src/defines.h.in
-index 3a1bf1e..5468d14 100644
---- a/src/defines.h.in
-+++ b/src/defines.h.in
-@@ -104,7 +104,7 @@ typedef struct tcpr_speed_s tcpr_speed_t;
- #define DEFAULT_MTU 1500        /* Max Transmission Unit of standard ethernet
-                                  * don't forget *frames* are MTU + L2 header! */
- 
--#define MAXPACKET 65535         /* was 16436 linux loopback, but maybe something is bigger then 
-+#define MAXPACKET 65549         /* was 16436 linux loopback, but maybe something is bigger then 
-                                    linux loopback */
- 
- #define MAX_SNAPLEN 65535       /* tell libpcap to capture the entire packet */
-diff --git a/src/tcprewrite.c b/src/tcprewrite.c
-index 90a6f2e..9c32a5e 100644
---- a/src/tcprewrite.c
-+++ b/src/tcprewrite.c
-@@ -253,6 +253,8 @@ rewrite_packets(tcpedit_t *tcpedit, pcap_t *pin, pcap_dumper_t *pout)
-         packetnum++;
-         dbgx(2, "packet " COUNTER_SPEC " caplen %d", packetnum, pkthdr.caplen);
- 
-+        if (pkthdr.caplen > MAXPACKET)
-+            errx(-1, "Frame too big, caplen %d exceeds %d", pkthdr.caplen, MAXPACKET);
-         /* 
-          * copy over the packet so we can pad it out if necessary and
-          * because pcap_next() returns a const ptr

+ 0 - 2
debian/patches/series

@@ -1,2 +0,0 @@
-configure-pcap.patch
-enforce-maxpacket.patch