<pre style='margin:0'>
ghosthound pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3fc0e042540c4a9db088fbb84f4ab292eafe3c0d">https://github.com/macports/macports-ports/commit/3fc0e042540c4a9db088fbb84f4ab292eafe3c0d</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 3fc0e042540 wireshark3: update port to select 3.4.1 for older macOS releases, and add patch for clock_realtime build errors on those (#9744)
</span>3fc0e042540 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3fc0e042540c4a9db088fbb84f4ab292eafe3c0d
</span>Author: Christopher Nielsen <62156882+mascguy@users.noreply.github.com>
AuthorDate: Mon Jan 18 13:46:30 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> wireshark3: update port to select 3.4.1 for older macOS releases, and add patch for clock_realtime build errors on those (#9744)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/61511
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-authored-by: Christopher Nielsen <mascguy@github.com>
</span>---
net/wireshark3/Portfile | 41 ++++++++++++++++++----
.../patch-wireshark3-3.4.1-fix-clock_realtime.diff | 30 ++++++++++++++++
2 files changed, 64 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark3/Portfile b/net/wireshark3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 20b8e1ea94d..1016b5152d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wireshark3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,6 @@ PortSystem 1.0
</span> PortGroup cmake 1.0
name wireshark3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span> categories net
license {GPL-2 GPL-3}
maintainers {darkart.com:opendarwin.org @ghosthound}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,6 +16,40 @@ long_description A network analyzer that lets you capture and \
</span> Packet data can be read from a file, or live from a local \
network interface.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Include patch for CLOCK_REALTIME build errors, on macOS releases prior to 10.12.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# While a fix has been included in upstream 3.4.2, that release also requires
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# QT59... and is a no-go for these older macOS releases.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# So for now, we're stuck with 3.4.1, for users running macOS 10.11 and earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MacPorts issue, with all of the juicy details:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/61511
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# GitHub issue:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.com/wireshark/wireshark/-/issues/17101
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream fix committed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.com/wireshark/wireshark/-/merge_requests/1404
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.4.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums sha256 de9868729e426a469baabd8d444240d84fa5445020e92c842dd19afd0d47a4c4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 53a02106b0f23e50b1108d93772464974b2b37be \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 b33276e4e6c3d6a057da3b569b58316330a5f3e3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32465900
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.4.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums sha256 f8165211f5b4a4f6708df73ef9be51df917927f2da78348b32d3a6eb5fc458a3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1b5e1fee340c149b70dbe8e8cf935518b06656e8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 3c9a24b8954d712a189f997131e283fbd0b606bc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32470004
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-wireshark3-3.4.1-fix-clock_realtime.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> master_sites https://www.wireshark.org/download/src/ \
https://www.wireshark.org/download/src/all-versions/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,11 +59,6 @@ distfiles wireshark-${version}${extract.suffix}
</span>
worksrcdir wireshark-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 de9868729e426a469baabd8d444240d84fa5445020e92c842dd19afd0d47a4c4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 53a02106b0f23e50b1108d93772464974b2b37be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 b33276e4e6c3d6a057da3b569b58316330a5f3e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 32465900
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> conflicts wireshark-devel wireshark wireshark2 wireshark22 wireshark24 wireshark30
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark3/files/patch-wireshark3-3.4.1-fix-clock_realtime.diff b/net/wireshark3/files/patch-wireshark3-3.4.1-fix-clock_realtime.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..dcdcda7851b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark3/files/patch-wireshark3-3.4.1-fix-clock_realtime.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ui/qt/import_text_dialog.cpp 2020-12-20 11:02:56.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ui/qt/import_text_dialog.cpp 2020-12-15 16:53:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,6 +11,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <time.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __MACH__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/clock.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach/mach.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;'>+ #include "import_text_dialog.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "wiretap/wtap.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -384,6 +389,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ timespec_get(&timenow, TIME_UTC); /* supported by Linux and Windows */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__MACH__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // OS X does not have clock_gettime, use clock_get_time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ clock_serv_t cclock;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_timespec_t mts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ clock_get_time(cclock, &mts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mach_port_deallocate(mach_task_self(), cclock);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ timenow.tv_sec = mts.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ timenow.tv_nsec = mts.tv_nsec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clock_gettime(CLOCK_REALTIME, &timenow); /* supported by Linux and MacOS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>