Merge pull request #2667 from CvH/9.0-system-tools

update system-tools add-on

packages/addons/addon-depends/system-tools-depends/autossh/package.mk

@@ -17,16 +17,15 @@
 ################################################################################
 
 PKG_NAME="autossh"
-PKG_VERSION="1.4e"
+PKG_VERSION="1.4f"
-PKG_SHA256="9e8e10a59d7619176f4b986e256f776097a364d1be012781ea52e08d04679156"
+PKG_SHA256="0172e5e1bea40c642e0ef025334be3aadd4ff3b4d62c0b177ed88a8384e2f8f2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.harding.motd.ca/"
-PKG_URL="http://www.harding.motd.ca/autossh/${PKG_NAME}-${PKG_VERSION}.tgz"
+PKG_URL="http://www.harding.motd.ca/autossh/autossh-${PKG_VERSION}.tgz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
-PKG_SHORTDESC="ssh tool"
+PKG_LONGDESC="Automatically restart SSH sessions and tunnels"
-PKG_LONGDESC="SSH tool to keep alive tunnels"
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \
@@ -37,5 +36,5 @@ pre_configure_target() {
 }
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk

@@ -0,0 +1,31 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2018-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
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="libssh2"
+PKG_VERSION="1.8.0"
+PKG_SHA256="39f34e2f6835f4b992cafe8625073a88e5a28ba78f83e8099610a7b3af4676d4"
+PKG_ARCH="any"
+PKG_LICENSE="BSD"
+PKG_SITE="https://www.libssh2.org"
+PKG_URL="https://www.libssh2.org/download/libssh2-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain openssl"
+PKG_SECTION="libs"
+PKG_LONGDESC="A library implementing the SSH2 protocol"
+
+PKG_CMAKE_OPTS_TARGET="-DBUILD_EXAMPLES=OFF \
+                       -DBUILD_TESTING=OFF"

packages/addons/addon-depends/system-tools-depends/encfs/package.mk

@@ -0,0 +1,36 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2018-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
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="encfs"
+PKG_VERSION="1.9.5"
+PKG_SHA256="4709f05395ccbad6c0a5b40a4619d60aafe3473b1a79bafb3aa700b1f756fd63"
+PKG_ARCH="any"
+PKG_LICENSE="LGPL"
+PKG_SITE="https://vgough.github.io/encfs/"
+PKG_URL="https://github.com/vgough/encfs/releases/download/v$PKG_VERSION/encfs-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain fuse"
+PKG_SECTION="tools"
+PKG_LONGDESC="EncFS is a Encrypted Filesystem for FUSE"
+
+PKG_CMAKE_OPTS_TARGET="-DCMAKE_INSTALL_PREFIX=/usr \
+                       -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES=$SYSROOT_PREFIX/usr/include \
+                       -DBUILD_UNIT_TESTS=OFF"
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/system-tools-depends/file/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="file"
-PKG_VERSION="70c5f15"
+PKG_VERSION="2198460"
-PKG_SHA256="499a851b0aac92e261c069ab5581e8376ede9527bf36351f1d8d9dcd051819fc"
+PKG_SHA256="d825eeee9e0a20b79dbcd00c51022b69fe4468354d8ccc03f441eb349ad8bde0"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.darwinsys.com/file/"
@@ -26,13 +26,12 @@ PKG_URL="https://github.com/file/file/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_HOST="ccache:host"
 PKG_DEPENDS_TARGET="toolchain zlib file:host"
 PKG_SECTION="tools"
-PKG_SHORTDESC="file: File type identification utility"
+PKG_LONGDESC="The file utility is used to determine the types of various files."
-PKG_LONGDESC="These are the sources to Darwin's file(1) utility and master magic(4) file, now maintained by Christos Zoulas. The file(1) utility is used to determine the types of various files."
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_HOST="--enable-fsect-man5 --enable-static --disable-shared"
 PKG_CONFIGURE_OPTS_TARGET="--enable-fsect-man5 --enable-static --disable-shared"
 
 makeinstall_target() {
-  : # meh
+  :
 }

packages/addons/addon-depends/system-tools-depends/htop/package.mk

@@ -17,15 +17,15 @@
 ################################################################################
 
 PKG_NAME="htop"
-PKG_VERSION="2.0.2"
+PKG_VERSION="3.0.0beta4"
-PKG_SHA256="1e93e6743dddad254fac2ad0d83b00a82173c75ecbd6ef6f7d55da690eb64b92"
+PKG_SHA256="5f4cd645c40599efd4a9598a7cbd07bac77cf666427450a71d7b6dec5a4bf96f"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://hisham.hm/htop"
 PKG_URL="https://github.com/hishamhm/htop/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_SECTION="tools"
-PKG_SHORTDESC="An interactive process viewer for Unix"
+PKG_LONGDESC="An interactive process viewer for Unix"
 PKG_TOOLCHAIN="autotools"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-unicode \

packages/addons/addon-depends/system-tools-depends/inotify-tools/package.mk

@@ -17,15 +17,14 @@
 ################################################################################
 
 PKG_NAME="inotify-tools"
-PKG_VERSION="1df9af4"
+PKG_VERSION="3.20.1"
-PKG_SHA256="628b8efabb65a739dd747fe43b73b29a609b5cfa9628caa127764ed77766a6e1"
+PKG_SHA256="a433cc1dedba851078276db69b0e97f9fe41e4ba3336d2971adfca4b3a6242ac"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://wiki.github.com/rvoicilas/inotify-tools/"
-PKG_URL="https://github.com/rvoicilas/$PKG_NAME/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/rvoicilas/inotify-tools/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
-PKG_SHORTDESC="inotify-tools"
 PKG_LONGDESC="a C library and a set of command-line programs for Linux providing a simple interface to inotify"
 PKG_TOOLCHAIN="autotools"
 
@@ -36,5 +35,5 @@ pre_configure_target() {
 }
 
 makeinstall_target() {
-  : nothing to do
+  :
 }

packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="lm_sensors"
-PKG_VERSION="0d5ccf6"
+PKG_VERSION="1c48b19"
-PKG_SHA256="172b297671d794b78a5bb9dde4cc3218fea50480e45b5cc9ab5d50162710b2e4"
+PKG_SHA256="1db77e206b28c9194e5c017c88460e730fdf849cff7ef704fb3e4b8b49fd6d31"
 PKG_ARCH="arm x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="http://secure.netroedge.com/~lm78/"
@@ -26,10 +26,8 @@ PKG_URL="https://github.com/groeck/lm-sensors/archive/${PKG_VERSION}.tar.gz"
 PKG_SOURCE_DIR="lm-sensors-${PKG_VERSION}*"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
-PKG_SHORTDESC="lm_sensors: Hardware monitoring via the SMBus"
+PKG_LONGDESC="lm-sensors provides user-space support for the hardware monitoring drivers"
-PKG_LONGDESC="lm_sensors is a package to get data from the SMB (System Management Bus - an i2c bus) on modern mainboards. It consists of kernel modules and users space tools to get stuff like cpu / mb temperature, voltages, fan speed..."
 
-# TODO: PKG_MAKE_OPTS_TARGET + ETCDIR=/storage/.kodi/addons/tools.lm_sensors/data if one wants sensor3.conf..
 PKG_MAKE_OPTS_TARGET="PREFIX=/usr CC=$CC AR=$AR"
 PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr"
 
@@ -39,5 +37,5 @@ pre_make_target() {
 }
 
 makeinstall_target() {
-  : # meh
+  :
 }

packages/addons/addon-depends/system-tools-depends/mc/package.mk

@@ -18,35 +18,42 @@
 ################################################################################
 
 PKG_NAME="mc"
-PKG_VERSION="4.8.19"
+PKG_VERSION="4.8.20"
-PKG_SHA256="eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df"
+PKG_SHA256="017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.midnight-commander.org"
-PKG_URL="http://ftp.midnight-commander.org/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz"
-PKG_DEPENDS_TARGET="toolchain libtool:host gettext:host glib pcre ncurses"
+PKG_DEPENDS_TARGET="toolchain gettext:host glib libssh2 libtool:host ncurses pcre"
 PKG_SECTION="tools"
-PKG_SHORTDESC="mc: visual file manager"
+PKG_LONGDESC="Midnight Commander is a text based filemanager that emulates Norton Commander"
-PKG_LONGDESC="mc is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included"
 
-PKG_CONFIGURE_OPTS_TARGET="--sysconfdir=/storage/.kodi/addons/virtual.system-tools/etc \
+PKG_CONFIGURE_OPTS_TARGET=" \
   --datadir=/storage/.kodi/addons/virtual.system-tools/data \
   --libdir=/storage/.kodi/addons/virtual.system-tools/mclib \
