[packages/trafshow] Rel 8

[arekm]

commit a263665756e99f6adbba5db0dd20a269b9476876
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Mar 9 15:31:34 2026 +0100

    Rel 8

 trafshow-gcc14.patch | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 trafshow.spec        |  5 ++++-
 2 files changed, 64 insertions(+), 1 deletion(-)
---
diff --git a/trafshow.spec b/trafshow.spec
index d45b22c..29644f0 100644
--- a/trafshow.spec
+++ b/trafshow.spec
@@ -2,12 +2,13 @@ Summary:	Network traffic monitoring utility
 Summary(pl.UTF-8):	Narzędzie do monitorowania ruchu w sieci
 Name:		trafshow
 Version:	5.2.3
-Release:	7
+Release:	8
 License:	Free copying + BSD license
 Group:		Networking/Utilities
 Source0:	ftp://ftp.nsk.su/pub/RinetSoftware/%{name}-%{version}.tgz
 # Source0-md5:	0b2f0bb23b7832138b7d841437b9e182
 Patch0:		%{name}-preprocessor.patch
+Patch1:		%{name}-gcc14.patch
 URL:		http://soft.risp.ru/trafshow/
 BuildRequires:	automake
 BuildRequires:	libpcap-devel
@@ -38,10 +39,12 @@ wybraną część ruchu.
 %prep
 %setup -q
 %patch -P0 -p1
+%patch -P1 -p1
 sed -i 's/static//' screen.c
 
 %build
 cp -f /usr/share/automake/config.sub .
+cp -f /usr/share/automake/config.guess .
 export LIBS="-ltinfo"
 %configure2_13
 %{__make}
diff --git a/trafshow-gcc14.patch b/trafshow-gcc14.patch
new file mode 100644
index 0000000..600de0b
--- /dev/null
+++ b/trafshow-gcc14.patch
@@ -0,0 +1,60 @@
+--- trafshow-5.2.3.orig/events.c	2004-03-01 10:48:44.000000000 +0100
++++ trafshow-5.2.3/events.c	2026-03-09 15:25:05.809693595 +0100
+@@ -143,7 +143,7 @@
+ 		if (!ep->func) continue;
+
+ 		if (timercmp(&gap, &ep->tv, >)) {
+-			void (*func)() = ep->func;
++			void (*func)(void *) = ep->func;
+ 			ep->func = 0;		/* free event slot before */
+
+ 			dprintf(("-call_event(%p/%p)", func, ep->arg));
+--- trafshow-5.2.3.orig/show_dump.c	2006-03-14 09:58:30.000000000 +0100
++++ trafshow-5.2.3/show_dump.c	2026-03-09 15:25:16.839693589 +0100
+@@ -49,7 +49,7 @@
+ const char *dump_file = 0;
+
+ static char *build_filter_expr(char *dst, int size, const NETSTAT *ns);
+-static void *live_pcap_dump();
++static void *live_pcap_dump(void *arg);
+ static void live_pcap_parse(u_char *a, const struct pcap_pkthdr *h, const u_char *p);
+ static void file_pcap_parse(u_char *a, const struct pcap_pkthdr *h, const u_char *p);
+ static void show_header_dump(PCAP_HANDLER *ph, const NETSTAT *ns);
+@@ -231,7 +231,7 @@
+ }
+
+ static void *
+-live_pcap_dump()
++live_pcap_dump(void *arg)
+ {
+ 	int op;
+
+--- trafshow-5.2.3.orig/trafshow.c	2006-03-14 08:58:07.000000000 +0100
++++ trafshow-5.2.3/trafshow.c	2026-03-09 15:25:09.503026927 +0100
+@@ -58,7 +58,7 @@
+ static void vers();
+ static void usage();
+ static pcap_if_t *pcap_matchdev(pcap_if_t *dp, const char *name);
+-static int pcap_init(PCAP_HANDLER **ph_list, pcap_if_t *dp);
++static int trafshow_pcap_init(PCAP_HANDLER **ph_list, pcap_if_t *dp);
+ static void *pcap_feed(void *arg); /* PCAP_HANDLER *ph */
+ #ifdef	HAVE_PCAP_GET_SELECTABLE_FD
+ static void *pcap_feed2(void *arg); /* PCAP_HANDLER *ph */
+@@ -172,7 +172,7 @@
+ 	}
+
+ 	/* initialize list of pcap handlers */
+-	if ((op = pcap_init(&ph_list, dev_list)) < 1) {
++	if ((op = trafshow_pcap_init(&ph_list, dev_list)) < 1) {
+ 		fprintf(stderr, "No packet capture device available (no permission?)\n");
+ 		exit(1);
+ 	}
+@@ -298,7 +298,7 @@
+ }
+
+ static int
+-pcap_init(ph_list, dp)
++trafshow_pcap_init(ph_list, dp)
+ 	PCAP_HANDLER **ph_list;
+ 	pcap_if_t *dp;
+ {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/trafshow.git/commitdiff/a263665756e99f6adbba5db0dd20a269b9476876