Update iftop from 0.17 to 1.0pre2 This is tested on alix2, includes ipv6 support, please test on other targets, I unceremoniously deleted the older patches without checking to see that they were integrated upstream.
Signed-of-by: Russell Senior <[email protected]> diff --git a/net/iftop/Makefile b/net/iftop/Makefile index 9bd0461..40e0aba 100644 --- a/net/iftop/Makefile +++ b/net/iftop/Makefile @@ -8,19 +8,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iftop -PKG_VERSION:=0.17 -PKG_RELEASE:=2 +PKG_VERSION:=1.0pre2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.ex-parrot.com/~pdw/iftop/download -PKG_MD5SUM:=062bc8fb3856580319857326e0b8752d +PKG_MD5SUM:=fef521a49ec0122458d02c64212af3c5 include $(INCLUDE_DIR)/package.mk define Package/iftop SECTION:=net CATEGORY:=Network - DEPENDS:=+libpcap +libncurses +libpthread + DEPENDS:=+libpcap +libncursesw +libpthread TITLE:=display bandwith usage on an interface URL:=http://www.ex-parrot.com/~pdw/iftop/ endef diff --git a/net/iftop/patches/001-debian_armeb.patch b/net/iftop/patches/001-debian_armeb.patch deleted file mode 100644 index 8abd92e..0000000 --- a/net/iftop/patches/001-debian_armeb.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ether.h -+++ b/ether.h -@@ -12,7 +12,7 @@ struct ether_header { - u_int8_t ether_dhost[ETHER_ADDR_LEN]; - u_int8_t ether_shost[ETHER_ADDR_LEN]; - u_int16_t ether_type; --}; -+} __attribute__((packed)); - - struct vlan_8021q_header { - u_int16_t priority_cfi_vid; diff --git a/net/iftop/patches/002-debian_frozen_order.patch b/net/iftop/patches/002-debian_frozen_order.patch deleted file mode 100644 index c622036..0000000 --- a/net/iftop/patches/002-debian_frozen_order.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/ui.c -+++ b/ui.c -@@ -446,6 +446,7 @@ void screen_hash_clear() { - hash_node_type* n = NULL; - while(hash_next_item(screen_hash, &n) == HASH_STATUS_OK) { - host_pair_line* hpl = (host_pair_line*)n->rec; -+ hpl->total_recv = hpl->total_sent = 0; - memset(hpl->recv, 0, sizeof(hpl->recv)); - memset(hpl->sent, 0, sizeof(hpl->sent)); - } diff --git a/net/iftop/patches/003-debian_arm.patch b/net/iftop/patches/003-debian_arm.patch deleted file mode 100644 index 090ea1c..0000000 --- a/net/iftop/patches/003-debian_arm.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/cfgfile.c -+++ b/cfgfile.c -@@ -45,9 +45,9 @@ stringmap config; - extern options_t options ; - - int is_cfgdirective_valid(const char *s) { -- char **t; -- for (t = config_directives; *t != NULL; ++t) -- if (strcmp(s, *t) == 0) return 1; -+ int t; -+ for (t = 0; config_directives[t] != NULL; t++) -+ if (strcmp(s, config_directives[t]) == 0) return 1; - return 0; - } - diff --git a/net/iftop/patches/004-debian_bar_display.patch b/net/iftop/patches/004-debian_bar_display.patch deleted file mode 100644 index 7efaa2b..0000000 --- a/net/iftop/patches/004-debian_bar_display.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/options.c -+++ b/options.c -@@ -302,7 +302,7 @@ void options_read_args(int argc, char ** - break; - - case 'b': -- config_set_string("show-bars", "true"); -+ config_set_string("show-bars", "false"); - break; - - case 'B': diff --git a/net/iftop/patches/005-debian_bar_bytes.patch b/net/iftop/patches/005-debian_bar_bytes.patch deleted file mode 100644 index b9ecc26..0000000 --- a/net/iftop/patches/005-debian_bar_bytes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ui.c -+++ b/ui.c -@@ -263,7 +263,7 @@ static void draw_bar_scale(int* y) { - char s[40], *p; - int x; - /* This 1024 vs 1000 stuff is just plain evil */ -- readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, 0); -+ readable_size(i, s, sizeof s, options.log_scale ? 1000 : 1024, options.bandwidth_in_bytes); - p = s + strspn(s, " "); - x = get_bar_length(i * 8); - mvaddch(*y + 1, x, ACS_BTEE); -- Russell Senior, President [email protected] _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
