Merge pull request #2606 from CvH/9.0-ngrep

network-tools update

packages/addons/addon-depends/network-tools-depends/iperf/package.mk

@@ -17,20 +17,21 @@
 ################################################################################
 
 PKG_NAME="iperf"
-PKG_VERSION="3.1.2"
+PKG_VERSION="3.5"
-PKG_SHA256="48b5c783bb4a9c44f2bdcfe52c5d45b77ab1e1c82de3d0131f692457950811f9"
+PKG_SHA256="4c318707a29d46d7b64e517a4fe5e5e75e698aef030c6906e9b26dc51d9b1fce"
 PKG_ARCH="any"
-PKG_LICENSE="OSS"
+PKG_LICENSE="BSD"
-PKG_SITE="https://iperf.fr/"
+PKG_SITE="http://software.es.net/iperf/"
-PKG_URL="https://iperf.fr/download/source/$PKG_NAME-$PKG_VERSION-source.tar.gz"
+PKG_URL="https://github.com/esnet/iperf/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="toolchain openssl"
 PKG_SECTION="network/testing"
 PKG_SHORTDESC="iperf: A modern alternative for measuring maximum TCP and UDP bandwidth performance"
-PKG_LONGDESC="Iperf was developed by NLANR/DAST as a modern alternative for measuring maximum TCP and UDP bandwidth performance. Iperf allows the tuning of various parameters and UDP characteristics. Iperf reports bandwidth, delay jitter, datagram loss."
+PKG_LONGDESC="Iperf was developed by NLANR/DAST as a modern alternative for measuring maximum TCP and UDP bandwidth performance."
 PKG_TOOLCHAIN="autotools"
 
-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared"
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/addon-depends/network-tools-depends/irssi/package.mk

@@ -17,27 +17,24 @@
 ################################################################################
 
 PKG_NAME="irssi"
-PKG_VERSION="0.8.19"
+PKG_VERSION="1.1.1"
-PKG_SHA256="fe4f4b778698de8e1c319b9cd9b9ed5534f0ece7ac2bfa0af351a3157c6ec85b"
+PKG_SHA256="784807e7a1ba25212347f03e4287cff9d0659f076edfb2c6b20928021d75a1bf"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.irssi.org/"
-PKG_URL="https://github.com/irssi-import/irssi/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/irssi/irssi/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain glib ncurses openssl"
 PKG_SECTION="tools"
 PKG_SHORTDESC="IRC client"
 PKG_LONGDESC="Irssi is a terminal based IRC client for UNIX systems"
 
 PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \
-        --enable-ssl \
         --disable-glibtest \
         --without-socks \
         --with-textui \
         --without-bot \
         --without-proxy \
