CVS commit: pkgsrc/net/iftop

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Mon Oct 22 14:58:14 UTC 2018

Modified Files:
        pkgsrc/net/iftop: distinfo
        pkgsrc/net/iftop/patches: patch-iftop.c
Added Files:
        pkgsrc/net/iftop/patches: patch-options.c

Log Message:
iftop: Fix build on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/iftop/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/iftop/patches/patch-iftop.c
cvs rdiff -u -r0 -r1.1 pkgsrc/net/iftop/patches/patch-options.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/iftop/distinfo
diff -u pkgsrc/net/iftop/distinfo:1.7 pkgsrc/net/iftop/distinfo:1.8
--- pkgsrc/net/iftop/distinfo:1.7       Mon Dec 11 10:44:16 2017
+++ pkgsrc/net/iftop/distinfo   Mon Oct 22 14:58:13 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2017/12/11 10:44:16 manu Exp $
+$NetBSD: distinfo,v 1.8 2018/10/22 14:58:13 jperkin Exp $
 
 SHA1 (iftop-1.0pre4.tar.gz) = 7f8e16ea26a0dee37ec9d1cbcef7b27692036572
 RMD160 (iftop-1.0pre4.tar.gz) = 10730f5deccbc090ed0d5b91de009a1af9e0c90d
@@ -6,5 +6,6 @@ SHA512 (iftop-1.0pre4.tar.gz) = abd74e80
 Size (iftop-1.0pre4.tar.gz) = 204665 bytes
 SHA1 (patch-addrs_ioctl.c) = 3b7907efd321409038217eb2476814b9adbb5114
 SHA1 (patch-dlcommon.h) = 787296f9d337a6b6a5ef080452cd14a3580a5fc3
-SHA1 (patch-iftop.c) = 1f840b7446b839443279b3f2fa52a060401cdc88
+SHA1 (patch-iftop.c) = 6a04a3876a9d8a478749cc3f3c1e6fc3f8d4220d
 SHA1 (patch-iftop.h) = 4a0760bc69e821e43d41da46ab44dfd35ddfb5dd
+SHA1 (patch-options.c) = f85a229a50d520bf74d2605f85d52c8f0c82014b

Index: pkgsrc/net/iftop/patches/patch-iftop.c
diff -u pkgsrc/net/iftop/patches/patch-iftop.c:1.1 pkgsrc/net/iftop/patches/patch-iftop.c:1.2
--- pkgsrc/net/iftop/patches/patch-iftop.c:1.1  Mon Dec 11 10:44:17 2017
+++ pkgsrc/net/iftop/patches/patch-iftop.c      Mon Oct 22 14:58:14 2018
@@ -1,9 +1,10 @@
-$NetBSD: patch-iftop.c,v 1.1 2017/12/11 10:44:17 manu Exp $
+$NetBSD: patch-iftop.c,v 1.2 2018/10/22 14:58:14 jperkin Exp $
 
---- 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 @@
-     }
+Support DLT_PPP_SERIAL.
+
+--- iftop.c.orig       2014-01-19 20:21:19.000000000 +0000
++++ iftop.c
+@@ -757,6 +757,12 @@ void packet_init() {
      else if(dlt == DLT_PPP) {
          packet_handler = handle_ppp_packet;
      }
@@ -16,4 +17,3 @@ $NetBSD: patch-iftop.c,v 1.1 2017/12/11 
  /* 
   * SLL support not available in older libpcaps
   */
- #ifdef DLT_LINUX_SLL

Added files:

Index: pkgsrc/net/iftop/patches/patch-options.c
diff -u /dev/null pkgsrc/net/iftop/patches/patch-options.c:1.1
--- /dev/null   Mon Oct 22 14:58:14 2018
+++ pkgsrc/net/iftop/patches/patch-options.c    Mon Oct 22 14:58:14 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-options.c,v 1.1 2018/10/22 14:58:14 jperkin Exp $
+
+SunOS needs sockio.h for SIOCGIFFLAGS.
+
+--- options.c.orig     2014-01-19 20:16:43.000000000 +0000
++++ options.c
+@@ -18,6 +18,9 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <net/if.h>
++#ifdef __sun
++#include <sys/sockio.h>
++#endif
+ 
+ #include "iftop.h"
+ #include "options.h"