gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-01-06 02:17:34 -08:00
Code Issues Projects Releases Wiki Activity

net-misc/iperf: cleanup old patches

Browse Source 
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2025-10-18 17:47:32 +01:00
parent f7cfcf7662
commit 2131a43750
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
3 changed files with 0 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net-misc/iperf/files/iperf-2.0.12-ipv6.patch
View File

@ -1,23 +0,0 @@
--- a/src/Listener.cpp
+++ b/src/Listener.cpp
@@ -670,6 +670,7 @@
// Now optimize packet flow up the raw socket
// Establish the flow BPF to forward up only "connected" packets to this raw socket
+#ifdef HAVE_IPV6
if (l->sa_family == AF_INET6) {
struct in6_addr *v6peer = SockAddr_get_in6_addr(&server->peer);
struct in6_addr *v6local = SockAddr_get_in6_addr(&server->local);
@@ -682,9 +683,12 @@
WARN_errno( rc == SOCKET_ERROR, "l2 v4in6 connect ip bpf");
}
} else {
+#endif
rc = SockAddr_v4_Connect_BPF(server->mSock, ((struct sockaddr_in *)(l))->sin_addr.s_addr, ((struct sockaddr_in *)(p))->sin_addr.s_addr, ((struct sockaddr_in *)(l))->sin_port, ((struct sockaddr_in *)(p))->sin_port);
WARN_errno( rc == SOCKET_ERROR, "l2 connect ip bpf");
+#ifdef HAVE_IPV6
}
+#endif
if (rc < 0)
return -1;
else

132
net-misc/iperf/files/iperf-2.0.14a.patch
View File

@ -1,132 +0,0 @@
commit 12254fa398e627949af923afd0d48cd9b814f0a0
Author: rmcmahon <bob.mcmahon@broadcom.com>
Date: Tue Jan 29 23:11:18 2019 -0800
new version 2.0.14a, fix for -P w/server and summing
diff --git a/configure b/configure
index f1a9983..706e7a3 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Iperf 2.0.13.
+# Generated by GNU Autoconf 2.69 for Iperf 2.0.14a.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Iperf'
PACKAGE_TARNAME='iperf'
-PACKAGE_VERSION='2.0.13'
-PACKAGE_STRING='Iperf 2.0.13'
+PACKAGE_VERSION='2.0.14a'
+PACKAGE_STRING='Iperf 2.0.14a'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1313,7 +1313,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Iperf 2.0.13 to adapt to many kinds of systems.
+\`configure' configures Iperf 2.0.14a to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1383,7 +1383,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Iperf 2.0.13:";;
+ short | recursive ) echo "Configuration of Iperf 2.0.14a:";;
esac
cat <<\_ACEOF
@@ -1493,7 +1493,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Iperf configure 2.0.13
+Iperf configure 2.0.14a
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2236,7 +2236,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Iperf $as_me 2.0.13, which was
+It was created by Iperf $as_me 2.0.14a, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3101,7 +3101,7 @@ fi
# Define the identity of the package.
PACKAGE='iperf'
- VERSION='2.0.13'
+ VERSION='2.0.14a'
cat >>confdefs.h <<_ACEOF
@@ -8854,7 +8854,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Iperf $as_me 2.0.13, which was
+This file was extended by Iperf $as_me 2.0.14a, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8920,7 +8920,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Iperf config.status 2.0.13
+Iperf config.status 2.0.14a
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index cd3c9a0..4c93328 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl ===================================================================
AC_PREREQ(2.59)
-AC_INIT(Iperf,2.0.13)
+AC_INIT(Iperf,2.0.14a)
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE()
diff --git a/include/version.h b/include/version.h
index 87279a7..d6f9d89 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1,4 +1,4 @@
-#define IPERF_VERSION "2.0.13"
-#define IPERF_VERSION_DATE "21 Jan 2019"
+#define IPERF_VERSION "2.0.14a"
+#define IPERF_VERSION_DATE "29 Jan 2019"
#define IPERF_VERSION_MAJORHEX 0x00020000
-#define IPERF_VERSION_MINORHEX 0x000D0003
+#define IPERF_VERSION_MINORHEX 0x000E0000
diff --git a/src/Reporter.c b/src/Reporter.c
index 80891aa..d5164ef 100644
--- a/src/Reporter.c
+++ b/src/Reporter.c
@@ -151,7 +151,9 @@ MultiHeader* InitMulti( thread_Settings *agent, int inID) {
memset( multihdr, 0, sizeof(MultiHeader) );
Condition_Initialize( &multihdr->barrier );
multihdr->groupID = inID;
- multihdr->threads = agent->mThreads;
+ if (agent->mThreadMode == kMode_Client) {
+ multihdr->threads = agent->mThreads;
+ }
if ( isMultipleReport( agent ) ) {
int i;
ReporterData *data = NULL;

58
net-misc/iperf/files/iperf-3.17.1-c23.patch
View File

@ -1,58 +0,0 @@
https://bugs.gentoo.org/944381
https://github.com/esnet/iperf/pull/1805
From beadb59b90e8d3339d31f9f15525108072fde135 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Mon, 9 Dec 2024 10:13:02 +0000
Subject: [PATCH] fix build with gcc-15
--- a/src/iperf_api.c
+++ b/src/iperf_api.c
@@ -603,25 +603,25 @@ iperf_set_mapped_v4(struct iperf_test *ipt, const int val)
}
void
-iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)())
+iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)(struct iperf_stream *))
{
ipt->on_new_stream = callback;
}
void
-iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)())
+iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
{
ipt->on_test_start = callback;
}
void
-iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)())
+iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
{
ipt->on_connect = callback;
}
void
-iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)())
+iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *))
{
ipt->on_test_finish = callback;
}
--- a/src/iperf_api.h
+++ b/src/iperf_api.h
@@ -213,10 +213,10 @@ void iperf_set_dont_fragment( struct iperf_test* ipt, int dont_fragment );
void iperf_set_test_congestion_control(struct iperf_test* ipt, char* cc);
void iperf_set_test_mss(struct iperf_test* ipt, int mss);
void iperf_set_mapped_v4(struct iperf_test* ipt, const int val);
-void iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)());
-void iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)());
-void iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)());
-void iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)());
+void iperf_set_on_new_stream_callback(struct iperf_test* ipt, void (*callback)(struct iperf_stream *));
+void iperf_set_on_test_start_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
+void iperf_set_on_test_connect_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
+void iperf_set_on_test_finish_callback(struct iperf_test* ipt, void (*callback)(struct iperf_test *));
#if defined(HAVE_SSL)
void iperf_set_test_client_username(struct iperf_test *ipt, const char *client_username);