[csw-devel] SF.net SVN: gar:[16157] csw/mgar/pkg/iftop/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Thu Nov 10 15:11:07 CET 2011
Revision: 16157
http://gar.svn.sourceforge.net/gar/?rev=16157&view=rev
Author: dmichelsen
Date: 2011-11-10 14:11:06 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
iftop/trunk: Make preliminary update to 1.0pre2 as recompiled 0.17 still does not fix #4557
Modified Paths:
--------------
csw/mgar/pkg/iftop/trunk/Makefile
csw/mgar/pkg/iftop/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/iftop/trunk/files/0001-old-style-patch-patch-ui.c.patch
csw/mgar/pkg/iftop/trunk/files/0002-Omit-static-function-sigalrm.patch
csw/mgar/pkg/iftop/trunk/files/0003-Add-sys-sockio.h-to-have-SIOCGIFFLAGS.patch
csw/mgar/pkg/iftop/trunk/files/0004-Skip-the-parts-not-only-in-Linux-but-also-Solaris.patch
Removed Paths:
-------------
csw/mgar/pkg/iftop/trunk/files/patch-ui.c
Modified: csw/mgar/pkg/iftop/trunk/Makefile
===================================================================
--- csw/mgar/pkg/iftop/trunk/Makefile 2011-11-10 13:24:50 UTC (rev 16156)
+++ csw/mgar/pkg/iftop/trunk/Makefile 2011-11-10 14:11:06 UTC (rev 16157)
@@ -1,6 +1,6 @@
NAME = iftop
-VERSION = 0.17
-#VERSION = 1.0pre2
+#VERSION = 0.17
+VERSION = 1.0pre2
CATEGORIES = net
DESCRIPTION = Display bandwidth usage on an interface by host
@@ -13,16 +13,22 @@
MASTER_SITES = http://www.ex-parrot.com/~pdw/iftop/download/
DISTFILES += $(DISTNAME).tar.gz
-PATCHFILES += patch-ui.c
+PATCHFILES += 0001-old-style-patch-patch-ui.c.patch
+PATCHFILES += 0002-Omit-static-function-sigalrm.patch
+PATCHFILES += 0003-Add-sys-sockio.h-to-have-SIOCGIFFLAGS.patch
+PATCHFILES += 0004-Skip-the-parts-not-only-in-Linux-but-also-Solaris.patch
-RUNTIME_DEP_PKGS_CSWiftop += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWiftop += CSWlibncursesw5
RUNTIME_DEP_PKGS_CSWiftop += CSWlibpcap1
-CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-resolver=netdb_1thread
+# Because of use of anonymous unions, which are invalid in C (even C99), but valid in C++ with -features=extensions
+GARCOMPILER = GNU
EXTRA_LDFLAGS = -lpthread
-TEST_SCRIPTS =
+CONFIGURE_ARGS = $(DIRPATHS)
+# CONFIGURE_ARGS += --with-resolver=netdb_1thread
+# TEST_SCRIPTS =
+
include gar/category.mk
Modified: csw/mgar/pkg/iftop/trunk/checksums
===================================================================
--- csw/mgar/pkg/iftop/trunk/checksums 2011-11-10 13:24:50 UTC (rev 16156)
+++ csw/mgar/pkg/iftop/trunk/checksums 2011-11-10 14:11:06 UTC (rev 16157)
@@ -1 +1 @@
-062bc8fb3856580319857326e0b8752d iftop-0.17.tar.gz
+fef521a49ec0122458d02c64212af3c5 iftop-1.0pre2.tar.gz
Added: csw/mgar/pkg/iftop/trunk/files/0001-old-style-patch-patch-ui.c.patch
===================================================================
--- csw/mgar/pkg/iftop/trunk/files/0001-old-style-patch-patch-ui.c.patch (rev 0)
+++ csw/mgar/pkg/iftop/trunk/files/0001-old-style-patch-patch-ui.c.patch 2011-11-10 14:11:06 UTC (rev 16157)
@@ -0,0 +1,25 @@
+From 0599dd0264ba1312983b93e21fd19ecb39501802 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 10 Nov 2011 14:51:53 +0100
+Subject: [PATCH 1/4] old style patch: patch-ui.c
+
+---
+ ui.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/ui.c b/ui.c
+index 032d557..9c752d7 100644
+--- a/ui.c
++++ b/ui.c
+@@ -6,7 +6,7 @@
+ #include <sys/types.h>
+
+ #include <ctype.h>
+-#include <curses.h>
++#include <ncurses/curses.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <math.h>
+--
+1.7.6.1
+
Added: csw/mgar/pkg/iftop/trunk/files/0002-Omit-static-function-sigalrm.patch
===================================================================
--- csw/mgar/pkg/iftop/trunk/files/0002-Omit-static-function-sigalrm.patch (rev 0)
+++ csw/mgar/pkg/iftop/trunk/files/0002-Omit-static-function-sigalrm.patch 2011-11-10 14:11:06 UTC (rev 16157)
@@ -0,0 +1,23 @@
+From 24611fd8d5a36c98cc3a5f4df566a2ac5d5d72af Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 10 Nov 2011 15:03:56 +0100
+Subject: [PATCH 2/4] Omit static function sigalrm()
+
+---
+ dlcommon.h | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/dlcommon.h b/dlcommon.h
+index 0d1f35a..d390213 100644
+--- a/dlcommon.h
++++ b/dlcommon.h
+@@ -32,6 +32,5 @@
+ /*
+ * externs go here
+ */
+-extern void sigalrm();
+
+ #endif /* !DLCOMMON_H */
+--
+1.7.6.1
+
Added: csw/mgar/pkg/iftop/trunk/files/0003-Add-sys-sockio.h-to-have-SIOCGIFFLAGS.patch
===================================================================
--- csw/mgar/pkg/iftop/trunk/files/0003-Add-sys-sockio.h-to-have-SIOCGIFFLAGS.patch (rev 0)
+++ csw/mgar/pkg/iftop/trunk/files/0003-Add-sys-sockio.h-to-have-SIOCGIFFLAGS.patch 2011-11-10 14:11:06 UTC (rev 16157)
@@ -0,0 +1,24 @@
+From 2a706743f614c855268fb22e6d15f7d1848617ab Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 10 Nov 2011 15:04:46 +0100
+Subject: [PATCH 3/4] Add sys/sockio.h to have SIOCGIFFLAGS
+
+---
+ options.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/options.c b/options.c
+index ced4125..ffa7336 100644
+--- a/options.c
++++ b/options.c
+@@ -15,6 +15,7 @@
+
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <sys/sockio.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <net/if.h>
+--
+1.7.6.1
+
Added: csw/mgar/pkg/iftop/trunk/files/0004-Skip-the-parts-not-only-in-Linux-but-also-Solaris.patch
===================================================================
--- csw/mgar/pkg/iftop/trunk/files/0004-Skip-the-parts-not-only-in-Linux-but-also-Solaris.patch (rev 0)
+++ csw/mgar/pkg/iftop/trunk/files/0004-Skip-the-parts-not-only-in-Linux-but-also-Solaris.patch 2011-11-10 14:11:06 UTC (rev 16157)
@@ -0,0 +1,34 @@
+From 87089300bcca4638373875bb3cb0c45dfda3298a Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 10 Nov 2011 15:05:10 +0100
+Subject: [PATCH 4/4] Skip the parts not only in Linux, but also Solaris
+
+---
+ addrs_ioctl.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/addrs_ioctl.c b/addrs_ioctl.c
+index e86e2de..f80ba7e 100644
+--- a/addrs_ioctl.c
++++ b/addrs_ioctl.c
+@@ -19,7 +19,7 @@
+ #include <netinet/in.h>
+
+ #if defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
+- || ( defined __GNUC__ && ! defined __linux__ )
++ || ( defined __GNUC__ && ! defined __linux__ && ! defined __sun && ! defined __sun__)
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
+ #include <net/if_dl.h>
+@@ -81,7 +81,7 @@ get_addrs_ioctl(char *interface, char if_hw_addr[], struct in_addr *if_ip_addr,
+ }
+ #else
+ #if defined __FreeBSD__ || defined __OpenBSD__ || defined __APPLE__ \
+- || ( defined __GNUC__ && ! defined __linux__ )
++ || ( defined __GNUC__ && ! defined __linux__ && ! defined __sun && ! defined __sun__)
+ {
+ int sysctlparam[6] = {CTL_NET, PF_ROUTE, 0, 0, NET_RT_IFLIST, 0};
+ size_t needed = 0;
+--
+1.7.6.1
+
Deleted: csw/mgar/pkg/iftop/trunk/files/patch-ui.c
===================================================================
--- csw/mgar/pkg/iftop/trunk/files/patch-ui.c 2011-11-10 13:24:50 UTC (rev 16156)
+++ csw/mgar/pkg/iftop/trunk/files/patch-ui.c 2011-11-10 14:11:06 UTC (rev 16157)
@@ -1,11 +0,0 @@
---- iftop-0.17.orig/ui.c 2005-10-26 22:12:33.000000000 +0200
-+++ iftop-0.17/ui.c 2009-07-08 18:58:38.298151622 +0200
-@@ -6,7 +6,7 @@
- #include <sys/types.h>
-
- #include <ctype.h>
--#include <curses.h>
-+#include <ncurses/curses.h>
- #include <errno.h>
- #include <string.h>
- #include <math.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list