-            --disable-mclib \
+  --sysconfdir=/storage/.kodi/addons/virtual.system-tools/etc \
+  --with-screen=ncurses \
+  --with-sysroot=$SYSROOT_PREFIX \
   --disable-aspell \
-            --disable-vfs \
+  --without-diff-viewer \
   --disable-doxygen-doc \
   --disable-doxygen-dot \
   --disable-doxygen-html \
-            --with-sysroot=$SYSROOT_PREFIX \
-            --with-screen=ncurses \
-            --without-x \
   --with-gnu-ld \
   --without-libiconv-prefix \
   --without-libintl-prefix \
   --with-internal-edit \
-            --without-diff-viewer \
+  --disable-mclib \
-            --with-subshell"
+  --with-subshell \
+  --enable-vfs-extfs \
+  --enable-vfs-ftp \
+  --enable-vfs-sftp \
+  --enable-vfs-tar \
+  --without-x"
+
+pre_configure_target() {
+  LDFLAGS="$LDFLAGS -lcrypto -lssl"
+}
 
 post_makeinstall_target() {
   rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/locale

packages/addons/addon-depends/system-tools-depends/mc/patches/mc-01-ncurses-fix.patch

@@ -1,60 +0,0 @@
-could be dropped at next bump >4.8.19
-https://github.com/MidnightCommander/mc/commit/4d46a108629beb66a293672db7b44f863b6598ba
-
-From: Thomas Dickey <dickey@his.com>
-Date: Fri, 14 Apr 2017 14:06:13 +0300
-Subject: [PATCH] Ticket #3697: (tty_init): unify curses initialization
-
-...for various curses implementations.
-
-Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
----
- lib/tty/tty-ncurses.c | 26 +++++++++-----------------
- 1 file changed, 9 insertions(+), 17 deletions(-)
-
-diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
-index a7a11f368..8e69b39f6 100644
---- a/lib/tty/tty-ncurses.c
-+++ b/lib/tty/tty-ncurses.c
-@@ -179,6 +179,8 @@ mc_tty_normalize_lines_char (const char *ch)
- void
- tty_init (gboolean mouse_enable, gboolean is_xterm)
- {
-+    struct termios mode;
-+
-     initscr ();
- 
- #ifdef HAVE_ESCDELAY
-@@ -194,25 +196,15 @@ tty_init (gboolean mouse_enable, gboolean is_xterm)
-     ESCDELAY = 200;
- #endif /* HAVE_ESCDELAY */
- 
--#ifdef NCURSES_VERSION
-+    tcgetattr (STDIN_FILENO, &mode);
-     /* use Ctrl-g to generate SIGINT */
--    cur_term->Nttyb.c_cc[VINTR] = CTRL ('g');   /* ^g */
-+    mode.c_cc[VINTR] = CTRL ('g');  /* ^g */
-     /* disable SIGQUIT to allow use Ctrl-\ key */
--    cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE;
--    tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb);
--#else
--    /* other curses implementation (bsd curses, ...) */
--    {
--        struct termios mode;
--
--        tcgetattr (STDIN_FILENO, &mode);
--        /* use Ctrl-g to generate SIGINT */
--        mode.c_cc[VINTR] = CTRL ('g');  /* ^g */
--        /* disable SIGQUIT to allow use Ctrl-\ key */
--        mode.c_cc[VQUIT] = NULL_VALUE;
--        tcsetattr (STDIN_FILENO, TCSANOW, &mode);
--    }
--#endif /* NCURSES_VERSION */
-+    mode.c_cc[VQUIT] = NULL_VALUE;
-+    tcsetattr (STDIN_FILENO, TCSANOW, &mode);
-+
-+    /* curses remembers the "in-program" modes after this call */
-+    def_prog_mode ();
- 
-     tty_start_interrupt_key ();
- 

packages/addons/addon-depends/system-tools-depends/screen/package.mk

@@ -17,16 +17,15 @@
 ################################################################################
 
 PKG_NAME="screen"
-PKG_VERSION="4.5.1"
+PKG_VERSION="4.6.2"
-PKG_SHA256="97db2114dd963b016cd4ded34831955dcbe3251e5eee45ac2606e67e9f097b2d"
+PKG_SHA256="1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/screen/"
 PKG_URL="http://ftpmirror.gnu.org/screen/$PKG_NAME-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain ncurses"
 PKG_SECTION="shell/console"
-PKG_SHORTDESC="terminal multiplexor with VT100/ANSI terminal emulation"
+PKG_LONGDESC="Screen is a window manager that multiplexes a physical terminal between several processes"
-PKG_LONGDESC="screen is a terminal multiplexor that runs several separate screens on a single physical character-based terminal. Each virtual terminal emulates a DEC VT100 plus several ANSI X3.64 and ISO 2022 functions. Screen sessions can be detached and resumed later on a different terminal."
 
 PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \
                            --enable-colors256 \
@@ -45,5 +44,5 @@ pre_configure_target() {
 }
 
 makeinstall_target() {
-  : # nop
+  :
 }

packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk

@@ -0,0 +1,40 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2018-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
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="smartmontools"
+PKG_VERSION="6.6"
+PKG_SHA256="51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://www.smartmontools.org"
+PKG_URL="https://github.com/smartmontools/smartmontools/releases/download/RELEASE_${PKG_VERSION//./_}/smartmontools-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_SECTION="tools"
+PKG_LONGDESC="Control and monitor storage systems using S.M.A.R.T."
+
+PKG_CONFIGURE_OPTS_TARGET="--prefix=/usr \
+                           --without-initscriptdir \
+                           --without-nvme-devicescan \
+                           --without-systemdenvfile \
+                           --without-systemdsystemunitdir \
+                           --without-systemdenvfile \
+                           --without-systemdsystemunitdir"
+
+makeinstall_target() {
+  :
+}

packages/addons/addon-depends/system-tools-depends/strace/package.mk

@@ -17,18 +17,17 @@
 ################################################################################
 
 PKG_NAME="strace"
-PKG_VERSION="4.17"
+PKG_VERSION="4.22"
-PKG_SHA256="81f35b085fbb3cfa806eb521a8522ac3406deaccfe121ce35064bad268237419"
+PKG_SHA256="068cd09264c95e4d591bbcd3ea08f99a693ed8663cd5169b0fdad72eb5bdb39d"
 PKG_ARCH="any"
 PKG_LICENSE="BSD"
-PKG_SITE="http://sourceforge.net/projects/strace/"
+PKG_SITE="https://strace.io/"
-PKG_URL="$SOURCEFORGE_SRC/strace/strace/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="https://strace.io/files/strace/strace-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
-PKG_SHORTDESC="strace: Trace system calls and signals"
+PKG_LONGDESC="strace is a diagnostic, debugging and instructional userspace utility"
-PKG_LONGDESC="In the simplest case strace runs the specified command until it exits. It intercepts and records the system calls which are called by a process and the signals which are received by a process. The name of each system call, its arguments and its return value are printed on standard error or to the file specified with the -o option."
 PKG_TOOLCHAIN="autotools"
 
 makeinstall_target() {
-  : # nothing to do here
+  :
 }

packages/addons/addon-depends/system-tools-depends/strace/patches/strace-autoreconf.patch

@@ -6,10 +6,10 @@
  AC_PREREQ(2.57)
 -AC_INIT([strace],
 -	m4_esyscmd([./git-version-gen .tarball-version]),
--	[strace-devel@lists.sourceforge.net],
+-	[strace-devel@lists.strace.io],
 -	[strace],
 -	[https://strace.io])
-+AC_INIT([strace],[4.17])
++AC_INIT([strace],[4.22])
  m4_define([copyright_year], m4_esyscmd([./copyright-year-gen .year]))
  AC_COPYRIGHT([Copyright (C) 1999-]copyright_year[ The strace developers.])
  AC_CONFIG_SRCDIR([strace.c])

packages/addons/addon-depends/system-tools-depends/unrar/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="unrar"
-PKG_VERSION="5.5.5"
+PKG_VERSION="5.6.3"
-PKG_SHA256="a4553839cb2f025d0d9c5633816a83a723e3938209f17620c8c15da06ed061ef"
+PKG_SHA256="c590e70a745d840ae9b9f05ba6c449438838c8280d76ce796a26b3fcd0a1972e"
 PKG_ARCH="any"
 PKG_LICENSE="free"
 PKG_SITE="http://www.rarlab.com"
@@ -26,8 +26,7 @@ PKG_URL="http://www.rarlab.com/rar/unrarsrc-$PKG_VERSION.tar.gz"
 PKG_SOURCE_DIR="${PKG_NAME}"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="tools"
-PKG_SHORTDESC="unrar: Extract, test and view RAR archives"
+PKG_LONGDESC="unrar extract, test and view RAR archives"
-PKG_LONGDESC="Unrar is a package to handle files compressed in the RAR format. Due to strange licensing issues this package can only view, test and extract files in a given archive, but not pack files. But since we have far more advanced open-source compression utils it should be enough to extract the content when you get a RAR archive."
 PKG_TOOLCHAIN="manual"
 
 make_target() {

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

@@ -1,3 +1,15 @@
+108
+- added encfs and smartmontools
+- updated autossh to 1.4f
+- updated file to 5.33
+- updated htop to 3.0.0 Beta4
+- updated inotify-tools to 3.20.1
+- updated lm_sensors to 1c48b19
+- updated mc to 4.8.20
+- updated screen to 4.6.2
+- updated strace to 4.22
+- updated unrar to 5.6.3
+
 107
 - added dstat, htop and vim
 - updated difftools to 3.6

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

@@ -17,21 +17,20 @@
 ################################################################################
 
 PKG_NAME="system-tools"
-PKG_VERSION=""
+PKG_VERSION="1.0"
-PKG_REV="107"
+PKG_REV="108"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
-PKG_SITE=""
+PKG_SITE="https://libreelec.tv"
 PKG_URL=""
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="A bundle of system tools and programs"
-PKG_LONGDESC="This bundle currently includes autossh, diffutils, dtach, efibootmgr, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, i2c-tools, inotify-tools, jq, lm_sensors, lshw, mc, mrxvt, mtpfs, nmon, p7zip, patch, pv, screen, strace, unrar and usb-modeswitch."
+PKG_LONGDESC="This bundle currently includes autossh, diffutils, dstat, dtach, efibootmgr, encfs, evtest, fdupes, file, getscancodes, hddtemp, hd-idle, hid_mapper, htop, i2c-tools, inotify-tools, jq, lm_sensors, lshw, mc, mrxvt, mtpfs, nmon, p7zip, patch, pv, screen, smartmontools, strace, unrar, usb-modeswitch and vim."
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="System Tools"
 PKG_ADDON_TYPE="xbmc.python.script"
-PKG_ADDON_PROVIDES=""
 
 
 PKG_DEPENDS_TARGET="toolchain \
@@ -40,6 +39,7 @@ PKG_DEPENDS_TARGET="toolchain \
                     dstat \
                     dtach \
                     efibootmgr \
+                    encfs \
                     evtest \
                     fdupes \
                     file \
@@ -61,6 +61,7 @@ PKG_DEPENDS_TARGET="toolchain \
                     patch \
                     pv \
                     screen \
+                    smartmontools \
                     strace \
                     unrar \
                     usb-modeswitch \
@@ -88,6 +89,10 @@ addon() {
     # efibootmgr
     cp -P $(get_build_dir efibootmgr)/src/efibootmgr/efibootmgr $ADDON_BUILD/$PKG_ADDON_ID/bin 2>/dev/null || :
 
+    # encfs
+    cp -P $(get_build_dir encfs)/.$TARGET_NAME/encfs $ADDON_BUILD/$PKG_ADDON_ID/bin
+    cp -P $(get_build_dir encfs)/.$TARGET_NAME/encfsctl $ADDON_BUILD/$PKG_ADDON_ID/bin
+
     # evtest
     cp -P $(get_build_dir evtest)/.$TARGET_NAME/evtest $ADDON_BUILD/$PKG_ADDON_ID/bin
 
@@ -162,6 +167,9 @@ addon() {
     # screen
     cp -P $(get_build_dir screen)/screen $ADDON_BUILD/$PKG_ADDON_ID/bin
 
+    # smartmontools
+    cp -P $(get_build_dir smartmontools)/.$TARGET_NAME/smartctl $ADDON_BUILD/$PKG_ADDON_ID/bin
+
     # strace
     cp -P $(get_build_dir strace)/.$TARGET_NAME/strace $ADDON_BUILD/$PKG_ADDON_ID/bin
 

packages/addons/tools/system-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