mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-07 04:56:58 +02:00
net-misc/iperf: Sync with Gentoo
It's from Gentoo commit ea89684d4a7ddac08608f77f8ea660c4a0e4a03c.
This commit is contained in:
Flatcar Buildbot
parent
c49751deff
commit
7bf4d55a3f
@ -1,4 +1,5 @@
|
||||
DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
|
||||
DIST iperf-3.17.1.tar.gz 670547 BLAKE2B 90afa47ba2de2f789b118ea42d7eabe3a7ec202116d51915b05350932231788a95ae142bdf2cff041f5504e67ae5ac1da2c66f408bc302c4e230ef4b7e496e15 SHA512 99c731e2e060d2b241d3137742bf92a975f2b7a94c6c723c9c1625f69c294fd7fe15b7dbf085a6120038fc1dd7628c83d2c7d16b059849fdbecbc88e48fb0974
|
||||
DIST iperf-2.2.1.tar.gz 509514 BLAKE2B 9075df9513e98beeaed5c2f6799f62f72fbfd8fc63696674018b7435dae87d5edeca3fb0541775c37c188bd61bd8394c3125a8a8c07e0c4ba1c2efa86a602404 SHA512 07a08afe647e87939e05c9cd55601ca1227c91f44ef32fdf305a0e15e524d1de29d38e9a3f66253d7308585224e54db395d7dec654d31eea746f45c6947ebc2a
|
||||
DIST iperf-3.18.tar.gz 688037 BLAKE2B 64272ab8288cb217603d4fa438bc547967baa964bc518c91f9f1f1c85d9a0a9a7ca5b4c558b3e2c68507c1cb76b40592fd9a80f0bb4cc8a1716e029b32289276 SHA512 a458292c34c29a60cce60eb6be4afd15220d4cf29f225a1c1be9ec8ef86baa85fa4e174e747cacfa5711c6957ad16d448c2d3d4029b6bfd58db9c39269f30caa
|
||||
DIST iperf-3.19.1.tar.gz 698445 BLAKE2B fae065d3e8131c072bd70666c87067c85b2ea56fcee70197bea1d5b82266b1d2f4dbb9318b566fdd4add08776dadb1feebe9915108531d3af9e13a777e2b60e7 SHA512 7239eddf55197c45aa751d05b6518a0782ec4f2ce4d9b4246b74c41dc21077102f3f5cc3359129c32c6842d482f4a9557a92ab84d96e0a9c7063052c9cbed4f6
|
||||
DIST iperf-3.19.tar.gz 694741 BLAKE2B b6f5e9bdef5ee3fc38bef893144bc6ad003ccbc7b3db4793dbd2aec5998faa55cac215a0db06ab37729dc1c05787ebacbf09db8a6e6517f82492a6c67ec3d9e6 SHA512 f0631cd1158a90dc402fa30563e6f26dbdbc5d5b0665bed25248f9153118f55296913abeb89bf0b1db760ca2c68f60e0c9cf2df82aa096318ca618ca09176388
|
||||
|
||||
@ -1,110 +0,0 @@
|
||||
Date: Tue, 30 Jul 2024 21:11:48 +0300
|
||||
Subject: [PATCH] Unbundle cJSON
|
||||
|
||||
Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -61,6 +61,8 @@ AC_ARG_ENABLE([profiling],
|
||||
AS_HELP_STRING([--enable-profiling], [Enable iperf3 profiling binary]))
|
||||
AM_CONDITIONAL([ENABLE_PROFILING], [test x$enable_profiling = xyes])
|
||||
|
||||
+PKG_CHECK_MODULES([libcjson], [libcjson >= 1.7.15])
|
||||
+
|
||||
# Check for the math library (needed by cjson on some platforms)
|
||||
AC_SEARCH_LIBS(floor, [m], [], [
|
||||
echo "floor()"
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -10,8 +10,6 @@ include_HEADERS = iperf_api.h # Define
|
||||
|
||||
# Specify the source files and flags for the iperf library
|
||||
libiperf_la_SOURCES = \
|
||||
- cjson.c \
|
||||
- cjson.h \
|
||||
flowlabel.h \
|
||||
iperf.h \
|
||||
iperf_api.c \
|
||||
@@ -46,10 +44,13 @@ libiperf_la_SOURCES = \
|
||||
units.c \
|
||||
units.h \
|
||||
version.h
|
||||
+libiperf_la_CPPFLAGS = $(CPPFLAGS) @libcjson_CFLAGS@
|
||||
+libiperf_la_LIBADD = @libcjson_LIBS@
|
||||
|
||||
# Specify the sources and various flags for the iperf binary
|
||||
iperf3_SOURCES = main.c
|
||||
-iperf3_LDADD = libiperf.la
|
||||
+iperf3_CPPFLAGS = $(CPPFLAGS) @libcjson_CFLAGS@
|
||||
+iperf3_LDADD = libiperf.la @libcjson_LIBS@
|
||||
|
||||
if ENABLE_PROFILING
|
||||
# If the iperf-profiled-binary is enabled
|
||||
--- a/src/iperf.h
|
||||
+++ b/src/iperf.h
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
#include "timer.h"
|
||||
#include "queue.h"
|
||||
-#include "cjson.h"
|
||||
+#include <cjson/cJSON.h>
|
||||
#include "iperf_time.h"
|
||||
#include "portable_endian.h"
|
||||
|
||||
--- a/src/iperf_api.c
|
||||
+++ b/src/iperf_api.c
|
||||
@@ -79,7 +79,7 @@
|
||||
#endif /* HAVE_SCTP_H */
|
||||
#include "timer.h"
|
||||
|
||||
-#include "cjson.h"
|
||||
+#include <cjson/cJSON.h>
|
||||
#include "units.h"
|
||||
#include "iperf_util.h"
|
||||
#include "iperf_locale.h"
|
||||
--- a/src/iperf_tcp.c
|
||||
+++ b/src/iperf_tcp.c
|
||||
@@ -42,7 +42,7 @@
|
||||
#include "iperf_api.h"
|
||||
#include "iperf_tcp.h"
|
||||
#include "net.h"
|
||||
-#include "cjson.h"
|
||||
+#include <cjson/cJSON.h>
|
||||
|
||||
#if defined(HAVE_FLOWLABEL)
|
||||
#include "flowlabel.h"
|
||||
--- a/src/iperf_udp.c
|
||||
+++ b/src/iperf_udp.c
|
||||
@@ -45,7 +45,7 @@
|
||||
#include "iperf_udp.h"
|
||||
#include "timer.h"
|
||||
#include "net.h"
|
||||
-#include "cjson.h"
|
||||
+#include <cjson/cJSON.h>
|
||||
|
||||
/* iperf_udp_recv
|
||||
*
|
||||
--- a/src/iperf_util.c
|
||||
+++ b/src/iperf_util.c
|
||||
@@ -46,7 +46,7 @@
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
|
||||
-#include "cjson.h"
|
||||
+#include <cjson/cJSON.h>
|
||||
#include "iperf.h"
|
||||
#include "iperf_api.h"
|
||||
|
||||
--- a/src/iperf_util.h
|
||||
+++ b/src/iperf_util.h
|
||||
@@ -28,7 +28,7 @@
|
||||
#define __IPERF_UTIL_H
|
||||
|
||||
#include "iperf_config.h"
|
||||
-#include "cjson.h"
|
||||
+#include <cjson/cJSON.h>
|
||||
#include <sys/select.h>
|
||||
#include <stddef.h>
|
||||
|
||||
--
|
||||
2.45.2
|
||||
|
||||
44
sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-2.2.1.ebuild
vendored
Normal file
44
sdk_container/src/third_party/portage-stable/net-misc/iperf/iperf-2.2.1.ebuild
vendored
Normal file
@ -0,0 +1,44 @@
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
|
||||
HOMEPAGE="https://sourceforge.net/projects/iperf2/"
|
||||
|
||||
if [[ ${PV} == *9999* ]] ; then
|
||||
EGIT_REPO_URI="https://git.code.sf.net/p/iperf2/code"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://downloads.sourceforge.net/iperf2/${P}.tar.gz"
|
||||
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
fi
|
||||
|
||||
LICENSE="HPND"
|
||||
SLOT="2"
|
||||
IUSE="debug"
|
||||
# Fails w/ connection refused to just-spawned daemon
|
||||
RESTRICT="test"
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_enable debug debuginfo)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake AR="$(tc-getAR)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
dodoc doc/*
|
||||
newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
|
||||
newconfd "${FILESDIR}"/${PN}.confd ${PN}
|
||||
}
|
||||
@ -1,25 +1,34 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
EAPI=8
|
||||
|
||||
inherit git-r3 toolchain-funcs
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
|
||||
HOMEPAGE="https://sourceforge.net/projects/iperf2/"
|
||||
EGIT_REPO_URI="https://git.code.sf.net/p/iperf2/code"
|
||||
|
||||
if [[ ${PV} == *9999* ]] ; then
|
||||
EGIT_REPO_URI="https://git.code.sf.net/p/iperf2/code"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://downloads.sourceforge.net/iperf2/${P}.tar.gz"
|
||||
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
fi
|
||||
|
||||
LICENSE="HPND"
|
||||
SLOT="2"
|
||||
IUSE="ipv6 threads debug"
|
||||
|
||||
DOCS=( INSTALL README )
|
||||
IUSE="debug"
|
||||
# Fails w/ connection refused to just-spawned daemon
|
||||
RESTRICT="test"
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable debug debuginfo) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable threads)
|
||||
local myeconfargs=(
|
||||
$(use_enable debug debuginfo)
|
||||
)
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Copyright 1999-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit autotools systemd
|
||||
|
||||
DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
|
||||
HOMEPAGE="https://github.com/esnet/iperf"
|
||||
SRC_URI="https://github.com/esnet/iperf/releases/download/${PV}/${P}.tar.gz"
|
||||
DESCRIPTION="TCP, UDP, and SCTP network bandwidth measurement tool"
|
||||
HOMEPAGE="https://software.es.net/iperf/ https://github.com/esnet/iperf"
|
||||
SRC_URI="https://github.com/esnet/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="3"
|
||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
|
||||
IUSE="sctp"
|
||||
|
||||
DEPEND="
|
||||
@ -26,8 +26,7 @@ DOCS=( README.md RELNOTES.md )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
|
||||
"${FILESDIR}"/${PN}-3.17.1-Unbundle-cJSON.patch
|
||||
"${FILESDIR}"/${PN}-3.17.1-c23.patch
|
||||
"${FILESDIR}"/${PN}-3.18-unbundle-cJSON.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
@ -12,6 +12,6 @@
|
||||
<upstream>
|
||||
<remote-id type="cpe">cpe:/a:iperf_project:iperf</remote-id>
|
||||
<remote-id type="github">esnet/iperf</remote-id>
|
||||
<remote-id type="sourceforge">iperf</remote-id>
|
||||
<remote-id type="sourceforge">iperf2</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user