public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/files/
@ 2019-02-12 17:01 Jeroen Roovers
  0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers @ 2019-02-12 17:01 UTC (permalink / raw
  To: gentoo-commits

commit:     db3705b1037f8b707105ea7dbc7095ef2e9683f2
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 12 17:01:37 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Feb 12 17:01:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db3705b1

net-analyzer/tcpreplay: Clean up patches

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

 .../tcpreplay-4.1.0-enable-pcap_findalldevs.patch  | 19 ---------------
 .../files/tcpreplay-4.1.2-CVE-2017-6429.patch      | 27 ----------------------
 2 files changed, 46 deletions(-)

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 f45d14cd1da..00000000000
--- 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 42c74d65071..00000000000
--- 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 */


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/files/
@ 2022-10-23 20:37 Conrad Kostecki
  0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2022-10-23 20:37 UTC (permalink / raw
  To: gentoo-commits

commit:     737b1617927e5b8d1b7dc7f3e67cd7fcfb6830b7
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Oct 19 17:05:07 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Oct 23 20:36:27 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=737b1617

net-analyzer/tcpreplay: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27851
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../tcpreplay-4.4.1-fix-bashism-configure.patch    | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch b/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch
deleted file mode 100644
index f1d424274333..000000000000
--- a/net-analyzer/tcpreplay/files/tcpreplay-4.4.1-fix-bashism-configure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/appneta/tcpreplay/pull/714
-
-From bd93776c50ec1d0574c72f253095afe22eb6bf73 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 13 Feb 2022 16:09:23 +0000
-Subject: [PATCH] build: fix bashism in configure
-
-configure scripts are run with /bin/sh which is supposed
-to be a POSIX-compliant shell, so if /bin/sh is provided
-by e.g. dash (like on Debian) rather than bash, we hit
-errors.
-
-This has no effect on functionality for bash &
-retains compatibility.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 11a1e4ea..4c577c42 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1808,7 +1808,7 @@ fi
- dnl No 'make test' when cross compile
- 
- AC_MSG_CHECKING(for 'make test' profile)
--if test "$host" == "$build" ; then
-+if test "$host" = "$build" ; then
-     AC_MSG_RESULT([yes])
- else    
-     AC_MSG_WARN(Unable to do tests when cross-compiling)
-


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-10-23 20:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-23 20:37 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/tcpreplay/files/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2019-02-12 17:01 Jeroen Roovers

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox