diff --git a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk index 8890ce47e3..002a901a08 100644 --- a/packages/addons/addon-depends/network-tools-depends/iftop/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/iftop/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="iftop" -PKG_VERSION="1.0pre4" -PKG_SHA256="f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97" +PKG_VERSION="77901c8c53e01359d83b8090aacfe62214658183" +PKG_SHA256="f2728741f1bd2099d325271b4b2564a696dbce7c23401360ac6c9841cbda1108" PKG_LICENSE="GPL" -PKG_SITE="http://htop.sourceforge.net/" -PKG_URL="http://www.ex-parrot.com/pdw/iftop/download/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_SITE="http://www.ex-parrot.com/pdw/iftop/" +PKG_URL="https://code.blinkace.com/pdw/iftop/-/archive/$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain ncurses libpcap libnl" PKG_LONGDESC="A tool to display bandwidth usage on an interface." PKG_TOOLCHAIN="autotools" diff --git a/packages/addons/addon-depends/network-tools-depends/iftop/patches/iftop-variable-to-be-local-due-to-pcap-1-10-0.patch b/packages/addons/addon-depends/network-tools-depends/iftop/patches/iftop-variable-to-be-local-due-to-pcap-1-10-0.patch new file mode 100644 index 0000000000..976d7069ed --- /dev/null +++ b/packages/addons/addon-depends/network-tools-depends/iftop/patches/iftop-variable-to-be-local-due-to-pcap-1-10-0.patch @@ -0,0 +1,54 @@ +diff -Nuar iftop-77901c8c/iftop-dump.c iftop-pcap-1-10/iftop-dump.c +--- iftop-77901c8c/iftop-dump.c 2018-10-03 17:02:36.000000000 +0000 ++++ iftop-pcap-1-10/iftop-dump.c 2021-01-17 23:40:39.896124155 +0000 +@@ -64,7 +64,7 @@ + pthread_mutex_t tick_mutex; + + pcap_t* pd; /* pcap descriptor */ +-struct bpf_program pcap_filter; ++struct bpf_program my_pcap_filter; + pcap_handler packet_handler; + + FILE*fout = NULL; +@@ -375,12 +375,12 @@ + sprintf(x, "(%s) and ip", filter); + } else + x = xstrdup("ip"); +- if (pcap_compile(pd, &pcap_filter, x, 1, 0) == -1) { ++ if (pcap_compile(pd, &my_pcap_filter, x, 1, 0) == -1) { + xfree(x); + return pcap_geterr(pd); + } + xfree(x); +- if (pcap_setfilter(pd, &pcap_filter) == -1) ++ if (pcap_setfilter(pd, &my_pcap_filter) == -1) + return pcap_geterr(pd); + else + return NULL; +diff -Nuar iftop-77901c8c/iftop.c iftop-pcap-1-10/iftop.c +--- iftop-77901c8c/iftop.c 2018-10-03 17:02:36.000000000 +0000 ++++ iftop-pcap-1-10/iftop.c 2021-01-17 23:40:54.116240467 +0000 +@@ -74,7 +74,7 @@ + pthread_mutex_t tick_mutex; + + pcap_t* pd; /* pcap descriptor */ +-struct bpf_program pcap_filter; ++struct bpf_program my_pcap_filter; + pcap_handler packet_handler; + + sig_atomic_t foad; +@@ -679,12 +679,12 @@ + sprintf(x, "(%s) and (ip or ip6)", filter); + } else + x = xstrdup("ip or ip6"); +- if (pcap_compile(pd, &pcap_filter, x, 1, 0) == -1) { ++ if (pcap_compile(pd, &my_pcap_filter, x, 1, 0) == -1) { + xfree(x); + return pcap_geterr(pd); + } + xfree(x); +- if (pcap_setfilter(pd, &pcap_filter) == -1) ++ if (pcap_setfilter(pd, &my_pcap_filter) == -1) + return pcap_geterr(pd); + else + return NULL;