<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f1ef2290e2b907832a39791047c38372f2bfdde4">https://github.com/macports/macports-ports/commit/f1ef2290e2b907832a39791047c38372f2bfdde4</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 f1ef229 iperf3-devel: fix missing getline()
</span>f1ef229 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f1ef2290e2b907832a39791047c38372f2bfdde4
</span>Author: Allan Que <allan.que@gmail.com>
AuthorDate: Sun Jul 2 01:20:43 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> iperf3-devel: fix missing getline()
</span>---
net/iperf3/Portfile | 5 +--
net/iperf3/files/patch-iperf_auth.c.diff | 11 -----
net/iperf3/files/patch-iperf_util.c.diff | 72 --------------------------------
net/iperf3/files/patch-iperf_util.h.diff | 25 -----------
4 files changed, 2 insertions(+), 111 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 b00cff0..35bea4c 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,16 +32,15 @@ post-destroot {
</span> }
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup snowleopard_fixes 1.0
</span> github.setup esnet iperf 88d907f7fb58bfab5d086c5da60c922e1c582c92
version 20170626
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
checksums rmd160 3793eefb303ffebadbbe6ba2055683c1eca15374 \
sha256 3098ae6787da9ba08dad6cb6329d3b6282f058711033ff7edbb6ad145cd6d088
depends_lib-append port:openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-iperf_auth.c.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-iperf_util.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 55769e9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/iperf3/files/patch-iperf_auth.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/iperf_auth.c 2017-07-01 12:29:07.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/iperf_auth.c 2017-07-01 14:22:54.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <termios.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "iperf_util.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(HAVE_SSL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <openssl/bio.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/iperf3/files/patch-iperf_util.c.diff b/net/iperf3/files/patch-iperf_util.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4085ac2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/iperf3/files/patch-iperf_util.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,72 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/iperf_util.c 2017-07-01 12:28:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/iperf_util.c 2017-07-01 13:23:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -432,3 +432,69 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(fp, "]\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Fallback getline() for OSX <= 10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+** https://lists.gnu.org/archive/html/bug-mailutils/2002-10/msg00038.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+** First implementation by Alain Magloire.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
</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;'>-+ int indx = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Sanity checks. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (lineptr == NULL || n == NULL || stream == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Allocate the line the first time. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*lineptr == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *lineptr = malloc (line_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*lineptr == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *n = line_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Clear the line. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memset (*lineptr, '\0', *n);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ while ((c = getc (stream)) != EOF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Check if more memory is needed. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (indx >= *n)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *lineptr = realloc (*lineptr, *n + line_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (*lineptr == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Clear the rest of the line. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ memset(*lineptr + *n, '\0', line_size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *n += line_size;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Push the result in the line. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (*lineptr)[indx++] = c;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Bail out. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (c == delim)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return (c == EOF) ? -1 : indx;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return getdelim (lineptr, n, '\n', stream);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ed771c9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/iperf3/files/patch-iperf_util.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/iperf_util.h 2017-07-01 12:28:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/iperf_util.h 2017-07-01 13:25:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,3 +56,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void iperf_dump_fdset(FILE *fp, char *str, int nfds, fd_set *fds);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Fallback getline() for OSX <= 10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+** https://lists.gnu.org/archive/html/bug-mailutils/2002-10/msg00038.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+** First implementation by Alain Magloire.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <Availability.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if __MAC_OS_X_VERSION_MIN_REQUIRED <= 1060
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><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;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span></pre><pre style='margin:0'>
</pre>