diff --git a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk index 2fd4a0a5f8..b23893990a 100644 --- a/packages/addons/addon-depends/network-tools-depends/iperf/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/iperf/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="iperf" -PKG_VERSION="3.5" -PKG_SHA256="4c318707a29d46d7b64e517a4fe5e5e75e698aef030c6906e9b26dc51d9b1fce" +PKG_VERSION="3.6" +PKG_SHA256="1ad23f70a8eb4b892a3cbb247cafa956e0f5c7d8b8601b1d9c8031c2a806f23f" PKG_LICENSE="BSD" PKG_SITE="http://software.es.net/iperf/" PKG_URL="https://github.com/esnet/iperf/archive/$PKG_VERSION.tar.gz" diff --git a/packages/addons/addon-depends/network-tools-depends/irssi/package.mk b/packages/addons/addon-depends/network-tools-depends/irssi/package.mk index 3361d7e49c..8b821e4085 100644 --- a/packages/addons/addon-depends/network-tools-depends/irssi/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/irssi/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="irssi" -PKG_VERSION="1.1.1" -PKG_SHA256="784807e7a1ba25212347f03e4287cff9d0659f076edfb2c6b20928021d75a1bf" +PKG_VERSION="1.1.2" +PKG_SHA256="5ccc2b89a394e91bea0aa83a951c3b1d471c76da87b4169ec435530a31bf9732" PKG_LICENSE="GPL" PKG_SITE="http://www.irssi.org/" PKG_URL="https://github.com/irssi/irssi/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" @@ -23,5 +23,5 @@ pre_configure_target() { } makeinstall_target() { - : # nop + : } diff --git a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk index 1dd68f6a6a..333cc86c63 100644 --- a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="lftp" -PKG_VERSION="4.8.3" -PKG_SHA256="de7aee451afaa1aa391f7076b5f602922c2da0e05524a8d8fea413eda83cc78b" +PKG_VERSION="4.8.4" +PKG_SHA256="4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62" PKG_LICENSE="GPLv3" PKG_SITE="http://lftp.yar.ru/" PKG_URL="http://lftp.yar.ru/ftp/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk index 60884ede58..23f98f8230 100644 --- a/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/ngrep/package.mk @@ -2,7 +2,7 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ngrep" -PKG_VERSION="9b5946" +PKG_VERSION="9b5946822a5c9c617d937245fdc9049c5740ae09" PKG_SHA256="db3ea041ad490a90d38ce4623ad9f3e7c9798734bdcaf900d3cf319fce16aa81" PKG_LICENSE="GPL" PKG_SITE="https://github.com/jpr5/ngrep" diff --git a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk new file mode 100644 index 0000000000..4a45e751d1 --- /dev/null +++ b/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="rar2fs" +PKG_VERSION="1.27.1" +PKG_SHA256="f7e84b813fe82c6a886313e13a85d4f0d229b21f343a3ce6f73325a4ac90cb5a" +PKG_LICENSE="GPL3" +PKG_SITE="https://github.com/hasse69/rar2fs" +PKG_URL="https://github.com/hasse69/rar2fs/releases/download/v$PKG_VERSION/rar2fs-$PKG_VERSION.tar.gz" +PKG_DEPENDS_TARGET="toolchain unrar" +PKG_LONGDESC="FUSE file system for reading RAR archives" + +PKG_CONFIGURE_OPTS_TARGET="--with-unrar=$(get_build_dir unrar) \ + --with-unrar-lib=$(get_build_dir unrar) \ + --disable-static-unrar" + +makeinstall_target() { + : +} diff --git a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk index bbc50b40a8..47b9eb6b7c 100644 --- a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk @@ -18,5 +18,17 @@ make_target() { RANLIB="$RANLIB" \ AR="$AR" \ STRIP="$STRIP" \ - -f makefile + -f makefile unrar + + make clean + + make CXX="$CXX" \ + CXXFLAGS="$TARGET_CXXFLAGS" \ + RANLIB="$RANLIB" \ + AR="$AR" \ + -f makefile lib +} + +post_make_target() { + rm -f libunrar.so } diff --git a/packages/addons/tools/network-tools/changelog.txt b/packages/addons/tools/network-tools/changelog.txt index 84ed756a6e..b50fd4f032 100644 --- a/packages/addons/tools/network-tools/changelog.txt +++ b/packages/addons/tools/network-tools/changelog.txt @@ -1,3 +1,9 @@ +103 +- added rar2fs +- updated iperf to 3.6 +- updated irssi to 1.1.2 +- updated lftp to 4.8.4 + 102 - updated iperf to 3.5 - updated irssi to 1.1.1 diff --git a/packages/addons/tools/network-tools/package.mk b/packages/addons/tools/network-tools/package.mk index 0ce3566482..a0aa5482e7 100644 --- a/packages/addons/tools/network-tools/package.mk +++ b/packages/addons/tools/network-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="network-tools" PKG_VERSION="1.0" -PKG_REV="102" +PKG_REV="103" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" @@ -11,7 +11,7 @@ PKG_URL="" PKG_DEPENDS_TARGET="toolchain" PKG_SECTION="virtual" PKG_SHORTDESC="A bundle of network tools and programs" -PKG_LONGDESC="This bundle currently includes bwm-ng, iftop, iperf, irssi, iw, lftp, ncftp, ngrep, nmap, rsync, sshfs, tcpdump, udpxy and wireless_tools." +PKG_LONGDESC="This bundle currently includes bwm-ng, iftop, iperf, irssi, iw, lftp, ncftp, ngrep, nmap, rar2fs, rsync, sshfs, tcpdump, udpxy and wireless_tools." PKG_IS_ADDON="yes" PKG_ADDON_NAME="Network Tools" @@ -27,6 +27,7 @@ PKG_DEPENDS_TARGET="toolchain \ ncftp \ ngrep \ nmap \ + rar2fs \ rsync \ sshfs \ tcpdump \ @@ -34,7 +35,7 @@ PKG_DEPENDS_TARGET="toolchain \ wireless_tools" addon() { - mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin/ + mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin # bwm-ng cp -P $(get_build_dir bwm-ng)/.$TARGET_NAME/src/bwm-ng $ADDON_BUILD/$PKG_ADDON_ID/bin @@ -67,6 +68,10 @@ addon() { # nmap cp -P $(get_build_dir nmap)/nmap $ADDON_BUILD/$PKG_ADDON_ID/bin + # rar2fs + cp -P $(get_build_dir rar2fs)/.$TARGET_NAME/mkr2i $ADDON_BUILD/$PKG_ADDON_ID/bin + cp -P $(get_build_dir rar2fs)/.$TARGET_NAME/rar2fs $ADDON_BUILD/$PKG_ADDON_ID/bin + # rsync cp -P $(get_build_dir rsync)/.$TARGET_NAME/rsync $ADDON_BUILD/$PKG_ADDON_ID/bin @@ -77,7 +82,7 @@ addon() { cp -P $(get_build_dir tcpdump)/.$TARGET_NAME/tcpdump $ADDON_BUILD/$PKG_ADDON_ID/bin # udpxy - cp -P $(get_build_dir udpxy)/udpxy $ADDON_BUILD/$PKG_ADDON_ID/bin/ + cp -P $(get_build_dir udpxy)/udpxy $ADDON_BUILD/$PKG_ADDON_ID/bin # wireless_tools cp -P $(get_build_dir wireless_tools)/iwmulticall $ADDON_BUILD/$PKG_ADDON_ID/bin