From: Jeroen Roovers <jer@gentoo.org>
Date: Tue, 12 Feb 2019 17:01:37 +0000 (+0100)
Subject: net-analyzer/tcpreplay: Clean up patches
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=db3705b1037f8b707105ea7dbc7095ef2e9683f2;p=gentoo.git

net-analyzer/tcpreplay: Clean up patches

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
---

diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch
deleted file mode 100644
index f45d14cd1da1..000000000000
--- a/net-analyzer/tcpreplay/files/tcpreplay-4.1.0-enable-pcap_findalldevs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1499,6 +1499,8 @@
-     AC_MSG_WARN(Unable to do tests when cross-compiling)
- fi
- 
-+disable_pcap_findalldevs=no
-+
- dnl Allows user to choose which nic to use for testing purposes
- AC_ARG_WITH(testnic,
-     AC_HELP_STRING([--with-testnic=NIC], [Select which network card to use for testing]),
-@@ -1509,7 +1511,6 @@
- 
- dnl There's a bug in OS X which causes pcap_findalldevs() to make the wifi NIC to disassociate
- dnl so under OSX we disable the interface list feature
--disable_pcap_findalldevs=no
- 
- osx_frameworks=no
- dnl these need to be dynamic based on OS
diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch
deleted file mode 100644
index 42c74d650712..000000000000
--- a/net-analyzer/tcpreplay/files/tcpreplay-4.1.2-CVE-2017-6429.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/src/tcpcapinfo.c
-+++ b/src/tcpcapinfo.c
-@@ -281,6 +281,15 @@ main(int argc, char *argv[])
-                 caplen = pcap_ph.caplen;
-             }
- 
-+            if (caplentoobig) {
-+                printf("\n\nCapture file appears to be damaged or corrupt.\n"
-+                        "Contains packet of size %u, bigger than snap length %u\n",
-+                        caplen, pcap_fh.snaplen);
-+
-+                close(fd);
-+                break;
-+            }
-+
-             /* check to make sure timestamps don't go backwards */
-             if (last_sec > 0 && last_usec > 0) {
-                 if ((pcap_ph.ts.tv_sec == last_sec) ? 
-@@ -306,7 +315,7 @@ main(int argc, char *argv[])
-                 }
- 
-                 close(fd);
--                continue;
-+                break;
-             }
- 
-             /* print the frame checksum */