1 |
commit: 1667ae22ab8e5b448221866c95cc7b60a8534cf3 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 29 09:29:43 2019 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 29 09:30:41 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1667ae22 |
7 |
|
8 |
net-misc/iperf: Version 2.0.14a |
9 |
|
10 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
11 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
12 |
|
13 |
net-misc/iperf/files/iperf-2.0.14a.patch | 132 +++++++++++++++++++++ |
14 |
...f-2.99999.99999.ebuild => iperf-2.0.14a.ebuild} | 12 +- |
15 |
net-misc/iperf/iperf-2.99999.99999.ebuild | 4 +- |
16 |
3 files changed, 140 insertions(+), 8 deletions(-) |
17 |
|
18 |
diff --git a/net-misc/iperf/files/iperf-2.0.14a.patch b/net-misc/iperf/files/iperf-2.0.14a.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..07fbd0c96b8 |
21 |
--- /dev/null |
22 |
+++ b/net-misc/iperf/files/iperf-2.0.14a.patch |
23 |
@@ -0,0 +1,132 @@ |
24 |
+commit 12254fa398e627949af923afd0d48cd9b814f0a0 |
25 |
+Author: rmcmahon <bob.mcmahon@××××××××.com> |
26 |
+Date: Tue Jan 29 23:11:18 2019 -0800 |
27 |
+ |
28 |
+ new version 2.0.14a, fix for -P w/server and summing |
29 |
+ |
30 |
+diff --git a/configure b/configure |
31 |
+index f1a9983..706e7a3 100755 |
32 |
+--- a/configure |
33 |
++++ b/configure |
34 |
+@@ -1,6 +1,6 @@ |
35 |
+ #! /bin/sh |
36 |
+ # Guess values for system-dependent variables and create Makefiles. |
37 |
+-# Generated by GNU Autoconf 2.69 for Iperf 2.0.13. |
38 |
++# Generated by GNU Autoconf 2.69 for Iperf 2.0.14a. |
39 |
+ # |
40 |
+ # |
41 |
+ # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
42 |
+@@ -577,8 +577,8 @@ MAKEFLAGS= |
43 |
+ # Identity of this package. |
44 |
+ PACKAGE_NAME='Iperf' |
45 |
+ PACKAGE_TARNAME='iperf' |
46 |
+-PACKAGE_VERSION='2.0.13' |
47 |
+-PACKAGE_STRING='Iperf 2.0.13' |
48 |
++PACKAGE_VERSION='2.0.14a' |
49 |
++PACKAGE_STRING='Iperf 2.0.14a' |
50 |
+ PACKAGE_BUGREPORT='' |
51 |
+ PACKAGE_URL='' |
52 |
+ |
53 |
+@@ -1313,7 +1313,7 @@ if test "$ac_init_help" = "long"; then |
54 |
+ # Omit some internal or obsolete options to make the list less imposing. |
55 |
+ # This message is too long to be a string in the A/UX 3.1 sh. |
56 |
+ cat <<_ACEOF |
57 |
+-\`configure' configures Iperf 2.0.13 to adapt to many kinds of systems. |
58 |
++\`configure' configures Iperf 2.0.14a to adapt to many kinds of systems. |
59 |
+ |
60 |
+ Usage: $0 [OPTION]... [VAR=VALUE]... |
61 |
+ |
62 |
+@@ -1383,7 +1383,7 @@ fi |
63 |
+ |
64 |
+ if test -n "$ac_init_help"; then |
65 |
+ case $ac_init_help in |
66 |
+- short | recursive ) echo "Configuration of Iperf 2.0.13:";; |
67 |
++ short | recursive ) echo "Configuration of Iperf 2.0.14a:";; |
68 |
+ esac |
69 |
+ cat <<\_ACEOF |
70 |
+ |
71 |
+@@ -1493,7 +1493,7 @@ fi |
72 |
+ test -n "$ac_init_help" && exit $ac_status |
73 |
+ if $ac_init_version; then |
74 |
+ cat <<\_ACEOF |
75 |
+-Iperf configure 2.0.13 |
76 |
++Iperf configure 2.0.14a |
77 |
+ generated by GNU Autoconf 2.69 |
78 |
+ |
79 |
+ Copyright (C) 2012 Free Software Foundation, Inc. |
80 |
+@@ -2236,7 +2236,7 @@ cat >config.log <<_ACEOF |
81 |
+ This file contains any messages produced by compilers while |
82 |
+ running configure, to aid debugging if configure makes a mistake. |
83 |
+ |
84 |
+-It was created by Iperf $as_me 2.0.13, which was |
85 |
++It was created by Iperf $as_me 2.0.14a, which was |
86 |
+ generated by GNU Autoconf 2.69. Invocation command line was |
87 |
+ |
88 |
+ $ $0 $@ |
89 |
+@@ -3101,7 +3101,7 @@ fi |
90 |
+ |
91 |
+ # Define the identity of the package. |
92 |
+ PACKAGE='iperf' |
93 |
+- VERSION='2.0.13' |
94 |
++ VERSION='2.0.14a' |
95 |
+ |
96 |
+ |
97 |
+ cat >>confdefs.h <<_ACEOF |
98 |
+@@ -8854,7 +8854,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 |
99 |
+ # report actual input values of CONFIG_FILES etc. instead of their |
100 |
+ # values after options handling. |
101 |
+ ac_log=" |
102 |
+-This file was extended by Iperf $as_me 2.0.13, which was |
103 |
++This file was extended by Iperf $as_me 2.0.14a, which was |
104 |
+ generated by GNU Autoconf 2.69. Invocation command line was |
105 |
+ |
106 |
+ CONFIG_FILES = $CONFIG_FILES |
107 |
+@@ -8920,7 +8920,7 @@ _ACEOF |
108 |
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
109 |
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
110 |
+ ac_cs_version="\\ |
111 |
+-Iperf config.status 2.0.13 |
112 |
++Iperf config.status 2.0.14a |
113 |
+ configured by $0, generated by GNU Autoconf 2.69, |
114 |
+ with options \\"\$ac_cs_config\\" |
115 |
+ |
116 |
+diff --git a/configure.ac b/configure.ac |
117 |
+index cd3c9a0..4c93328 100644 |
118 |
+--- a/configure.ac |
119 |
++++ b/configure.ac |
120 |
+@@ -5,7 +5,7 @@ dnl =================================================================== |
121 |
+ |
122 |
+ |
123 |
+ AC_PREREQ(2.59) |
124 |
+-AC_INIT(Iperf,2.0.13) |
125 |
++AC_INIT(Iperf,2.0.14a) |
126 |
+ AC_CONFIG_HEADER([config.h]) |
127 |
+ AM_INIT_AUTOMAKE() |
128 |
+ |
129 |
+diff --git a/include/version.h b/include/version.h |
130 |
+index 87279a7..d6f9d89 100644 |
131 |
+--- a/include/version.h |
132 |
++++ b/include/version.h |
133 |
+@@ -1,4 +1,4 @@ |
134 |
+-#define IPERF_VERSION "2.0.13" |
135 |
+-#define IPERF_VERSION_DATE "21 Jan 2019" |
136 |
++#define IPERF_VERSION "2.0.14a" |
137 |
++#define IPERF_VERSION_DATE "29 Jan 2019" |
138 |
+ #define IPERF_VERSION_MAJORHEX 0x00020000 |
139 |
+-#define IPERF_VERSION_MINORHEX 0x000D0003 |
140 |
++#define IPERF_VERSION_MINORHEX 0x000E0000 |
141 |
+diff --git a/src/Reporter.c b/src/Reporter.c |
142 |
+index 80891aa..d5164ef 100644 |
143 |
+--- a/src/Reporter.c |
144 |
++++ b/src/Reporter.c |
145 |
+@@ -151,7 +151,9 @@ MultiHeader* InitMulti( thread_Settings *agent, int inID) { |
146 |
+ memset( multihdr, 0, sizeof(MultiHeader) ); |
147 |
+ Condition_Initialize( &multihdr->barrier ); |
148 |
+ multihdr->groupID = inID; |
149 |
+- multihdr->threads = agent->mThreads; |
150 |
++ if (agent->mThreadMode == kMode_Client) { |
151 |
++ multihdr->threads = agent->mThreads; |
152 |
++ } |
153 |
+ if ( isMultipleReport( agent ) ) { |
154 |
+ int i; |
155 |
+ ReporterData *data = NULL; |
156 |
|
157 |
diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild |
158 |
similarity index 66% |
159 |
copy from net-misc/iperf/iperf-2.99999.99999.ebuild |
160 |
copy to net-misc/iperf/iperf-2.0.14a.ebuild |
161 |
index ee2ce295818..b680ce3d38b 100644 |
162 |
--- a/net-misc/iperf/iperf-2.99999.99999.ebuild |
163 |
+++ b/net-misc/iperf/iperf-2.0.14a.ebuild |
164 |
@@ -1,23 +1,23 @@ |
165 |
-# Copyright 1999-2018 Gentoo Foundation |
166 |
+# Copyright 1999-2019 Gentoo Authors |
167 |
# Distributed under the terms of the GNU General Public License v2 |
168 |
|
169 |
-EAPI=6 |
170 |
-inherit git-r3 |
171 |
+EAPI=7 |
172 |
|
173 |
DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP" |
174 |
HOMEPAGE="http://iperf2.sourceforge.net/" |
175 |
-#SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz" |
176 |
-EGIT_REPO_URI="https://git.code.sf.net/p/iperf2/code" |
177 |
+SRC_URI="mirror://sourceforge/${PN}2/${PN}-2.0.13.tar.gz" |
178 |
|
179 |
LICENSE="HPND" |
180 |
SLOT="2" |
181 |
-KEYWORDS="" |
182 |
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~m68k-mint" |
183 |
IUSE="ipv6 threads debug" |
184 |
|
185 |
DOCS="INSTALL README" |
186 |
PATCHES=( |
187 |
"${FILESDIR}"/${PN}-2.0.12-ipv6.patch |
188 |
+ "${FILESDIR}"/${P}.patch |
189 |
) |
190 |
+S=${WORKDIR}/${PN}-2.0.13 |
191 |
|
192 |
src_configure() { |
193 |
econf \ |
194 |
|
195 |
diff --git a/net-misc/iperf/iperf-2.99999.99999.ebuild b/net-misc/iperf/iperf-2.99999.99999.ebuild |
196 |
index ee2ce295818..99746d3f101 100644 |
197 |
--- a/net-misc/iperf/iperf-2.99999.99999.ebuild |
198 |
+++ b/net-misc/iperf/iperf-2.99999.99999.ebuild |
199 |
@@ -1,7 +1,7 @@ |
200 |
-# Copyright 1999-2018 Gentoo Foundation |
201 |
+# Copyright 1999-2019 Gentoo Authors |
202 |
# Distributed under the terms of the GNU General Public License v2 |
203 |
|
204 |
-EAPI=6 |
205 |
+EAPI=7 |
206 |
inherit git-r3 |
207 |
|
208 |
DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP" |