<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1215e1780369bf6c68ef24cbe31ee7ce9b02b48a">https://github.com/macports/macports-ports/commit/1215e1780369bf6c68ef24cbe31ee7ce9b02b48a</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 1215e178036 trafshow: Fix build; modernize checksums
</span>1215e178036 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1215e1780369bf6c68ef24cbe31ee7ce9b02b48a
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue May 11 19:34:09 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> trafshow: Fix build; modernize checksums
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix build with libpcap 1.10 and later by renaming local pcap_init
</span><span style='display:block; white-space:pre;color:#404040;'> function so that it does not conflict with libpcap's pcap_init function.
</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/62860
</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 in configure script.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Modernize checksums.
</span>---
net/trafshow/Portfile | 13 ++++++++-----
net/trafshow/files/implicit.patch | 11 +++++++++++
net/trafshow/files/libpcap-1.10.patch | 30 ++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/trafshow/Portfile b/net/trafshow/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ecd5729957b..be8cae746cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/trafshow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/trafshow/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,12 @@
</span> PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> name trafshow
version 5.2.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f1ae068f898160f16ae9b3cb5f9d73ae3aece6cb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ea7e22674a66afcc7174779d0f803c1f25b42271973b4f75fab293b8d7db11fc \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 142615
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories net
maintainers nomaintainer
description continuous network traffic display
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,15 +18,13 @@ long_description TrafShow continuously displays the information regarding \
</span> homepage http://soft.risp.ru/trafshow/index_en.shtml
platforms darwin
master_sites ftp://ftp.nsk.su/pub/RinetSoftware/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 0b2f0bb23b7832138b7d841437b9e182 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 1c68f603f12357e932c83de850366c9b46e53d89 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f1ae068f898160f16ae9b3cb5f9d73ae3aece6cb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_lib port:libtool \
port:libpcap \
port:ncurses
extract.suffix .tgz
patchfiles patch-domain_resolver.c patch-colormask.c patch-trafshow.c patch-trafshow.1 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-configure implicit.patch libpcap-1.10.patch
</span> build.target trafshow
fetch.user anonymous
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/trafshow/files/implicit.patch b/net/trafshow/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..062493e6bd1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/trafshow/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix implicit declaration of function.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2006-03-13 22:59:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-05-11 19:26:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3498,6 +3498,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if ((' ' & 0x0FF) == 0x020)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/trafshow/files/libpcap-1.10.patch b/net/trafshow/files/libpcap-1.10.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6ac9ff292db
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/trafshow/files/libpcap-1.10.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,30 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build with libpcap 1.10 and later, which has its own pcap_init function.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- trafshow.c.orig 2021-05-11 16:50:08.000000000 +0930
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ trafshow.c 2021-05-11 16:52:05.000000000 +0930
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void vers();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void usage();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static pcap_if_t *pcap_matchdev(pcap_if_t *dp, const char *name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static int pcap_init(PCAP_HANDLER **ph_list, pcap_if_t *dp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int pcap_doinit(PCAP_HANDLER **ph_list, pcap_if_t *dp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void *pcap_feed(void *arg); /* PCAP_HANDLER *ph */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_PCAP_GET_SELECTABLE_FD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void *pcap_feed2(void *arg); /* PCAP_HANDLER *ph */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -172,7 +172,7 @@
</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;'>+ /* initialize list of pcap handlers */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if ((op = pcap_init(&ph_list, dev_list)) < 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if ((op = pcap_doinit(&ph_list, dev_list)) < 1) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(stderr, "No packet capture device available (no permission?)\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -298,7 +298,7 @@
</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;'>+ static int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-pcap_init(ph_list, dp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++pcap_doinit(ph_list, dp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PCAP_HANDLER **ph_list;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcap_if_t *dp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span></pre><pre style='margin:0'>
</pre>