<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/823f27f35d14d54245b1f2ddb6f3b6fb2fa46b79">https://github.com/macports/macports-ports/commit/823f27f35d14d54245b1f2ddb6f3b6fb2fa46b79</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 823f27f iperf3-devel: update to release 3.2
</span>823f27f is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 823f27f35d14d54245b1f2ddb6f3b6fb2fa46b79
</span>Author: Allan Que <allan.que@gmail.com>
AuthorDate: Sat Jul 1 13:32:13 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> iperf3-devel: update to release 3.2
</span>---
net/iperf3/Portfile | 13 +++++-----
net/iperf3/files/patch-iperf_auth.c.diff | 11 +++++++++
...tch-iperf_util.diff => patch-iperf_util.c.diff} | 28 +++++++++-------------
net/iperf3/files/patch-iperf_util.h.diff | 25 +++++++++++++++++++
4 files changed, 54 insertions(+), 23 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/iperf3/Portfile b/net/iperf3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da37498..b00cff0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/iperf3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/iperf3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,15 +32,16 @@ post-destroot {
</span> }
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup esnet iperf 4f3a7a5403b61f49ab277d0756e87c651a45bdfe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20170620
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup esnet iperf 88d907f7fb58bfab5d086c5da60c922e1c582c92
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20170626
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 7a72ece6402ae52e2df464ad74af068bd00b4ea6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 591867e864deb355b8d67d39afce34a963e9ca6d3a12a29b93fc336edc29c666
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 3793eefb303ffebadbbe6ba2055683c1eca15374 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3098ae6787da9ba08dad6cb6329d3b6282f058711033ff7edbb6ad145cd6d088
</span>
depends_lib-append port:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-iperf_util.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-iperf_auth.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-iperf_util.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-iperf_util.c.diff
</span>
conflicts ${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/iperf3/files/patch-iperf_auth.c.diff b/net/iperf3/files/patch-iperf_auth.c.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..55769e9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/iperf3/files/patch-iperf_auth.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/iperf_auth.c 2017-07-01 12:29:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/iperf_auth.c 2017-07-01 14:22:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <termios.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "iperf_util.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(HAVE_SSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <openssl/bio.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/iperf3/files/patch-iperf_util.diff b/net/iperf3/files/patch-iperf_util.c.diff
</span>similarity index 75%
rename from net/iperf3/files/patch-iperf_util.diff
rename to net/iperf3/files/patch-iperf_util.c.diff
<span style='display:block; white-space:pre;color:#808080;'>index 5dcdb4d..4085ac2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/iperf3/files/patch-iperf_util.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/iperf3/files/patch-iperf_util.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/iperf_util.c 2017-06-20 17:04:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/iperf_util.c 2017-06-26 13:30:16.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -338,6 +338,75 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return features;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/iperf_util.c 2017-07-01 12:28:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/iperf_util.c 2017-07-01 13:23:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -432,3 +432,69 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(fp, "]\n");
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Fallback getline() for OSX <= 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++** https://lists.gnu.org/archive/html/bug-mailutils/2002-10/msg00038.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++** First implementation by Alain Magloire.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*/
</span> +#ifdef __APPLE__
+#include <Availability.h>
+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
+
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const int line_size = 128;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static ssize_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+getdelim (char **lineptr, size_t *n, int delim, FILE *stream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static ssize_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+getline (char **lineptr, size_t *n, FILE *stream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +static ssize_t
+getdelim (char **lineptr, size_t *n, int delim, FILE *stream)
+{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,7 +70,3 @@
</span> +}
+#endif
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Helper routine for building cJSON objects in a printf-like manner.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- **
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ** Sample call:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/iperf3/files/patch-iperf_util.h.diff b/net/iperf3/files/patch-iperf_util.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ed771c9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/iperf3/files/patch-iperf_util.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/iperf_util.h 2017-07-01 12:28:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/iperf_util.h 2017-07-01 13:25:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,3 +56,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void iperf_dump_fdset(FILE *fp, char *str, int nfds, fd_set *fds);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* Fallback getline() for OSX <= 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++** https://lists.gnu.org/archive/html/bug-mailutils/2002-10/msg00038.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++** First implementation by Alain Magloire.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++*/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static const int line_size = 128;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static ssize_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++getdelim (char **lineptr, size_t *n, int delim, FILE *stream);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static ssize_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++getline (char **lineptr, size_t *n, FILE *stream);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span></pre><pre style='margin:0'>
</pre>