gentoo resync : 04.05.2019

4 files changed, 142 insertions, 8 deletions

diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index edfabdcc583e..17867188fe37 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -1,18 +1,18 @@
 AUX iperf-2.0.12-ipv6.patch 856 BLAKE2B 321ef3f9f9d87243a32f9f0d0c43083670ef3737758a19138d7d18009fc6456c45fa0b0457048a84ef919576c16ae9155146a9599cb582272cb1c7a3af91a4c0 SHA512 199aee88020c7dc579ba2cbc31cdc049c883211a4a2f58d84c0a07ba6a8d0169c5f4652eb0d89db3b0176b65cb3eb19c1897caf3e414df3b9beedaa51a3f458f
+AUX iperf-2.0.14a.patch 4317 BLAKE2B 96b5894040b22c3e842b815cfe816fdcfda7b397aac6c72e9ef9d8d6d65eaff314054ad1e5c1510b9afb6dcb96051028abfebda23a9a04f5b49eaf380a4d5105 SHA512 cbe1701972b3b51ed10e448e0a769b3fac835b3e4459c81face294b21ec778d7a306c0e5ff284ea22a4b9d2fe51060f2c077b3aa96d43484ac095909da998e19
 AUX iperf-3.0.5-flags.patch 1323 BLAKE2B 14a7c9a889d5dd370553de7151f4103ba638559ee1111a2f8b4c479edd4af454652989843c8444dffcbb72206dd530cfe7204a80bba3123219f81b95acd8f1f5 SHA512 d5e106b9b6fdc704e1e8d5c87f767a912a3e643994b51f09fee34fffcf9007b3eb91adcf3b87e04f90c994e29691dff0e400fb2f13a94e68c58183a39d833403
 AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059b05b56ff66a6d93086b3100aa36db30d2e8efd3914eda148a61c379d6c35a73fd64f74d1e3d7 SHA512 49d79507064de54fbf1c5d11315b7c7be24a854968687ae0de7e0ee34c947495f4c98a5b629d68afcd414fd91cc759cda59c4f367c68137ff6e7bc4a214a6551
 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
-DIST iperf-2.0.12.tar.gz 324528 BLAKE2B db5b0a3566912f98f2647ff43ed440704caf6b67aeb3b4c698262aa94868f0fc2b2fd304beb885a0db7062ee274c5435a2a3593f88c6386044d0c4c3d47f9bfd SHA512 fd672e545b6e0a74e5061e4c861378c69490a978b63ee63414842bf379a202484868010deb27cb9f2a3691d74fe3b1e6a61dff37abeabd9e3db4c3317908e461
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
 DIST iperf-2.0.9.tar.gz 277702 BLAKE2B 6de23e43be0c14bce2379e699b1e25a8ac5ed80cdef1493167c80253cbefac3357dadb00c15d572c5e4213528d0e48b9242cd93b71dc367e22753243e56b2496 SHA512 ff75e51af9d368eedb1e1dc4621f7575219525f0e438f1c8fa896aa7e990a6812a9a351db9004952057d81127f52b67350820e85c9ae1d8db2e6a60c1f2534d2
 DIST iperf-3.1.3.tar.gz 549466 BLAKE2B 645e9614ef8f4e4f7949d9aaa99631eba604754a7744d1a729408c5549beb4baf692cee99498dddd8150e1cf06adaa13213cf70510e8ab54418274cdcf145ecd SHA512 67795d9d5b4fc719b3fbbc2683cbe2777412bb7212282a50a378f5bb3793c3c17e278d22816fd9d289b2606ce97624d496ba236e3686ce1a31b9f1d6e6f474e9
 DIST iperf-3.5.tar.gz 596476 BLAKE2B 756216618b45b637581318afaa5b48366061501c3ee65bbd6788ed1b6ab61073fa5e231a5212cde0a0703970c97af2511aaa59e250f2326cc1e393771828850c SHA512 f1823b5cd23b344b772a37f485e458d6b3703c11892ea4fa2abca61f474eed6229b3cb75db78adedf87092431d11c3174bfbd92833fc56dedab64953f50ac6a4
 DIST iperf-3.6.tar.gz 602406 BLAKE2B 791355c52e587bae01560e14448b92c3e4e070afc4f311964d2577ea790886777ca1512ea349d105a83f312f795800c01e13c53b700511df14bcf2a7c28f5dda SHA512 0a1c8fd9b33369a2a018423cf33e63cfe7202ae411996f467199ae5b834ff7977d0e5c7e342f4f1b7d90c1c156453daa4dac9f94d11bb581d6d43c807538206d
