summaryrefslogtreecommitdiff
path: root/net/iftop/patches
diff options
context:
space:
mode:
authormanu <manu@pkgsrc.org>2017-12-11 10:44:16 +0000
committermanu <manu@pkgsrc.org>2017-12-11 10:44:16 +0000
commita44908c4ed58e22a9dc12dcd7eefbe43cf3ffe89 (patch)
treebf97f942b1d4c199747007c24384b9f343a3e135 /net/iftop/patches
parent90c18e7293b1b1b06e518db8940d1947e73e73b1 (diff)
downloadpkgsrc-a44908c4ed58e22a9dc12dcd7eefbe43cf3ffe89.tar.gz
Update net/iftop to 1.0pre4
From Changelog: * Remove blinking cursor from UI Gerrit Renker <renker@ualberta.ca> * Treat multicast packets as incoming, rather than incoming (IPv4) or not at all (IPv6). Andreas Schwab <schwab@linux-m68k.org> * Minor fixes to the man page * Man page documentation of -t mode. * Compile time warning fixes. Markus Koschany <apo@gambaru.de> * Added text output mode (-t option) Roman Hoog Antink <rha@open.ch> (originally by Patrik Bless) * Fix for memory leak when DNS resolution is turned off http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=677141 Olivier Allard-Jacquin <olivieraj@free.fr> * Various typos in the UI Gerben Roest <g.roest@grepit.nl> * Documentation fixes A. Costa <agcosta@gis.net> (via Debian) * Fix for armeb specific bug Lennert Buytenhek <buytenh+debian@wantstofly.org> (via Debian) * Fix frozen order drives line totals crazy. Max Alekseyev <relf@os2.ru> (via Debian) * Fix for crash on arm. Joey Hess <joeyh@debian.org> (via Debian) * Fixed behaviour of "-b" option. Eric Cooper <ecc@cmu.edu> (via Debian) * Support for PFLOG Interfaces Richard Tóth <risko@iklub.sk> * Support for IPv6 * Fix for performance issue with address hashing * Fix for failing link address detection for GNU/kfreebsd * Multiple portability fixes Mats Erik Andersson <mats.andersson@gisladisker.se> * Improved behaviour of sort in sent/recv only mode Damián Viano <des@debian.org> * FreeBSD compilation fix * IPv6 reverse resolution Frédéric Perrin <frederic.perrin@resel.fr> * Improved IPv6 code (removed s6_addr32 dependency) * Fixed support for DLT_NULL Scott Bertilson <ssb@umn.edu> * Typo in usage message * Workaround for PuTTY issue (https://bugzilla.redhat.com/show_bug.cgi?id=546032) * Updates to licence text (change in FSF address) * Avoid an assertion failure if an "invalid" (as in outside of IPv4 or IPv6) address family is encountered (Red Hat bugs #839750, #847124, #868065, #961236 and #1007434) * enable building iftop with more recent versions of autoconf/automake * patch to remove compile time warnings * Fix to avoid system call in text mode wherever possible. Robert Scheck <robert@fedoraproject.org> * Attempt to detect if interface is actually up when doing autodetection. * Fixed segfault when selecting interfaces with empty MAC address (e.g. gprs interface on Nokia N900) Graham Inggs <graham@nerve.org.za> * Avoid autodetecting wmaster interfaces * Experimental support for IEEE802_11 radiotap interfaces (DLT 127) * Fixed segfault / hang when supplying multiple -i options * Added missing docs for -m option.
Diffstat (limited to 'net/iftop/patches')
-rw-r--r--net/iftop/patches/patch-addrs_ioctl.c25
-rw-r--r--net/iftop/patches/patch-iftop.c (renamed from net/iftop/patches/patch-aa)10
-rw-r--r--net/iftop/patches/patch-iftop.h16
3 files changed, 47 insertions, 4 deletions
diff --git a/net/iftop/patches/patch-addrs_ioctl.c b/net/iftop/patches/patch-addrs_ioctl.c
new file mode 100644
index 00000000000..2e75cfbc197
--- /dev/null
+++ b/net/iftop/patches/patch-addrs_ioctl.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-addrs_ioctl.c,v 1.1 2017/12/11 10:44:17 manu Exp $
+
+Enable BSD features for NetBSD
+From <Jean-Jacques.Puig@espci.fr>
+
+--- addrs_ioctl.c
++++ addrs_ioctl.c
+@@ -18,7 +18,7 @@
+ #include <net/if.h>
+ #include <netinet/in.h>
+
+-#if defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
++#if defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
+ || ( defined __GLIBC__ && ! defined __linux__ )
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+@@ -80,7 +80,7 @@ get_addrs_ioctl(char *interface, u_int8_t if_hw_addr[], struct in_addr *if_ip_ad
+ got_hw_addr = 1;
+ }
+ #else
+-#if defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
++#if defined __NetBSD__ || defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
+ || ( defined __GLIBC__ && ! defined __linux__ )
+ {
+ int sysctlparam[6] = {CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0};
diff --git a/net/iftop/patches/patch-aa b/net/iftop/patches/patch-iftop.c
index 3385b797f09..7e1e9eb3dd4 100644
--- a/net/iftop/patches/patch-aa
+++ b/net/iftop/patches/patch-iftop.c
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.1 2009/07/07 21:20:37 joerg Exp $
+$NetBSD: patch-iftop.c,v 1.1 2017/12/11 10:44:17 manu Exp $
---- iftop.c.orig 2009-07-05 17:30:23.000000000 +0200
-+++ iftop.c
-@@ -528,6 +528,12 @@ void packet_init() {
+--- iftop.c.orig 2014-01-19 21:21:19.000000000 +0100
++++ iftop.c 2017-12-11 11:22:55.000000000 +0100
+@@ -756,8 +756,14 @@
+ }
else if(dlt == DLT_PPP) {
packet_handler = handle_ppp_packet;
}
@@ -15,3 +16,4 @@ $NetBSD: patch-aa,v 1.1 2009/07/07 21:20:37 joerg Exp $
/*
* SLL support not available in older libpcaps
*/
+ #ifdef DLT_LINUX_SLL
diff --git a/net/iftop/patches/patch-iftop.h b/net/iftop/patches/patch-iftop.h
new file mode 100644
index 00000000000..3d77b872939
--- /dev/null
+++ b/net/iftop/patches/patch-iftop.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-iftop.h,v 1.1 2017/12/11 10:44:17 manu Exp $
+
+Enable BSD features for NetBSD
+From <Jean-Jacques.Puig@espci.fr>
+
+--- iftop.h
++++ iftop.h
+@@ -19,7 +19,7 @@
+ #if !defined s6_addr32 && defined __sun__
+ # define s6_addr32 _S6_un._S6_u32
+ #elif !defined s6_addr32 && \
+- ( defined __OpenBSD__ || defined __FreeBSD__ )
++ ( defined __OpenBSD__ || defined __FreeBSD__ || defined __NetBSD__ )
+ # define s6_addr32 __u6_addr.__u6_addr32
+ #endif /* !defined s6_addr32 */
+