<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9f16bf6ca9a6fb6c2a5a43f11890fa45f6a2c0bc">https://github.com/macports/macports-ports/commit/9f16bf6ca9a6fb6c2a5a43f11890fa45f6a2c0bc</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 9f16bf6ca9a tcpflow: fix gcc build; tcpflow-devel: update to 20240919
</span>9f16bf6ca9a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9f16bf6ca9a6fb6c2a5a43f11890fa45f6a2c0bc
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Wed Dec 18 22:35:38 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> tcpflow: fix gcc build; tcpflow-devel: update to 20240919
</span>---
net/tcpflow/Portfile | 16 ++++++--
net/tcpflow/files/patch-configure.ac-devel.diff | 20 ++++++++++
net/tcpflow/files/patch-fix-includes.diff | 25 +++++++++++++
net/tcpflow/files/patch-fix-macOS-build.diff | 50 +++++++++++++++++++++++++
4 files changed, 108 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tcpflow/Portfile b/net/tcpflow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e153e337d4..89d49db085b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/tcpflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tcpflow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,8 +11,8 @@ revision 2
</span> conflicts ${name}-devel
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup simsong tcpflow 5ca444e3b872f10f927d5d3673a4c4caa412a23e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20230726
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup simsong tcpflow 467b380642e8e126d1ef5ddf30638deffb6fb2ad
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20240919
</span> revision 0
conflicts ${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,17 @@ post-fetch {
</span> system -W ${worksrcpath} "git submodule update --init"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "${name}"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-includes.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure.ac-devel.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-macOS-build.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tcpflow/files/patch-configure.ac-devel.diff b/net/tcpflow/files/patch-configure.ac-devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4e8ebdff55a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tcpflow/files/patch-configure.ac-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-12-18 18:09:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,17 +75,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test x"${mingw}" == "xno" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Bring additional directories where things might be found into our
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # search path. I don't know why autoconf doesn't do this by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for spfx in /usr/local /opt/local /sw /usr/local/ssl /usr/boost/include /usr/X11R6 ; do
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_NOTICE([checking ${spfx}/include])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test -d ${spfx}/include; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CPPFLAGS="-I${spfx}/include $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="-L${spfx}/lib $LDFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_NOTICE([ *** ADDING ${spfx}/include to CPPFLAGS *** ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_MSG_NOTICE([ *** ADDING ${spfx}/lib to LDFLAGS *** ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- done
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_NOTICE([ CPPFLAGS = ${CPPFLAGS} ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_NOTICE([ LDFLAGS = ${LDFLAGS} ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tcpflow/files/patch-fix-includes.diff b/net/tcpflow/files/patch-fix-includes.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..35a6f32ccb6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tcpflow/files/patch-fix-includes.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;'>+From b1479db14b1604e00d35c2d39566c54e8b1785d0 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sam James <sam@cmpct.info>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 15 Apr 2023 12:36:51 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix build with GCC 13 (#252)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GCC 13 (as usual for new compiler releases) shuffles around some internal includes and so etc is no longer transitively included.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See https://gnu.org/software/gcc/gcc-13/porting_to.html.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Bug: https://bugs.gentoo.org/895282
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/netviz/plot_view.h | 1 +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/netviz/plot_view.h b/src/netviz/plot_view.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 21be05cf..ba8b49e7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/netviz/plot_view.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/netviz/plot_view.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cairo/cairo-pdf.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 <cstdint>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <vector>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <math.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/tcpflow/files/patch-fix-macOS-build.diff b/net/tcpflow/files/patch-fix-macOS-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4520ece33d8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/tcpflow/files/patch-fix-macOS-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4ccd2c359c413100e23f24c31a72f52c1933b581 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: "Kirill A. Korinsky" <kirill@korins.ky>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 18 Dec 2024 14:28:25 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Improve detection of `struct bpf_timeval`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Not all system with `net/bpf.h` has `struct bpf_timeval`.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: https://github.com/simsong/tcpflow/issues/267
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ac | 13 +++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/tcpflow.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 14 insertions(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 09a362d..27934b8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -490,6 +490,19 @@ AC_CHECK_TYPES([sa_family_t], [], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ]]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_HEADERS([net/bpf.h])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_CHECK_TYPES([struct bpf_timeval], [], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++[[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_SYS_TYPES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <sys/types.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;'>++#ifdef HAVE_NET_BPF_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <net/bpf.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;'>++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ############## drop optimization flags if requested ################
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Should we disable optimization?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/tcpflow.h b/src/tcpflow.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 627e277..6d191ab 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/tcpflow.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/tcpflow.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -297,7 +297,7 @@ inline const timeval &tvshift(struct timeval &tv,const struct timeval &tv_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return tv;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if __has_include("net/bpf.h")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_STRUCT_BPF_TIMEVAL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline const timeval &tvshift(struct timeval &tv,const struct bpf_timeval &tv_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tv.tv_sec = tv_.tv_sec + datalink_tdelta;
</span></pre><pre style='margin:0'>
</pre>