-EBUILD iperf-2.0.12.ebuild 752 BLAKE2B 72acd92d2cb33a31953cd024efe80b65527ec1808308b1b90e012aa72b77585e6f73cadefbe4870b24284b6f9a2871b832c75aefdc8185169a36d199fe90c63b SHA512 7ed8c871573d7024e0d1fc168455c12f811349280964400b61c68a587927a5438d33f0bad7ba1cab60e55e5c7f625e0fd50b3614411c232c861d169ccb425f32
 EBUILD iperf-2.0.13.ebuild 749 BLAKE2B 058fee353d0b527ff7b498393edede4b27a6e964986a9ea0a5c1726438f5a5ea5e3b78b8c3ebe0c11f6c4eb183479a5ff9ccbc36391cffabfe3835c9630fc85d SHA512 063744c9a43f5cc37bc56adf9fe0980adb448a119afd41b006e8192bb91de562a7b5942259aefcdb5c76c07515e8fbee552fed6184dc191933febe7712e4458e
+EBUILD iperf-2.0.14a.ebuild 809 BLAKE2B 8fed944e9f1e47b14d0ea2f462fd8003393f4c0b47640d6937293130599a6d33a38ba86069e20ef5fc09cdf2429130153eaab7a88e69ff44ffe11cd06f618c06 SHA512 b1cc22a9d741dbce419c724af8462f199f02738c9c78b55b2305a5f3d051d0d64a8a3e369cfa1bffd6c7b251274423683508e57f1c67843eeeca331032f51399
 EBUILD iperf-2.0.9.ebuild 695 BLAKE2B 25720f5cd6b51839994ad64b099e13cb22b2347154e9cae057506ef40d0e1dcd54ef2c2e4c42f8e1efef2a093b26eed41695be04e80a69f2c2701d139e9e0c9a SHA512 21438d1baed959f6203d23a62a0040ae2ceb289ffaa5b56a1e5d3a542d31d743041d5d6bd7c057c4bbb63086545a62bc7546996d90cde951bd2e4e116c948b7e
-EBUILD iperf-2.99999.99999.ebuild 714 BLAKE2B 084ab539cbc2937bcdeb0aa0cf8932e630c1ff4bfd828649f528240dd75800497b770690cb059bc829c6a80ad106485ca748e70887a32f74b065cd146e5c2033 SHA512 0a55b9adacba8a42e7ab42d78e5af49fc03d5ab5409ced8ea35e8a61afe1a2c3eccf098916615157f2cef057f6e2e6f8c548bc8e6b6b495b47ca9d84be7b0f30
+EBUILD iperf-2.99999.99999.ebuild 711 BLAKE2B 569294c8cfae197a94563320c64cd477c993bd71558c85327c292d8b302839b8c83e4814d37c30a567f2ca65570112cbdc9e2025ba48db78414c940cca1322f9 SHA512 c2f68699b11ac215a5819242435dfbe4df964f83c2b864d592b0795ec9506ada2ac7e41abefeaa152fee1138ed9ea0c13d3f200b403dff35b1b3eb70351a2122
 EBUILD iperf-3.1.3.ebuild 888 BLAKE2B 5e9d333b068de8320118a8253d85482efdbb232704f5ee193212fb7854b77820cbdbe1ff4cb77cc8941a07f5079143128743653e357ba1477c84ad607200eef3 SHA512 2dd6dfd2affb6d429c2a91f674e52390e1039c98df381e1ceb93f837b85631a27b615a7713d39c3797a8f873465c568214d717f92010f473792c17ff91683999
 EBUILD iperf-3.5.ebuild 1002 BLAKE2B f8a05469d2772f67559f2f4a09fb225b99fc27a84edb0dff12f945bd20a6996ed646dc16a4a0e9f03e69175ca29664bbf84b5a508f4c0d5e099e94435b890364 SHA512 f9610e0701a08a2e91591b42c48f66de0ffa265f0d6a9a30684046a90ea9e4d2ffe7584d90e5ed63dea945c045f10dc37b5ede1b545a50eafb12568147d17dcf
 EBUILD iperf-3.6.ebuild 1002 BLAKE2B f8a05469d2772f67559f2f4a09fb225b99fc27a84edb0dff12f945bd20a6996ed646dc16a4a0e9f03e69175ca29664bbf84b5a508f4c0d5e099e94435b890364 SHA512 f9610e0701a08a2e91591b42c48f66de0ffa265f0d6a9a30684046a90ea9e4d2ffe7584d90e5ed63dea945c045f10dc37b5ede1b545a50eafb12568147d17dcf
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 000000000000..07fbd0c96b84
--- /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.0.12.ebuild b/net-misc/iperf/iperf-2.0.14a.ebuild
index 95f3d7dca146..b680ce3d38bb 100644
--- a/net-misc/iperf/iperf-2.0.12.ebuild
+++ b/net-misc/iperf/iperf-2.0.14a.ebuild
@@ -1,11 +1,11 @@
-# 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
 
 DESCRIPTION="Tool to measure IP bandwidth using UDP or TCP"
 HOMEPAGE="http://iperf2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}2/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}2/${PN}-2.0.13.tar.gz"
 
 LICENSE="HPND"
 SLOT="2"
@@ -15,7 +15,9 @@ 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 ee2ce2958181..99746d3f101f 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"