<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bb5b4fe058e28335bfadcd0ed7e76944aec93369">https://github.com/macports/macports-ports/commit/bb5b4fe058e28335bfadcd0ed7e76944aec93369</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 bb5b4fe058e netperf: Fix implicit func decls and wrong code
</span>bb5b4fe058e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bb5b4fe058e28335bfadcd0ed7e76944aec93369
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jan 6 13:02:59 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> netperf: Fix implicit func decls and wrong code
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix implicit declaration of functions which caused build failure with
</span><span style='display:block; white-space:pre;color:#404040;'> Xcode 12 and later.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix invocation of mach_port_deallocate which was called with 1 argument
</span><span style='display:block; white-space:pre;color:#404040;'> but needs 2. I assume this change is correct but I don't know.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62219
</span>---
net/netperf/Portfile | 6 ++++--
net/netperf/files/implicit.patch | 21 +++++++++++++++++++++
net/netperf/files/mach.patch | 26 ++++++++++++++++++++++++++
3 files changed, 51 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netperf/Portfile b/net/netperf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 76b37999c36..b3f5342a3fe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/netperf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/netperf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup HewlettPackard netperf 2.7.0 netperf-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories net
license Noncommercial BSD BSD-old
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,9 @@ long_description Netperf is a benchmark that can be used to measure \
</span> homepage https://hewlettpackard.github.io/netperf/
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles 40c8a0fb873ac07a95f0c0253b2bd66109aa4c51.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 40c8a0fb873ac07a95f0c0253b2bd66109aa4c51.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mach.patch
</span>
# openmaintainer does not apply to the configure argument. Talk with me before touching them.
configure.args --enable-demo
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netperf/files/implicit.patch b/net/netperf/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f799b13e089
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/netperf/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+net_uuid.c:158:5: error: implicit declaration of function 'read' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+net_uuid.c:159:5: error: implicit declaration of function 'close' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Part of:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/HewlettPackard/netperf/commit/0b0cbbef75021134c83be0c3dd21878467e11144
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/net_uuid.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/net_uuid.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,6 +29,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fcntl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(HAVE_UNISTD_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</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;'>+ #if defined(HAVE_INTTYPES_H)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/netperf/files/mach.patch b/net/netperf/files/mach.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4587807908f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/netperf/files/mach.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+netcpu_osx.c:73:3: error: implicit declaration of function 'mach_port_deallocate' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+netcpu_osx.c:73:37: error: too few arguments to function call, expected 2, have 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/HewlettPackard/netperf/pull/67
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/netcpu_osx.c.orig 2015-07-20 12:39:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/netcpu_osx.c 2022-01-06 12:22:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SnowLeopard (10.6) happy, we hope it does not anger previous
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ versions */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <mach/mach_host.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/* #include <mach/mach_port.h> */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/mach_port.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "netsh.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "netlib.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cpu_util_terminate(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mach_port_deallocate(lib_host_port);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_port_deallocate(mach_task_self(), lib_host_port);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>