* [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/files/, net-misc/iperf/
@ 2018-09-01 12:32 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2018-09-01 12:32 UTC (permalink / raw
To: gentoo-commits
commit: 0bf6e057a254ef89f7372c7fb8ebaa0a2dceb47c
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 1 12:32:05 2018 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Sep 1 12:32:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bf6e057
net-misc/iperf: Fix USE=-ipv6
Fixes: https://bugs.gentoo.org/659324
Package-Manager: Portage-2.3.48, Repoman-2.3.10
net-misc/iperf/files/iperf-2.0.12-ipv6.patch | 23 +++++++++++++++++++++++
net-misc/iperf/iperf-2.0.12.ebuild | 3 +++
2 files changed, 26 insertions(+)
diff --git a/net-misc/iperf/files/iperf-2.0.12-ipv6.patch b/net-misc/iperf/files/iperf-2.0.12-ipv6.patch
new file mode 100644
index 00000000000..cd189f62108
--- /dev/null
+++ b/net-misc/iperf/files/iperf-2.0.12-ipv6.patch
@@ -0,0 +1,23 @@
+--- 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
diff --git a/net-misc/iperf/iperf-2.0.12.ebuild b/net-misc/iperf/iperf-2.0.12.ebuild
index 3eab1882277..95f3d7dca14 100644
--- a/net-misc/iperf/iperf-2.0.12.ebuild
+++ b/net-misc/iperf/iperf-2.0.12.ebuild
@@ -13,6 +13,9 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-
IUSE="ipv6 threads debug"
DOCS="INSTALL README"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.12-ipv6.patch
+)
src_configure() {
econf \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/files/, net-misc/iperf/
@ 2019-04-29 9:30 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2019-04-29 9:30 UTC (permalink / raw
To: gentoo-commits
commit: 1667ae22ab8e5b448221866c95cc7b60a8534cf3
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 29 09:29:43 2019 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Mon Apr 29 09:30:41 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1667ae22
net-misc/iperf: Version 2.0.14a
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
net-misc/iperf/files/iperf-2.0.14a.patch | 132 +++++++++++++++++++++
...f-2.99999.99999.ebuild => iperf-2.0.14a.ebuild} | 12 +-
net-misc/iperf/iperf-2.99999.99999.ebuild | 4 +-
3 files changed, 140 insertions(+), 8 deletions(-)
diff --git a/net-misc/iperf/files/iperf-2.0.14a.patch b/net-misc/iperf/files/iperf-2.0.14a.patch
new file mode 100644
index 00000000000..07fbd0c96b8
--- /dev/null
+++ b/net-misc/iperf/files/iperf-2.0.14a.patch
@@ -0,0 +1,132 @@
+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;
diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild
similarity index 66%
copy from net-misc/iperf/iperf-2.99999.99999.ebuild
copy to net-misc/iperf/iperf-2.0.14a.ebuild
index ee2ce295818..b680ce3d38b 100644
--- a/net-misc/iperf/iperf-2.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-2.0.14a.ebuild
@@ -1,23 +1,23 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-inherit git-r3
+EAPI=7
DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
HOMEPAGE="http://iperf2.sourceforge.net/"
-#SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
-EGIT_REPO_URI="https://git.code.sf.net/p/iperf2/code"
+SRC_URI="mirror://sourceforge/${PN}2/${PN}-2.0.13.tar.gz"
LICENSE="HPND"
SLOT="2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint"
IUSE="ipv6 threads debug"
DOCS="INSTALL README"
PATCHES=(
"${FILESDIR}"/${PN}-2.0.12-ipv6.patch
+ "${FILESDIR}"/${P}.patch
)
+S=${WORKDIR}/${PN}-2.0.13
src_configure() {
econf \
diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.99999.99999.ebuild
index ee2ce295818..99746d3f101 100644
--- a/net-misc/iperf/iperf-2.99999.99999.ebuild
+++ b/net-misc/iperf/iperf-2.99999.99999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit git-r3
DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/files/, net-misc/iperf/
@ 2021-01-07 1:24 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-01-07 1:24 UTC (permalink / raw
To: gentoo-commits
commit: 03e0957f23d230268d65b45397bc8077711fee9b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 7 01:14:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 7 01:14:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03e0957f
net-misc/iperf: cleanup old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/iperf/Manifest | 1 -
net-misc/iperf/files/iperf-3.0.5-flags.patch | 31 --------------------
net-misc/iperf/iperf-2.0.13.ebuild | 34 ---------------------
net-misc/iperf/iperf-3.6.ebuild | 44 ----------------------------
4 files changed, 110 deletions(-)
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index e58dfb818b5..a3540cc13ac 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,3 +1,2 @@
DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
-DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d
DIST iperf-3.9.tar.gz 627100 BLAKE2B c09018dc066612c61076ed4c53dd93b4dba766fbcbc359eb402055dcaa90af63e2df2b6c67ba8a0a72a17648014240dc5b355084e69550afed4d59257a224de8 SHA512 3da0939bed576a7c14baa03c996e6f407f20bfe58c4b3a36a66e74f41bd5442c0b23ab18c8eb1f2f37fd47449af533b61b658d810c68707b2b06d28894ac2035
diff --git a/net-misc/iperf/files/iperf-3.0.5-flags.patch b/net-misc/iperf/files/iperf-3.0.5-flags.patch
deleted file mode 100644
index 9c11c282c33..00000000000
--- a/net-misc/iperf/files/iperf-3.0.5-flags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-* Do not inject -g
-* Do not make a profiled build
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,6 +1,6 @@
- lib_LTLIBRARIES = libiperf.la # Build and install an iperf library
- bin_PROGRAMS = iperf3 # Build and install an iperf binary
--noinst_PROGRAMS = t_timer t_units t_uuid iperf3_profile # Build, but don't install the test programs and a profiled version of iperf3
-+noinst_PROGRAMS = t_timer t_units t_uuid # Build, but don't install the test programs and a profiled version of iperf3
- include_HEADERS = iperf_api.h # Defines the headers that get installed with the program
-
-
-@@ -37,14 +37,13 @@
-
- # Specify the sources and various flags for the iperf binary
- iperf3_SOURCES = main.c
--iperf3_CFLAGS = -g
-+iperf3_CFLAGS =
- iperf3_LDADD = libiperf.la
--iperf3_LDFLAGS = -g
-+iperf3_LDFLAGS =
-
- # Specify the sources and various flags for the profiled iperf binary. This
- # binary recompiles all the source files to make sure they are all profiled.
--iperf3_profile_SOURCES = main.c \
-- $(libiperf_la_SOURCES)
-+iperf3_profile_SOURCES = main.c
-
- iperf3_profile_CFLAGS = -pg -g
- iperf3_profile_LDADD = libiperf.la
diff --git a/net-misc/iperf/iperf-2.0.13.ebuild b/net-misc/iperf/iperf-2.0.13.ebuild
deleted file mode 100644
index 5bbdb14cfc5..00000000000
--- a/net-misc/iperf/iperf-2.0.13.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
-HOMEPAGE="https://sourceforge.net/projects/iperf2/"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
-
-LICENSE="HPND"
-SLOT="2"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ipv6 threads debug"
-
-DOCS=( "INSTALL" "README" )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.0.12-ipv6.patch
-)
-
-src_configure() {
- econf \
- $(use_enable debug debuginfo) \
- $(use_enable ipv6) \
- $(use_enable threads)
-}
-
-src_install() {
- default
-
- dodoc doc/*
- newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-misc/iperf/iperf-3.6.ebuild b/net-misc/iperf/iperf-3.6.ebuild
deleted file mode 100644
index 090ffb29144..00000000000
--- a/net-misc/iperf/iperf-3.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils ltprune
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf/"
-SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P/_/}"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="libressl sctp static-libs"
-
-DEPEND="!libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- sctp? ( net-misc/lksctp-tools )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.5-flags.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- use sctp || export ac_cv_header_netinet_sctp_h=no
- econf $(use_enable static-libs static)
-}
-
-src_install() {
- default
-
- newconfd "${FILESDIR}"/iperf.confd iperf3
- newinitd "${FILESDIR}"/iperf3.initd iperf3
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/files/, net-misc/iperf/
@ 2022-10-02 2:26 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-10-02 2:26 UTC (permalink / raw
To: gentoo-commits
commit: 9b4d145731f60425ae36ab82f7de237b633c9ef2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 02:25:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 02:26:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4d1457
net-misc/iperf: add 3.12
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-misc/iperf/Manifest | 1 +
.../iperf/files/iperf-3.12-Unbundle-cJSON.patch | 109 +++++++++++++++++++++
net-misc/iperf/files/iperf-3.12-fix-bashism.patch | 43 ++++++++
net-misc/iperf/iperf-3.12.ebuild | 55 +++++++++++
4 files changed, 208 insertions(+)
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index 964c281db1c0..7c2daa431c11 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,2 +1,3 @@
DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
DIST iperf-3.11.tar.gz 638521 BLAKE2B b2981c170aac947c407b0a5686cd9708012282044be30ec7e5f993a9d61d55c4517003024890a194f6e55d342be0e60f1bcab27460541d2b9631a3bb88e094a5 SHA512 4be3e407f77a083d826bddc5ce2939047c85f5b816a6aeb3293eacabf2ea23bf13df4226e629ade3bf390c2eb08d6a1cb96f8cdb0fefb290a0fa4c8331d11a17
+DIST iperf-3.12.tar.gz 648136 BLAKE2B 95753e4fd2b7ca640b17501f6b21b0e63ea0a3df2ba920c672ffcccd991502cacf4bf3641be1ffbbb993c86e6915ceada5745cffe1796bb86b6a6a1dff8811ae SHA512 9b0600a19750311557833b32ca5c4be809ab98643522f125645dd8f83c482017e42fbe5fc9484624731176a59b67203a468eb81eebf1a37b9c1b3eff818857ba
diff --git a/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch b/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch
new file mode 100644
index 000000000000..c5b1b49ec1a7
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.12-Unbundle-cJSON.patch
@@ -0,0 +1,109 @@
+From 85b225cdd00b9a483a603b8b124a829ffbf92b88 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 2 Oct 2022 03:07:40 +0100
+Subject: [PATCH] Unbundle cJSON
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -62,6 +62,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 \
+@@ -44,10 +42,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
+@@ -65,7 +65,7 @@
+
+ #include "timer.h"
+ #include "queue.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "iperf_time.h"
+
+ #if defined(HAVE_SSL)
+--- a/src/iperf_api.c
++++ b/src/iperf_api.c
+@@ -81,7 +81,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
+@@ -46,7 +46,7 @@
+ #include "iperf_udp.h"
+ #include "timer.h"
+ #include "net.h"
+-#include "cjson.h"
++#include <cjson/cJSON.h>
+ #include "portable_endian.h"
+
+ #if defined(HAVE_INTTYPES_H)
+--- 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>
+
diff --git a/net-misc/iperf/files/iperf-3.12-fix-bashism.patch b/net-misc/iperf/files/iperf-3.12-fix-bashism.patch
new file mode 100644
index 000000000000..1f3a321f42c9
--- /dev/null
+++ b/net-misc/iperf/files/iperf-3.12-fix-bashism.patch
@@ -0,0 +1,43 @@
+https://github.com/esnet/iperf/pull/1398
+
+From 3a03f775ca103f2e824abef903130280c57ca8ac Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 2 Oct 2022 02:58:59 +0100
+Subject: [PATCH] config/iperf_config_static_bin.m4: fix bashism
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes configure warnings/errors like:
+```
+./configure: 2670: test: x: unexpected operator
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/config/iperf_config_static_bin.m4
++++ b/config/iperf_config_static_bin.m4
+@@ -7,6 +7,6 @@ AC_ARG_ENABLE([static-bin],
+ [:])
+ AM_CONDITIONAL([ENABLE_STATIC_BIN], [test x$enable_static_bin = xno])
+
+-AS_IF([test "x$enable_static_bin" == xyes],
++AS_IF([test "x$enable_static_bin" = xyes],
+ [LDFLAGS="$LDFLAGS --static"]
+ [])
+--- a/configure
++++ b/configure
+@@ -2667,7 +2667,7 @@ else
+ fi
+
+
+-if test "x$enable_static_bin" == xyes
++if test "x$enable_static_bin" = xyes
+ then :
+ LDFLAGS="$LDFLAGS --static"
+
+
diff --git a/net-misc/iperf/iperf-3.12.ebuild b/net-misc/iperf/iperf-3.12.ebuild
new file mode 100644
index 000000000000..6ee24b228358
--- /dev/null
+++ b/net-misc/iperf/iperf-3.12.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 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/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/${P/_/}
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="sctp"
+
+DEPEND="
+ >=dev-libs/cJSON-1.7.15
+ dev-libs/openssl:=
+ sctp? ( net-misc/lksctp-tools )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md RELNOTES.md )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
+ "${FILESDIR}"/${PN}-3.12-fix-bashism.patch
+ "${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch
+)
+
+src_prepare() {
+ default
+
+ # Drop bundled cjson
+ rm src/cjson.{c,h} || die
+
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_with sctp)
+}
+
+src_install() {
+ default
+
+ newconfd "${FILESDIR}"/iperf.confd iperf3
+ newinitd "${FILESDIR}"/iperf3.initd iperf3
+ systemd_dounit contrib/iperf3.service
+
+ find "${ED}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-10-02 2:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-02 2:26 [gentoo-commits] repo/gentoo:master commit in: net-misc/iperf/files/, net-misc/iperf/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-01-07 1:24 Sam James
2019-04-29 9:30 Jeroen Roovers
2018-09-01 12:32 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox