haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

netperf: bump to 2.7.0 (#6359)

Browse Source
This commit is contained in:
davidkaroly
2021-11-02 10:54:53 +01:00
committed by GitHub
parent 380efedde0
commit b6a12d4f8d
3 changed files with 87 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net-analyzer/netperf/netperf-2.6.0.recipe → net-analyzer/netperf/netperf-2.7.0.recipe
View File

@@ -13,7 +13,7 @@ COPYRIGHT="1993 Hewlett-Packard Company"
LICENSE="netperf"
REVISION="1"
SOURCE_URI="https://github.com/HewlettPackard/netperf/archive/${portName}-${portVersion}.tar.gz"
CHECKSUM_SHA256="560b9c0ef0eed826941f74708b3ac53d91ec13b0b8c565fb107a1b5e6d99ded4"
CHECKSUM_SHA256="4569bafa4cca3d548eb96a486755af40bd9ceb6ab7c6abd81cc6aa4875007c4e"
PATCHES="${portName}-${portVersion}.patchset"
SOURCE_DIR="${portName}-${portName}-${portVersion}"

45
net-analyzer/netperf/patches/netperf-2.6.0.patchset
View File

@@ -1,45 +0,0 @@
From 3364c74809e1aaba2518d3d54078778fd0662c38 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 4 Jun 2014 14:44:30 +0200
Subject: Add missing include.
diff --git a/src/netserver.c b/src/netserver.c
index 379a106..55c202b 100644
--- a/src/netserver.c
+++ b/src/netserver.c
@@ -75,6 +75,8 @@ char netserver_id[]="\
#include <sys/ioctl.h>
#endif
+#include <sys/select.h>
+
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
--
2.30.2
From 907b37e7c356d3e702e18156f32eefb26141f677 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Sat, 30 Oct 2021 17:43:22 +0200
Subject: fix for -lnetwork
diff --git a/configure.ac b/configure.ac
index 5c8948c..236724d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,8 @@ if test "$ac_cv_lib_socket_main" = yes ; then
AC_SYS_LARGEFILE
fi
+AC_CHECK_LIB([network], [socket])
+
# this one is for Tru64 and bind_to_cpu_id
AC_HAVE_LIBRARY(mach)
--
2.30.2

86
net-analyzer/netperf/patches/netperf-2.7.0.patchset Normal file
View File

@@ -0,0 +1,86 @@
From e4f52b8c852d4e7efd7555e66ace737ab9f7a8dc Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 4 Jun 2014 14:44:30 +0200
Subject: Add missing include.
diff --git a/src/netserver.c b/src/netserver.c
index 9534722..76bdece 100644
--- a/src/netserver.c
+++ b/src/netserver.c
@@ -75,6 +75,8 @@ char netserver_id[]="\
#include <sys/ioctl.h>
#endif
+#include <sys/select.h>
+
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
--
2.30.2
From b9383c24f576dfece6a0e8e417f6c7ef51194f29 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Sat, 30 Oct 2021 17:43:22 +0200
Subject: fix for -lnetwork
diff --git a/configure.ac b/configure.ac
index 4c01090..2cba13b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,8 @@ if test "$ac_cv_lib_socket_main" = yes ; then
AC_SYS_LARGEFILE
fi
+AC_CHECK_LIB([network], [socket])
+
# this one is for Tru64 and bind_to_cpu_id
AC_HAVE_LIBRARY(mach)
--
2.30.2
From f8ffc65f6d8094407c45265c701134d79ac63173 Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Tue, 2 Nov 2021 10:19:48 +0100
Subject: fix select in netlib
diff --git a/src/netlib.c b/src/netlib.c
index f3a3fe5..bff7cc8 100644
--- a/src/netlib.c
+++ b/src/netlib.c
@@ -2247,7 +2247,7 @@ shutdown_control()
/* select had better return one, or there was either a problem or a
timeout... */
- if (select(FD_SETSIZE,
+ if (select(netlib_control+1,
&readfds,
0,
0,
@@ -2691,7 +2691,7 @@ recv_request_timed_n(int n, int seconds)
do {
FD_ZERO(&readfds);
FD_SET(server_sock,&readfds);
- if (select(FD_SETSIZE,
+ if (select(server_sock+1,
&readfds,
0,
0,
@@ -2867,7 +2867,7 @@ recv_response_timed_n(int addl_time, int n)
/* select had better return one, or there was either a problem or a */
/* timeout... */
- if ((counter = select(FD_SETSIZE,
+ if ((counter = select(netlib_control+1,
&readfds,
0,
0,
--
2.30.2