-        --with-gc \
+        --without-perl"
-        --without-perl \
-        --without-sco"
 
 pre_configure_target() {
   export CFLAGS="$CFLAGS -I$PKG_BUILD"

packages/addons/addon-depends/network-tools-depends/iw/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="iw"
-PKG_VERSION="4.3"
+PKG_VERSION="4.14"
-PKG_SHA256="a6add81a51667649d8d7cfba783ab6a0f82e250a663a4065b13babdff3f6b220"
+PKG_SHA256="f01671c0074bfdec082a884057edba1b9efd35c89eda554638496f03b769ad89"
 PKG_ARCH="any"
 PKG_LICENSE="PUBLIC_DOMAIN"
 PKG_SITE="http://wireless.kernel.org/en/users/Documentation/iw"

packages/addons/addon-depends/network-tools-depends/lftp/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="lftp"
-PKG_VERSION="4.7.4"
+PKG_VERSION="4.8.3"
-PKG_SHA256="8f55c37cfdfbce24a9cb47b621ca127f40d3a7de5b4c49f8c49f17bff728fb31"
+PKG_SHA256="de7aee451afaa1aa391f7076b5f602922c2da0e05524a8d8fea413eda83cc78b"
 PKG_ARCH="any"
-PKG_LICENSE="GPL"
+PKG_LICENSE="GPLv3"
 PKG_SITE="http://lftp.yar.ru/"
-PKG_URL="http://lftp.yar.ru/ftp/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_URL="http://lftp.yar.ru/ftp/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="toolchain readline openssl zlib"
 PKG_SECTION="tools"
 PKG_SHORTDESC="ftp client"
@@ -35,5 +35,5 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-nls \
                            --with-zlib=$SYSROOT_PREFIX/usr"
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/addon-depends/network-tools-depends/ncftp/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="ncftp"
-PKG_VERSION="3.2.5"
+PKG_VERSION="3.2.6"
-PKG_SHA256="b4ebe2415761a5137cd1d313c8fc1352f26d8963cc9e9e354e29720aa2089d42"
+PKG_SHA256="5f200687c05d0807690d9fb770327b226f02dd86155b49e750853fce4e31098d"
 PKG_ARCH="any"
-PKG_LICENSE="GPL"
+PKG_LICENSE="GPLv3"
 PKG_SITE="http://www.ncftp.com/ncftp/"
-PKG_URL="ftp://ftp.ncftp.com/ncftp/ncftp-${PKG_VERSION}-src.tar.bz2"
+PKG_URL="ftp://ftp.ncftp.com/ncftp/ncftp-${PKG_VERSION}-src.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
 PKG_SHORTDESC="NcFTP Client (also known as just NcFTP) is a set of FREE application programs implementing the File Transfer Protocol (FTP)."
@@ -44,5 +44,5 @@ pre_build_target() {
 }
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/addon-depends/network-tools-depends/ngrep/package.mk

@@ -17,19 +17,21 @@
 ################################################################################
 
 PKG_NAME="ngrep"
-PKG_VERSION="1.45"
+PKG_VERSION="9b5946"
-PKG_SHA256="aea6dd337da8781847c75b3b5b876e4de9c58520e0d77310679a979fc6402fa7"
+PKG_SHA256="db3ea041ad490a90d38ce4623ad9f3e7c9798734bdcaf900d3cf319fce16aa81"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://ngrep.sourceforge.net/"
+PKG_SITE="https://github.com/jpr5/ngrep"
-PKG_URL="http://prdownloads.sourceforge.net/ngrep/ngrep-${PKG_VERSION}.tar.bz2"
+PKG_URL="https://github.com/jpr5/ngrep/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libpcap"
 PKG_SECTION="network/analyzer"
 PKG_SHORTDESC="ngrep - network grep"
-PKG_LONGDESC="ngrep - network grep"
+PKG_LONGDESC="ngrep is like GNU grep applied to the network layer"
-PKG_DISCLAIMER="this is an unofficial addon. please don't ask for support in openelec forum / irc channel"
+PKG_TOOLCHAIN="autotools"
 
-PKG_CONFIGURE_OPTS_TARGET="--with-pcap-includes=$SYSROOT_PREFIX/usr/include --disable-dropprivs"
+PKG_CONFIGURE_OPTS_TARGET="--with-pcap-includes=$SYSROOT_PREFIX/usr/include \
+                           --enable-ipv6 \
+                           --disable-dropprivs"
 
 pre_build_target() {
   mkdir -p $PKG_BUILD/.$TARGET_NAME
@@ -37,5 +39,5 @@ pre_build_target() {
 }
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/addon-depends/network-tools-depends/nmap/package.mk

@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="nmap"
-PKG_VERSION="7.11"
+PKG_VERSION="7.70"
-PKG_SHA256="dfc95db3a8ee4c56650dbaa5a1a1e989b2963de8faea2531c21e6fd6e0bccc2a"
+PKG_SHA256="847b068955f792f4cc247593aca6dc3dc4aae12976169873247488de147a6e18"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://nmap.org/"
-PKG_URL="http://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tgz"
+PKG_URL="http://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
 PKG_SHORTDESC="network tool"
@@ -45,5 +45,5 @@ pre_configure_target() {
 }
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/addon-depends/network-tools-depends/rsync/package.mk

@@ -17,21 +17,21 @@
 ################################################################################
 
 PKG_NAME="rsync"
-PKG_VERSION="3.1.2"
+PKG_VERSION="3.1.3"
-PKG_SHA256="ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2"
+PKG_SHA256="55cc554efec5fdaad70de921cd5a5eeb6c29a95524c715f3bbf849235b0800c0"
 PKG_ARCH="any"
-PKG_LICENSE="OSS"
+PKG_LICENSE="GPLv3"
 PKG_SITE="http://www.samba.org/ftp/rsync/rsync.html"
 PKG_URL="https://download.samba.org/pub/rsync/src/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="network/backup"
 PKG_SHORTDESC="rsync: A replacement for rcp that has many more features"
-PKG_LONGDESC="Rsync uses an own 'rsync' algorithm which provides a very fast method for bringing remote files into sync. It does this by sending just the differences in the files across the link, without requiring that both sets of files are present at one of the ends of the link beforehand. At first glance this may seem impossible because the calculation of diffs between two files normally requires local access to both files."
+PKG_LONGDESC="Rsync uses an own 'rsync' algorithm which provides a very fast method for bringing remote files into sync."
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-acl-support \
-            --disable-xattr-support \
+                           --disable-xattr-support \
-            --with-included-popt"
+                           --with-included-popt"
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/addon-depends/network-tools-depends/sshfs/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="sshfs"
-PKG_VERSION="2.7"
+PKG_VERSION="2.10"
-PKG_SHA256="ce5f9d390934fc88c287dd937a39d15c2b40cbea6967ba24ad93ed90e0027128"
+PKG_SHA256="70845dde2d70606aa207db5edfe878e266f9c193f1956dd10ba1b7e9a3c8d101"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/libfuse/sshfs"
@@ -26,8 +26,8 @@ PKG_URL="https://github.com/libfuse/sshfs/releases/download/sshfs-$PKG_VERSION/s
 PKG_DEPENDS_TARGET="toolchain fuse glib"
 PKG_SECTION="tools"
 PKG_SHORTDESC="sshfs: a filesystem client based on the SSH File Transfer Protocol"
-PKG_LONGDESC="This is a filesystem client based on the SSH File Transfer Protocol. Since most SSH servers already support this protocol it is very easy to set up: i.e. on the server side there's nothing to do.  On the client side mounting the filesystem is as easy as logging into the server with ssh."
+PKG_LONGDESC="This is a filesystem client based on the SSH File Transfer Protocol."
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk

@@ -17,17 +17,17 @@
 ################################################################################
 
 PKG_NAME="tcpdump"
-PKG_VERSION="4.7.4"
+PKG_VERSION="4.9.2"
-PKG_SHA256="6be520269a89036f99c0b2126713a60965953eab921002b07608ccfc0c47d9af"
+PKG_SHA256="798b3536a29832ce0cbb07fafb1ce5097c95e308a6f592d14052e1ef1505fe79"
 PKG_ARCH="any"
 PKG_SITE="http://www.tcpdump.org/"
 PKG_URL="http://www.tcpdump.org/release/tcpdump-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libpcap"
 PKG_SECTION="network/analyzer"
 PKG_SHORTDESC="powerful tool for network monitoring and data acquisition"
-PKG_LONGDESC="This program allows you to dump the traffic on a network. tcpdump is able to examine IPv4, ICMPv4, IPv6, ICMPv6, UDP, TCP, SNMP, AFS BGP, RIP, PIM, DVMRP, IGMP, SMB, OSPF, NFS and many other packet types."
+PKG_LONGDESC="This program allows you to dump the traffic on a network."
 
-PKG_CONFIGURE_OPTS_TARGET="--with-pcap=linux --with-crypto=no --disable-ipv6"
+PKG_CONFIGURE_OPTS_TARGET="--with-crypto=no"
 
 pre_configure_target() {
   # When cross-compiling, configure can't set linux version
@@ -41,5 +41,5 @@ pre_build_target() {
 }
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/addon-depends/network-tools-depends/udpxy/package.mk

@@ -17,24 +17,17 @@
 ################################################################################
 
 PKG_NAME="udpxy"
-PKG_VERSION="1.0.23-9"
+PKG_VERSION="1.0.23-12"
-PKG_SHA256="6ce33b1d14a1aeab4bd2566aca112e41943df4d002a7678d9a715108e6b714bd"
+PKG_SHA256="16bdc8fb22f7659e0427e53567dc3e56900339da261199b3d00104d699f7e94c"
 PKG_ARCH="any"
-PKG_LICENSE="GPL"
+PKG_LICENSE="GPLv3"
-PKG_SITE="http://www.udpxy.com/download-en.html"
+PKG_SITE="http://www.udpxy.com"
 PKG_URL="http://www.udpxy.com/download/1_23/${PKG_NAME}.${PKG_VERSION}-prod.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
 PKG_SHORTDESC="udpxy is a UDP-to-HTTP multicast traffic relay daemon"
 PKG_LONGDESC="udpxy is a UDP-to-HTTP multicast traffic relay daemon"
-PKG_DISCLAIMER="this is an unofficial addon. please don't ask for support in openelec forum / irc channel"
-# fails to build with gcc 4.9 + lto
-PKG_BUILD_FLAGS="-lto"
-
-pre_configure_target() {
-  CFLAGS="$CFLAGS -Wno-error=unused-const-variable"
-}
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/addon-depends/network-tools-depends/wireless_tools/package.mk

@@ -17,25 +17,23 @@
 ################################################################################
 
 PKG_NAME="wireless_tools"
-PKG_VERSION="29"
+PKG_VERSION="30.pre9"
-PKG_SHA256="6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1"
+PKG_SHA256="abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
+PKG_SITE="https://github.com/HewlettPackard/wireless-tools"
-PKG_URL="http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/$PKG_NAME.$PKG_VERSION.tar.gz"
+PKG_URL="https://hewlettpackard.github.io/wireless-tools/$PKG_NAME.$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="${PKG_NAME}.${PKG_VERSION}"
+PKG_SOURCE_DIR="${PKG_NAME}.*"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="debug/tools"
 PKG_SHORTDESC="wireless-tools: tools allowing to manipulate the Wireless Extensions"
-PKG_LONGDESC="The Wireless Tools (WT) is a set of tools allowing to manipulate the Wireless Extensions. They use a textual interface and are rather crude, but aim to support the full Wireless Extension. There are many other tools you can use with Wireless Extensions, however Wireless Tools is the reference implementation."
+PKG_LONGDESC="The Wireless Tools (WT) is a set of tools allowing to manipulate the Wireless Extensions."
-# wireless_tools fails to build on some systems with LTO enabled
-PKG_BUILD_FLAGS="-lto"
 
 make_target() {
   make PREFIX=/usr CC="$CC" AR="$AR" \
-     CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" iwmulticall
+    CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" iwmulticall
 }
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/tools/network-tools/changelog.txt

@@ -1,2 +1,19 @@
-8.0.100
+102
+- updated iperf to 3.5
+- updated irssi to 1.1.1
+- updated iw to 4.14
+- updated lftp to 4.8.3
+- updated ncftp to 3.2.6
+- updated ngrep to latest
+- updated nmap to 7.70
+- updated rsync to 3.1.3
+- updated sshfs to 2.10
+- updated tcpdump to 4.9.2
+- updated udpxy to 1.0.23-12
+- updated wireless_tools to 30.pre9
+
+101
+- rebuild
+
+100
 - Initial Release

packages/addons/tools/network-tools/package.mk

@@ -17,11 +17,11 @@
 ################################################################################
 
 PKG_NAME="network-tools"
-PKG_VERSION=""
+PKG_VERSION="1.0"
-PKG_REV="101"
+PKG_REV="102"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE=""
+PKG_SITE="https://libreelec.tv"
 PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="virtual"
@@ -31,8 +31,6 @@ PKG_LONGDESC="This bundle currently includes bwm-ng, iftop, iperf, irssi, iw, lf
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Network Tools"
 PKG_ADDON_TYPE="xbmc.python.script"
-PKG_ADDON_PROVIDES=""
-
 
 PKG_DEPENDS_TARGET="toolchain \
                     bwm-ng \

packages/addons/tools/network-tools/source/default.py

@@ -1,6 +1,6 @@
 ################################################################################
 #      This file is part of LibreELEC - https://libreelec.tv
-#      Copyright (C) 2016 Team LibreELEC
+#      Copyright (C) 2016-present Team LibreELEC
 #
 #  LibreELEC is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by