Merge pull request #3295 from CvH/9.0/addon-ups

kodi binary addons update
Merge pull request #3323 from MilhouseVH/le90_linux41923-backport
2025-09-24 19:46:01 +07:00 · 2019-02-20 23:12:05 +01:00 · 2019-02-20 23:08:18 +01:00 · 2019-02-20 22:50:33 +01:00 · 2019-02-20 21:49:07 +00:00 · 2019-02-20 21:49:07 +00:00
465 changed files with 30281 additions and 20977 deletions
--- a/config/functions
+++ b/config/functions
@@ -10,24 +10,6 @@ die() {
  exit "${2:-1}"
 }

-# p1: name of potential function to execute if it exists
-# return 0 if function executed, 1 if not, die if error
-pkg_call() {
-  [ -n "${PKG_NAME}" ] || die "$(print_color CLR_ERROR "FAILURE: Cannot call ${1} package function when package is not known!")"
-
-  if [ "$(type -t ${1})" = "function" ]; then
-    ${1} || die "$(print_color CLR_ERROR "FAILURE: ${1} for package ${PKG_NAME} did not succeed!")"
-  else
-    return 1
-  fi
-}
-
-# p1: name of potential function to execute if it exists
-# return 0 if function executed or not, or die if error
-pkg_call_optional() {
-  pkg_call ${1} || return 0
-}
-
 # return 0 if $2 in space-separated list $1, otherwise return 1
 listcontains() {
  if [ -n "$1" -a -n "$2" ]; then
@@ -231,9 +213,16 @@ setup_toolchain() {
    NINJA_OPTS="$NINJA_OPTS -j1"
    export MAKEFLAGS="-j1"
  else
+    NINJA_OPTS="$NINJA_OPTS -j$CONCURRENCY_MAKE_LEVEL"
    export MAKEFLAGS="-j$CONCURRENCY_MAKE_LEVEL"
  fi

+  # verbose flag
+  if flag_enabled "verbose" "no"; then
+    NINJA_OPTS="$NINJA_OPTS -v"
+    export MAKEFLAGS="$MAKEFLAGS V=1 VERBOSE=1"
+  fi
+
  case "$1" in
    target|init)
      export DESTIMAGE="target"
@@ -316,6 +305,7 @@ setup_toolchain() {
        mkdir -p $TOOLCHAIN/etc
        echo "SET(CMAKE_SYSTEM_NAME Linux)" >> $CMAKE_CONF
        echo "SET(CMAKE_SYSTEM_VERSION 1)"  >> $CMAKE_CONF
+        echo "SET(CMAKE_SYSTEM_PROCESSOR ${MACHINE_HARDWARE_NAME})" >> $CMAKE_CONF
        echo "SET(CMAKE_C_COMPILER   $CC)"  >> $CMAKE_CONF
        echo "SET(CMAKE_CXX_COMPILER $CXX)" >> $CMAKE_CONF
        echo "SET(CMAKE_CPP_COMPILER $CXX)" >> $CMAKE_CONF
@@ -342,7 +332,7 @@ setup_toolchain() {
 }

 create_meson_conf() {
-  local endian root
+  local endian root properties
  case "$1" in
    target|init)    endian="little"
                    root="$SYSROOT_PREFIX/usr"
@@ -352,6 +342,8 @@ create_meson_conf() {
                    ;;
  esac

+  properties="PKG_MESON_PROPERTIES_${1^^}"
+
  cat > $2 <<EOF
 [binaries]
 c = '$CC'
@@ -371,6 +363,7 @@ endian = '$endian'
 root = '$root'
 $(python -c "import os; print('c_args = {}'.format([x for x in os.getenv('CFLAGS').split()]))")
 $(python -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))")
+${!properties}
 EOF
 }

@@ -488,33 +481,50 @@ debug_strip() {

 init_package_cache() {
  local _ANCHOR="@?+?@" DIR
+  local temp_global temp_local

  # If the package caches are unset, then populate them
  if [ -z "${_CACHE_PACKAGE_LOCAL}" -o -z "${_CACHE_PACKAGE_GLOBAL}" ]; then
-    _CACHE_PACKAGE_LOCAL="${BUILD}/.cache_package_local"
-    _CACHE_PACKAGE_GLOBAL="${BUILD}/.cache_package_global"
-    mkdir -p "${BUILD}"
-    : > "${_CACHE_PACKAGE_LOCAL}"
-    : > "${_CACHE_PACKAGE_GLOBAL}"
+    temp_global="$(mktemp)"
+    temp_local="$(mktemp)"

    # cache project/device folder for a package
    if [ -n $DEVICE ]; then
      for DIR in $(find $ROOT/projects/$PROJECT/devices/$DEVICE/packages -type d 2>/dev/null); do
-        [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${_CACHE_PACKAGE_LOCAL}"
+        [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${temp_local}"
      done
    fi

    # cache project folder for a package
    for DIR in $(find $ROOT/projects/$PROJECT/packages -type d 2>/dev/null); do
-      [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${_CACHE_PACKAGE_LOCAL}"
+      [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${temp_local}"
    done

    # cache packages folder
    for DIR in $(find $ROOT/$PACKAGES -type d 2>/dev/null); do
-      [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${_CACHE_PACKAGE_GLOBAL}"
+      [ -r "$DIR/package.mk" ] && echo "${DIR}${_ANCHOR}" >> "${temp_global}"
    done

+    _CACHE_PACKAGE_LOCAL="${BUILD}/.cache_package_local"
+    _CACHE_PACKAGE_GLOBAL="${BUILD}/.cache_package_global"
    export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL
+
+    # overwrite existing cache files only when they are invalid, or not yet created
+    mkdir -p "$(dirname "${_CACHE_PACKAGE_GLOBAL}")"
+    if [ -f "${_CACHE_PACKAGE_LOCAL}" ] && cmp -s "${temp_local}" "${_CACHE_PACKAGE_LOCAL}"; then
+      rm "${temp_local}"
+    else
+      mv "${temp_local}" "${_CACHE_PACKAGE_LOCAL}"
+    fi
+    if [ -f "${_CACHE_PACKAGE_GLOBAL}" ] && cmp -s "${temp_global}" "${_CACHE_PACKAGE_GLOBAL}"; then
+      rm "${temp_global}"
+    else
+      mv "${temp_global}" "${_CACHE_PACKAGE_GLOBAL}"
+    fi
+  fi
+
+  if [ -z "${_DEBUG_DEPENDS_LIST+x}" ]; then
+    set_debug_depends
  fi
 }

@@ -679,8 +689,7 @@ do_autoreconf() {
 get_pkg_variable() {
  if [ -n "$1" -a -n "$2" ] ; then
    if [ "$1" != "$PKG_NAME" ]; then
-      cd $ROOT
-      . config/options $1 &>/dev/null
+      source_package "${1}"
    fi
    echo "${!2}"
  fi
@@ -803,6 +812,126 @@ find_dir_path() {
  find_path -d "$1" "$2"
 }

+# p1: name of function to test for
+# return 0 if function exists, 1 if not
+pkg_call_exists() {
+  [ "$(type -t ${1})" = "function" ] && return 0 || return 1
+}
+
+# p1: name of function to execute unconditionally
+# testing the exit code value of this function is likely to break set -e fail-on-error behaviour
+pkg_call() {
+  [ -n "${PKG_NAME}" ] || die "$(print_color CLR_ERROR "FAILURE: Cannot call ${1} package function when package is not known!")"
+
+  ${1}
+}
+
+unset_functions() {
+  local target
+
+  unset -f configure_package
+
+  unset -f pre_unpack unpack post_unpack
+  unset -f pre_patch post_patch
+
+  for target in target host init bootstrap; do
+    unset -f pre_build_${target}
+    unset -f pre_configure_${target} configure_${target} post_configure_${target}
+    unset -f pre_make_${target} make_${target} post_make_${target}
+    unset -f pre_makeinstall_${target} makeinstall_${target} post_makeinstall_${target}
+  done
+
+  unset -f pre_install post_install
+
+  unset -f addon
+}
+
+# p1: name of package to be sourced
+source_package() {
+  local opwd="${PWD}"
+
+  # Don't use BUILD_WITH_DEBUG in "global" package.mk - instead, call the function
+  # build_with_debug() directly as the function depends on various package.mk
+  # variables that will be in the process of being configured. Once package.mk is
+  # fully sourced we can set this variable and use it in situations where we know the
+  # package has already been sourced.
+  unset BUILD_WITH_DEBUG
+
+  reset_pkg_vars
+  unset_functions
+
+  if [ -n "${1}" ]; then
+    PKG_DIR="$(get_pkg_directory ${1})"
+
+    [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ] || die "FAILURE: unable to source package - ${1}/package.mk does not exist"
+
+    cd "${ROOT}"
+    . ${PKG_DIR}/package.mk || die "FAILURE: an error occurred while sourcing ${PKG_DIR}/package.mk"
+    cd "${opwd}"
+
+    PKG_SHORTDESC="${PKG_SHORTDESC:-${PKG_NAME} (autogenerated)}"
+    PKG_LONGDESC="${PKG_LONGDESC:-${PKG_NAME} (autogenerated)}"
+
+    if [ "$PKG_IS_ADDON" = "yes" -o "$PKG_IS_ADDON" = "embedded" ] ; then
+      [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="${PKG_SECTION//\//.}.$PKG_NAME"
+      [ "$PKG_ADDON_IS_STANDALONE" != "yes" ] && PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)"
+    fi
+
+    # Automatically set PKG_SOURCE_NAME unless it is already defined.
+    # PKG_SOURCE_NAME will be automatically set to a name based on
+    # the $PKG_NAME-$PKG_VERSION convention.
+    #
+    # Any $PKG_URL that references more than a single url will abort
+    # the build as these are no longer supported - use mkpkg instead.
+    if [ -n "$PKG_URL" -a -z "$PKG_SOURCE_NAME" ]; then
+      if [[ $PKG_URL =~ .*\ .* ]]; then
+        echo "Error - packages with multiple urls are no longer supported, use mkpkg."
+        echo "$PKG_URL"
+        die
+      fi
+      if [[ ${PKG_URL} =~ .git$ || ${PKG_URL} =~ ^git:// ]]; then
+        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}
+      elif [[ ${PKG_URL} =~ ^file:// ]]; then
+        PKG_SOURCE_NAME=${PKG_URL#file://}
+        # if no specific PKG_TAR_COPY_OPTS then default to excluding .git and .svn as they can be huge
+        [ -z "${PKG_TAR_COPY_OPTS+x}" ] && PKG_TAR_COPY_OPTS="--exclude=.git --exclude=.svn"
+      else
+        PKG_SOURCE_NAME="${PKG_URL##*/}"
+        case $PKG_SOURCE_NAME in
+          ${PKG_NAME}-${PKG_VERSION}.*)
+            PKG_SOURCE_NAME=$PKG_SOURCE_NAME
+            ;;
+          *.tar | *.tbz | *.tgz | *.txz | *.7z | *.zip)
+            PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
+            ;;
+          *.tar.bz2 | *.tar.gz | *.tar.xz)
+            PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.tar.${PKG_SOURCE_NAME##*\.}
+            ;;
+          *.diff | *.patch | *.diff.bz2 | *.patch.bz2 | patch-*.bz2 | *.diff.gz | *.patch.gz | patch-*.gz)
+            PKG_SOURCE_NAME=$PKG_SOURCE_NAME
+            ;;
+          *)
+            PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
+            ;;
+        esac
+      fi
+    fi
+
+    PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
+  fi
+
+  build_with_debug && BUILD_WITH_DEBUG="yes" || BUILD_WITH_DEBUG="no"
+
+  # Late variable binding - allow the package to now evaluate any variables
+  # that we may have initialised after sourcing the package, typically
+  # PKG_BUILD etc.
+  if [ -n "${PKG_NAME}" ]; then
+    if pkg_call_exists configure_package; then
+      pkg_call configure_package
+    fi
+  fi
+}
+

 ### KERNEL HELPERS ###
 kernel_path() {
@@ -933,6 +1062,7 @@ install_addon_images() {

 create_addon_xml() {
  local addon_xml addon_version addon_name provider_name requires requires_addonname requires_addonversion screenshots
+  local tmp_changelog

  addon_xml="$1/addon.xml"

@@ -956,11 +1086,14 @@ done
  fi

  if [ -f $PKG_DIR/changelog.txt ]; then
+    tmp_changelog="$(mktemp)"
+    cat ${PKG_DIR}/changelog.txt | xmlstarlet esc >"${tmp_changelog}"
    sed -e "/@PKG_ADDON_NEWS@/ \
         {
-           r $PKG_DIR/changelog.txt
+           r ${tmp_changelog}
           d
         }" -i "$addon_xml"
+    rm -f "${tmp_changelog}"
  else
    sed -e "s|@PKG_ADDON_NEWS@||g" -i "$addon_xml"
  fi
--- a/config/optimize
+++ b/config/optimize
@@ -60,8 +60,8 @@ if [ -z "$HOST_LIBDIR" ]; then
  HOST_LIBDIR="$TOOLCHAIN/lib"

  # ubuntu/debian specific "multiarch support"
-  MACHINE_HARDWARE_NAME="$(uname -m)"
-  MACHINE_HARDWARE_PLATFORM="$(uname -i)"
+  export MACHINE_HARDWARE_NAME="$(uname -m)"
+  export MACHINE_HARDWARE_PLATFORM="$(uname -i)"
  FAMILY_TRIPLET=${HOST_NAME/${MACHINE_HARDWARE_NAME}/${MACHINE_HARDWARE_PLATFORM}}
  if [ -d /lib/$FAMILY_TRIPLET ]; then
    HOST_LIBDIR="$HOST_LIBDIR /lib/$FAMILY_TRIPLET"
--- a/config/options
+++ b/config/options
@@ -88,9 +88,15 @@ if [ "${OEM}" = "yes" -o "${OEM}" = "no" ]; then
  OEM_SUPPORT="${OEM}"
 fi

-[ -z "${_DEBUG_DEPENDS_LIST+x}" ] && set_debug_depends
-
 check_config

 . config/graphic
 . config/path $1
+
+## package processing
+
+# If the package caches are unset, then populate them
+init_package_cache
+
+# set package metadata
+source_package "${1}"
--- a/config/path
+++ b/config/path
@@ -1,3 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
 set -e

 # setup initial directorys (relative to root)
@@ -59,79 +62,6 @@ INSTALL_INIT=$BUILD/image/initramfs/root-image
 MAKE="$TOOLCHAIN/bin/make"
 MAKEINSTALL="$TOOLCHAIN/bin/make -j1 DESTDIR=$SYSROOT_PREFIX install"

-unset LD_LIBRARY_PATH
-
-# Don't use BUILD_WITH_DEBUG in "gloabl" package.mk - instead, call the function
-# build_with_debug() directly as the function depends on various package.mk
-# variables that will be in the process of being configured. Once package.mk is
-# fully sourced we can set this variable and use it in situations where we know the
-# package has already been sourced.
-unset BUILD_WITH_DEBUG
-
-# If the package caches are unset, then populate them
-init_package_cache
-
-# set package metadata
-reset_pkg_vars "$1"
-
-[ -n "$1" ] && PKG_DIR="$(get_pkg_directory $1)"
-
-if [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ]; then
-  unset -f configure_package
-  . $PKG_DIR/package.mk
-  [ -z "$PKG_SHORTDESC" ] && PKG_SHORTDESC="$PKG_NAME (autogenerated)"
-  [ -z "$PKG_LONGDESC" ] &&  PKG_LONGDESC="$PKG_NAME (autogenerated)"
-fi
-
-if [ "$PKG_IS_ADDON" = "yes" -o "$PKG_IS_ADDON" = "embedded" ] ; then
-  [ -z $PKG_SECTION ] && PKG_ADDON_ID="$PKG_NAME" || PKG_ADDON_ID="${PKG_SECTION//\//.}.$PKG_NAME"
-  [ "$PKG_ADDON_IS_STANDALONE" != "yes" ] && PKG_NEED_UNPACK="${PKG_NEED_UNPACK} $(get_pkg_directory $MEDIACENTER)"
-fi
-
-# Automatically set PKG_SOURCE_NAME unless it is already defined.
-# PKG_SOURCE_NAME will be automatically set to a name based on
-# the $PKG_NAME-$PKG_VERSION convention.
-#
-# Any $PKG_URL that references more than a single url will abort
-# the build as these are no longer supported - use mkpkg instead.
-if [ -n "$PKG_URL" -a -z "$PKG_SOURCE_NAME" ]; then
-  if [[ $PKG_URL =~ .*\ .* ]]; then
-    echo "Error - packages with multiple urls are no longer supported, use mkpkg:"
-    echo "$PKG_URL"
-    exit 1
-  fi
-  if [[ ${PKG_URL} =~ .git$ || ${PKG_URL} =~ ^git:// ]]; then
-    PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}
-  elif [[ ${PKG_URL} =~ ^file:// ]]; then
-    PKG_SOURCE_NAME=${PKG_URL#file://}
-    # if no specific PKG_TAR_COPY_OPTS then default to excluding .git and .svn as they can be huge
-    [ -z "${PKG_TAR_COPY_OPTS+x}" ] && PKG_TAR_COPY_OPTS="--exclude=.git --exclude=.svn"
-  else
-    PKG_SOURCE_NAME="${PKG_URL##*/}"
-    case $PKG_SOURCE_NAME in
-      ${PKG_NAME}-${PKG_VERSION}.*)
-        PKG_SOURCE_NAME=$PKG_SOURCE_NAME
-        ;;
-      *.tar | *.tbz | *.tgz | *.txz | *.7z | *.zip)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
-        ;;
-      *.tar.bz2 | *.tar.gz | *.tar.xz)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.tar.${PKG_SOURCE_NAME##*\.}
-        ;;
-      *.diff | *.patch | *.diff.bz2 | *.patch.bz2 | patch-*.bz2 | *.diff.gz | *.patch.gz | patch-*.gz)
-        PKG_SOURCE_NAME=$PKG_SOURCE_NAME
-        ;;
-      *)
-        PKG_SOURCE_NAME=${PKG_NAME}-${PKG_VERSION}.${PKG_SOURCE_NAME##*\.}
-        ;;
-    esac
-  fi
-fi
-
-PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
-
-build_with_debug && BUILD_WITH_DEBUG="yes" || BUILD_WITH_DEBUG="no"
-
 XORG_PATH_DRI=/usr/lib/dri
 XORG_PATH_XKB=/usr/share/X11/xkb
 XORG_PATH_XKB_OUTPUT=/var/lib/xkb
@@ -151,22 +81,23 @@ fi

 VERSION_SUFFIX=$TARGET_ARCH

-SILENT_OUT=3
-VERBOSE_OUT=4
-if [ "$VERBOSE" = yes ]; then
-  exec 3>&1
-  exec 4>&2
-else
-  exec 3>&2
-  exec 4>/dev/null
-fi
-BUILD_INDENT_SIZE=4
+# redirect formatted output
+if [ -z "${SILENT_OUT}" -a -z "${VERBOSE_OUT}" ]; then
+  export BUILD_INDENT_SIZE=4
+  export SILENT_OUT=3
+  export VERBOSE_OUT=4

-# If sourcing a package, configure any package variables dependent on variables we have set
-if [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ]; then
-  pkg_call_optional configure_package
+  if [ "$VERBOSE" = yes ]; then
+    exec 3>&1
+    exec 4>&2
+  else
+    exec 3>&2
+    exec 4>/dev/null
+  fi
 fi

+unset LD_LIBRARY_PATH
+
 # multilib? nah
 unset CONFIG_SITE

--- a/licenses/LibPNG2.txt
+++ b/licenses/LibPNG2.txt
@@ -0,0 +1,134 @@
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
+=========================================
+
+PNG Reference Library License version 2
+---------------------------------------
+
+ * Copyright (c) 1995-2018 The PNG Reference Library Authors.
+ * Copyright (c) 2018 Cosmin Truta.
+ * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+ * Copyright (c) 1996-1997 Andreas Dilger.
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+The software is supplied "as is", without warranty of any kind,
+express or implied, including, without limitation, the warranties
+of merchantability, fitness for a particular purpose, title, and
+non-infringement.  In no even shall the Copyright owners, or
+anyone distributing the software, be liable for any damages or
+other liability, whether in contract, tort or otherwise, arising
+from, out of, or in connection with the software, or the use or
+other dealings in the software, even if advised of the possibility
+of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute
+this software, or portions hereof, for any purpose, without fee,
+subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you
+    must not claim that you wrote the original software.  If you
+    use this software in a product, an acknowledgment in the product
+    documentation would be appreciated, but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+    not be misrepresented as being the original software.
+
+ 3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+
+PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
+-----------------------------------------------------------------------
+
+libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, and are distributed according to the same
+disclaimer and license as libpng-1.0.6 with the following individuals
+added to the list of Contributing Authors:
+
+    Simon-Pierre Cadieux
+    Eric S. Raymond
+    Mans Rullgard
+    Cosmin Truta
+    Gilles Vollant
+    James Yu
+    Mandar Sahastrabuddhe
+    Google Inc.
+    Vadim Barkov
+
+and with the following additions to the disclaimer:
+
+    There is no warranty against interference with your enjoyment of
+    the library or against infringement.  There is no warranty that our
+    efforts or the library will fulfill any of your particular purposes
+    or needs.  This library is provided with all faults, and the entire
+    risk of satisfactory quality, performance, accuracy, and effort is
+    with the user.
+
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners, and
+are released under other open source licenses.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, and are distributed according to the same disclaimer and
+license as libpng-0.96, with the following individuals added to the
+list of Contributing Authors:
+
+    Tom Lane
+    Glenn Randers-Pehrson
+    Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
+and are distributed according to the same disclaimer and license as
+libpng-0.88, with the following individuals added to the list of
+Contributing Authors:
+
+    John Bowler
+    Kevin Bracey
+    Sam Bushell
+    Magnus Holmgren
+    Greg Roelofs
+    Tom Tanner
+
+Some files in the "scripts" directory have other copyright owners,
+but are released under this license.
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+    Andreas Dilger
+    Dave Martindale
+    Guy Eric Schalnat
+    Paul Schmidt
+    Tim Wegner
+
+The PNG Reference Library is supplied "AS IS".  The Contributing
+Authors and Group 42, Inc. disclaim all warranties, expressed or
+implied, including, without limitation, the warranties of
+merchantability and of fitness for any purpose.  The Contributing
+Authors and Group 42, Inc. assume no liability for direct, indirect,
+incidental, special, exemplary, or consequential damages, which may
+result from the use of the PNG Reference Library, even if advised of
+the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+ 1. The origin of this source code must not be misrepresented.
+
+ 2. Altered versions must be plainly marked as such and must not
+    be misrepresented as being the original source.
+
+ 3. This Copyright notice may not be removed or altered from any
+    source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit,
+without fee, and encourage the use of this source code as a component
+to supporting the PNG file format in commercial products.  If you use
+this source code in a product, acknowledgment is not required but would
+be appreciated.
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXcomposite/package.mk
@@ -7,15 +7,15 @@ PKG_NAME="chrome-libXcomposite"
 PKG_LONGDESC="libXcomposite for chrome"
 PKG_URL=""

+PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+                           --disable-static \
+                           --enable-shared"
+
 unpack() {
  mkdir -p $PKG_BUILD
  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }

-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
  :
 }
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXdamage/package.mk
@@ -7,15 +7,15 @@ PKG_NAME="chrome-libXdamage"
 PKG_LONGDESC="libXdamage for chrome"
 PKG_URL=""

+PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+                           --disable-static \
+                           --enable-shared"
+
 unpack() {
  mkdir -p $PKG_BUILD
  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }

-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
  :
 }
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXfixes/package.mk
@@ -7,15 +7,15 @@ PKG_NAME="chrome-libXfixes"
 PKG_LONGDESC="libXfixes for chrome"
 PKG_URL=""

+PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+                           --disable-static \
+                           --enable-shared"
+
 unpack() {
  mkdir -p $PKG_BUILD
  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }

-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
  :
 }
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXi/package.mk
@@ -7,15 +7,15 @@ PKG_NAME="chrome-libXi"
 PKG_LONGDESC="libXi for chrome"
 PKG_URL=""

+PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+                           --disable-static \
+                           --enable-shared"
+
 unpack() {
  mkdir -p $PKG_BUILD
  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }

-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
  :
 }
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXrender/package.mk
@@ -7,15 +7,15 @@ PKG_NAME="chrome-libXrender"
 PKG_LONGDESC="libXrender for chrome"
 PKG_URL=""

+PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+                           --disable-static \
+                           --enable-shared"
+
 unpack() {
  mkdir -p $PKG_BUILD
  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }

-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
  :
 }
--- a/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libXtst/package.mk
@@ -7,15 +7,15 @@ PKG_NAME="chrome-libXtst"
 PKG_LONGDESC="libXtst for chrome"
 PKG_URL=""

+PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+                           --disable-static \
+                           --enable-shared"
+
 unpack() {
  mkdir -p $PKG_BUILD
  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }

-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
  :
 }
--- a/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/chrome-libxcb/package.mk
@@ -7,15 +7,15 @@ PKG_NAME="chrome-libxcb"
 PKG_LONGDESC="libxcb for chrome"
 PKG_URL=""

+PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
+                           --disable-static \
+                           --enable-shared"
+
 unpack() {
  mkdir -p $PKG_BUILD
  tar --strip-components=1 -xf $SOURCES/${PKG_NAME:7}/${PKG_NAME:7}-$PKG_VERSION.tar.bz2 -C $PKG_BUILD
 }

-PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET \
-                           --disable-static \
-                           --enable-shared"
-
 makeinstall_target() {
  :
 }
--- a/packages/addons/addon-depends/chrome-depends/cups/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/cups/package.mk
@@ -12,11 +12,6 @@ PKG_DEPENDS_TARGET="toolchain openssl zlib"
 PKG_LONGDESC="CUPS printing system."
 PKG_BUILD_FLAGS="+pic"

-pre_configure_target() {
-  cd ..
-  rm -rf .$TARGET_NAME
-}
-
 PKG_CONFIGURE_OPTS_TARGET="--libdir=/usr/lib \
                           --disable-gssapi \
                           --disable-avahi \
@@ -24,6 +19,11 @@ PKG_CONFIGURE_OPTS_TARGET="--libdir=/usr/lib \
                           --disable-launchd \
                           --disable-unit-tests"

+pre_configure_target() {
+  cd ..
+  rm -rf .$TARGET_NAME
+}
+
 makeinstall_target() {
  make BUILDROOT="$INSTALL/../.INSTALL_PKG"
 }
--- a/packages/addons/addon-depends/chrome-depends/icu/package.mk
+++ b/packages/addons/addon-depends/chrome-depends/icu/package.mk
@@ -18,15 +18,16 @@ PKG_ICU_OPTS="--disable-extras \
              --disable-tests \
              --disable-tools"

-
 PKG_CONFIGURE_OPTS_HOST="--enable-static \
                         --disable-shared \
                         $PKG_ICU_OPTS"

-PKG_CONFIGURE_OPTS_TARGET="--with-cross-build=$PKG_BUILD/.$HOST_NAME \
-                         $PKG_ICU_OPTS"
+configure_package() {
+  PKG_CONFIGURE_OPTS_TARGET="--with-cross-build=$PKG_BUILD/.$HOST_NAME \
+                             $PKG_ICU_OPTS"

-PKG_CONFIGURE_SCRIPT="source/configure"
+  PKG_CONFIGURE_SCRIPT="${PKG_BUILD}/source/configure"
+}

 post_makeinstall_target() {
  rm -rf $INSTALL
--- a/packages/addons/addon-depends/containerd/package.mk
+++ b/packages/addons/addon-depends/containerd/package.mk
@@ -3,11 +3,11 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="containerd"
-PKG_VERSION="c4446665cb9c30056f4998ed953e6d4ff22c7c39" # v1.2.0
-PKG_SHA256="0bd3370f769c25f077445b77266a0afba6fe60b9caa443153e604d8727f2a891"
+PKG_VERSION="1.2.2"
+PKG_SHA256="91d480816986d74ff4fa7dd0412c787615fa705975b18fa4079c333b137c653f"
 PKG_LICENSE="APL"
 PKG_SITE="https://containerd.tools/"
-PKG_URL="https://github.com/containerd/containerd/archive/$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/containerd/containerd/archive/v$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_LONGDESC="A daemon to control runC, built for performance and density."
 PKG_TOOLCHAIN="manual"
@@ -38,9 +38,8 @@ pre_make_target() {
  export CGO_ENABLED=1
  export CGO_NO_EMULATION=1
  export CGO_CFLAGS=$CFLAGS
-  # Update CONTAINERD_VERSION if you update the PKG_VERSION
-  export CONTAINERD_VERSION=v1.2.0
-  export CONTAINERD_REVISION=$PKG_VERSION
+  export CONTAINERD_VERSION=v${PKG_VERSION}
+  export CONTAINERD_REVISION=${PKG_VERSION}
  export CONTAINERD_PKG=github.com/containerd/containerd
  export LDFLAGS="-w -extldflags -static -X ${CONTAINERD_PKG}/version.Version=${CONTAINERD_VERSION} -X ${CONTAINERD_PKG}/version.Revision=${CONTAINERD_REVISION} -X ${CONTAINERD_PKG}/version.Package=${CONTAINERD_PKG} -extld $CC"
  export GOLANG=$TOOLCHAIN/lib/golang/bin/go
--- a/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/fdk-aac/package.mk
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="fdk-aac"
-PKG_VERSION="0.1.6"
-PKG_SHA256="adbcd793e406e1b88b3c1c41382d49f8c27371485b823c0fdab69c9124fd2ce3"
-PKG_LICENSE="other"
-PKG_SITE="https://sourceforge.net/projects/opencore-amr/"
-PKG_URL="https://github.com/mstorsjo/fdk-aac/archive/v${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
-PKG_LONGDESC="A standalone library of the Fraunhofer FDK AAC code from Android."
-PKG_TOOLCHAIN="autotools"
--- a/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk
+++ b/packages/addons/addon-depends/ffmpegx-depends/x264/package.mk
@@ -20,7 +20,6 @@ pre_configure_target() {

  if [ "$TARGET_ARCH" = "x86_64" ]; then
    export AS="$TOOLCHAIN/bin/nasm"
-    PKG_X264_ASM="--enable-asm"
  else
    PKG_X264_ASM="--disable-asm"
  fi
--- a/packages/addons/addon-depends/ffmpegx/package.mk
+++ b/packages/addons/addon-depends/ffmpegx/package.mk
@@ -7,7 +7,7 @@ PKG_SHA256="7afb163d6974693cdad742aa1224c33683c50845c67ee5ae35506efc631ac121"
 PKG_LICENSE="LGPLv2.1+"
 PKG_SITE="https://ffmpeg.org"
 PKG_URL="https://github.com/FFmpeg/FFmpeg/archive/n${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain aom bzip2 fdk-aac libvorbis openssl opus x264 x265 zlib"
+PKG_DEPENDS_TARGET="toolchain aom bzip2 gnutls libvorbis opus x264 zlib"
 PKG_LONGDESC="FFmpegx is an complete FFmpeg build to support encoding and decoding."
 PKG_BUILD_FLAGS="-gold"

@@ -19,7 +19,7 @@ if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
 fi

 if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_DEPENDS_TARGET+=" nasm:host"
+  PKG_DEPENDS_TARGET+=" nasm:host x265"
 fi

 if [[ ! $TARGET_ARCH = arm ]] || target_has_feature neon; then
@@ -34,6 +34,11 @@ fi
 pre_configure_target() {
  cd $PKG_BUILD
  rm -rf .$TARGET_NAME
+  
+  # pass gnutls to build
+  PKG_CONFIG_PATH="$(get_build_dir gnutls)/.INSTALL_PKG/usr/lib/pkgconfig"
+  CFLAGS="$CFLAGS -I$(get_build_dir gnutls)/.INSTALL_PKG/usr/include"
+  LDFLAGS="$LDFLAGS -L$(get_build_dir gnutls)/.INSTALL_PKG/usr/lib"

  if [ "$KODIPLAYER_DRIVER" == "bcm2835-driver" ]; then
    CFLAGS="-DRPI=1 -I$SYSROOT_PREFIX/usr/include/IL -I$SYSROOT_PREFIX/usr/include/interface/vcos/pthreads -I$SYSROOT_PREFIX/usr/include/interface/vmcs_host/linux $CFLAGS"
@@ -97,10 +102,9 @@ pre_configure_target() {
    --enable-encoder=libaom_av1 \
    \
    `#Audio encoders` \
+    --enable-encoder=aac \
    --enable-encoder=ac3 \
    --enable-encoder=eac3 \
-    --enable-libfdk-aac \
-    --enable-encoder=libfdk-aac \
    --enable-encoder=flac \
    --enable-libmp3lame \
    --enable-encoder=libmp3lame \
@@ -134,7 +138,7 @@ configure_target() {
    \
    `#Licensing options` \
    --enable-gpl \
-    --enable-nonfree \
+    --disable-nonfree \
    \
    `#Documentation options` \
    --disable-doc \
@@ -171,7 +175,8 @@ configure_target() {
    --extra-ldflags="$LDFLAGS" \
    --extra-libs="$PKG_FFMPEG_LIBS" \
    --enable-pic \
-    --enable-openssl \
+    --enable-gnutls \
+    --disable-openssl \
    \
    `#Advanced options` \
    --disable-hardcoded-tables \
--- a/packages/addons/addon-depends/go/package.mk
+++ b/packages/addons/addon-depends/go/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="go"
-PKG_VERSION="1.10.5"
-PKG_SHA256="afe38b3c6a91e7e6c2bae0cf7427d1080ed3b7d8c044504400db56c3b72bb082"
+PKG_VERSION="1.11.2"
+PKG_SHA256="7854866866c57394217ae5facc41944dff2a7386a064b2bcc4149f7c68e3c79a"
 PKG_LICENSE="BSD"
 PKG_SITE="https://golang.org"
 PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz"
--- a/packages/addons/addon-depends/libid3tag/package.mk
+++ b/packages/addons/addon-depends/libid3tag/package.mk
@@ -1,15 +1,19 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="libid3tag"
 PKG_VERSION="0.15.1b"
 PKG_SHA256="63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.mars.org/home/rob/proj/mpeg/"
-PKG_URL="$SOURCEFORGE_SRC/mad/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_SITE="https://www.underbit.com/products/mad/"
+PKG_URL="ftp://ftp.mars.org/pub/mpeg/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain zlib"
 PKG_LONGDESC="A library for id3 tagging."

-PKG_MAINTAINER="Lukas Sabota (LTsmooth42@gmail.com)"
+PKG_CONFIGURE_OPTS_TARGET="--enable-static \
+                           --disable-shared"

-PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"
+post_makeinstall_target(){
+ cp $PKG_BUILD/id3tag.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
+}
--- a/packages/addons/addon-depends/libid3tag/sources/id3tag.pc
+++ b/packages/addons/addon-depends/libid3tag/sources/id3tag.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=/usr/bin
+libdir=/usr/lib
+includedir=/usr/include
+
+Name: ID3TAG
+Description: libid3tag - ID3 tag manipulation library
+Version: 0.15.1b
+Libs: -L${libdir} -lid3tag -lz
+Cflags:
--- a/packages/addons/addon-depends/libnetwork/package.mk
+++ b/packages/addons/addon-depends/libnetwork/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="libnetwork"
-PKG_VERSION="3ac297bc7fd0afec9051bbb47024c9bc1d75bf5b"
-PKG_SHA256="572ce85f2c51a21c1cd55056cf8cb9ef1d447c2de9c82485233be9f851284299"
+PKG_VERSION="2cfbf9b1f98162a55829a21cc603c76072a75382"
+PKG_SHA256="12986c29a112f989886ceec675f5b11ccd001dcdb1c17a49835970c56aa406d0"
 PKG_LICENSE="APL"
 PKG_SITE="https://github.com/docker/libnetwork"
 PKG_URL="https://github.com/docker/libnetwork/archive/${PKG_VERSION}.tar.gz"
--- a/packages/addons/addon-depends/librespot-depends/rust/package.mk
+++ b/packages/addons/addon-depends/librespot-depends/rust/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="rust"
-PKG_VERSION="1.30.0"
+PKG_VERSION="1.31.1"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
 PKG_DEPENDS_TARGET="toolchain rustup.rs"
--- a/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk
+++ b/packages/addons/addon-depends/librespot-depends/rustup.rs/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="rustup.rs"
-PKG_VERSION="1.3.0"
-PKG_SHA256="c0ca06b70104fed8f1de5a6f5ecfd8478e8bc03f15add8d7896b86b3b15e81e3"
+PKG_VERSION="1.16.0"
+PKG_SHA256="8c4ffeda2088dbdd5ea2eac8acef5ddd57dfcfe1f06a503e3da790f93161e1a6"
 PKG_LICENSE="MIT"
 PKG_SITE="https://www.rust-lang.org"
 PKG_URL="https://github.com/rust-lang-nursery/rustup.rs/archive/$PKG_VERSION.tar.gz"
--- a/packages/addons/addon-depends/librespot-depends/rustup.rs/patches/rustup.rs-01_wget.patch
+++ b/packages/addons/addon-depends/librespot-depends/rustup.rs/patches/rustup.rs-01_wget.patch
@@ -1,115 +0,0 @@
-From 299427ade578adb04a761ebbe7aacc07367fe37a Mon Sep 17 00:00:00 2001
-From: TitanSnow <sweeto@live.cn>
-Date: Sat, 21 Oct 2017 13:08:33 +0800
-Subject: [PATCH 1/2] fallbacks to wget if curl not installed
-
-modify 'rustup-init.sh' to support wget
-if curl not installed. This situation
-often happens on some linux distribution.
---
- rustup-init.sh | 28 ++++++++++++++++++++++++----
- 1 file changed, 24 insertions(+), 4 deletions(-)
-
-diff --git a/rustup-init.sh b/rustup-init.sh
-index 7e089a1fb..a33a31377 100755
--- a/rustup-init.sh
-+++ b/rustup-init.sh
-@@ -9,8 +9,8 @@
- # option. This file may not be copied, modified, or distributed
- # except according to those terms.
- 
-# This is just a little script that can be curled from the internet to
-# install rustup. It just does platform detection, curls the installer
-+# This is just a little script that can be downloaded from the internet to
-+# install rustup. It just does platform detection, downloads the installer
- # and runs it.
- 
- set -u
-@@ -41,8 +41,8 @@ EOF
- }
- 
- main() {
-+    downloader --check
-     need_cmd uname
-    need_cmd curl
-     need_cmd mktemp
-     need_cmd chmod
-     need_cmd mkdir
-@@ -100,7 +100,7 @@ main() {
-     fi
- 
-     ensure mkdir -p "$_dir"
-    ensure curl -sSfL "$_url" -o "$_file"
-+    ensure downloader "$_url" "$_file"
-     ensure chmod u+x "$_file"
-     if [ ! -x "$_file" ]; then
-         printf '%s\n' "Cannot execute $_file (likely because of mounting /tmp as noexec)." 1>&2
-@@ -359,4 +359,24 @@ ignore() {
-     "$@"
- }
- 
-+# This wraps curl or wget. Try curl first, if not installed,
-+# use wget instead.
-+downloader() {
-+    if command -v curl > /dev/null 2>&1
-+    then _dld=curl
-+    elif command -v wget > /dev/null 2>&1
-+    then _dld=wget
-+    else _dld='curl or wget' # to be used in error message of need_cmd
-+    fi
-+
-+    if [ "$1" = --check ]
-+    then need_cmd "$_dld"
-+    elif [ "$_dld" = curl ]
-+    then curl -sSfL "$1" -o "$2"
-+    elif [ "$_dld" = wget ]
-+    then wget "$1" -O "$2"
-+    else err "Unknown downloader"   # should not reach here
-+    fi
-+}
-+
- main "$@" || exit 1
-
-From faa08bd786b7282500cc4162a2f428484c891130 Mon Sep 17 00:00:00 2001
-From: Tibo <delor.thibault@gmail.com>
-Date: Thu, 8 Mar 2018 16:41:19 +1100
-Subject: [PATCH 2/2] Avoid duplication of command -v
-
---
- rustup-init.sh | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/rustup-init.sh b/rustup-init.sh
-index a33a31377..e874aa7a3 100755
--- a/rustup-init.sh
-+++ b/rustup-init.sh
-@@ -331,11 +331,16 @@ err() {
- }
- 
- need_cmd() {
-    if ! command -v "$1" > /dev/null 2>&1
-+    if ! check_cmd "$1"
-     then err "need '$1' (command not found)"
-     fi
- }
- 
-+check_cmd() {
-+    command -v "$1" > /dev/null 2>&1
-+    return $?
-+}
-+
- need_ok() {
-     if [ $? != 0 ]; then err "$1"; fi
- }
-@@ -362,9 +367,9 @@ ignore() {
- # This wraps curl or wget. Try curl first, if not installed,
- # use wget instead.
- downloader() {
-    if command -v curl > /dev/null 2>&1
-+    if check_cmd curl
-     then _dld=curl
-    elif command -v wget > /dev/null 2>&1
-+    elif check_cmd wget
-     then _dld=wget
-     else _dld='curl or wget' # to be used in error message of need_cmd
-     fi
--- a/packages/addons/addon-depends/mono-depends/libgdiplus/package.mk
+++ b/packages/addons/addon-depends/mono-depends/libgdiplus/package.mk
@@ -1,27 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
-
-PKG_NAME="libgdiplus"
-PKG_VERSION="5.6"
-PKG_SHA256="6a75e4a476695cd6a1475fd6b989423ecf73978fd757673669771d8a6e13f756"
-PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/mono/libgdiplus"
-PKG_URL="https://github.com/mono/libgdiplus/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain cairo giflib glib libjpeg-turbo tiff"
-PKG_LONGDESC="An Open Source implementation of the GDI+ API"
-PKG_TOOLCHAIN="autotools"
-
-PKG_CONFIGURE_OPTS_TARGET="--enable-shared               \
-                           --with-libgif=$TARGET_PREFIX  \
-                           --with-libjpeg=$TARGET_PREFIX \
-                           --with-libtiff=$TARGET_PREFIX"
-
-if [ "$DISPLAYSERVER" = "x11" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libXext libexif"
-else
-  PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_TARGET --without-x11"
-fi
-
-makeinstall_target() {
-  make install DESTDIR=$INSTALL
-}
--- a/packages/addons/addon-depends/mpd-mpc/package.mk
+++ b/packages/addons/addon-depends/mpd-mpc/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="mpd-mpc"
-PKG_VERSION="0.30"
-PKG_SHA256="65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce"
+PKG_VERSION="0.31"
+PKG_SHA256="62373e83a8a165b2ed43967975efecd3feee530f4557d6b861dd08aa89d52b2d"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.musicpd.org"
 PKG_URL="https://www.musicpd.org/download/mpc/0/mpc-${PKG_VERSION}.tar.xz"
--- a/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk
+++ b/packages/addons/addon-depends/multimedia-tools-depends/opencaster/package.mk
@@ -10,7 +10,9 @@ PKG_URL="http://ftp.de.debian.org/debian/pool/main/o/opencaster/opencaster_${PKG
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A free and open source MPEG2 transport stream data generator and packet manipulator."

-PKG_MAKE_OPTS_TARGET="CC=$CC"
+pre_configure_target() {
+  PKG_MAKE_OPTS_TARGET="CC=$CC"
+}

 pre_makeinstall_target() {
  mkdir -p $PKG_BUILD/.install_pkg
--- 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"
--- 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
+  :
 }
--- 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"
--- 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"
--- a/packages/addons/addon-depends/network-tools-depends/rar2fs/package.mk
+++ 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 fuse 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() {
+  :
+}
--- a/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk
+++ b/packages/addons/addon-depends/network-tools-depends/tcpdump/package.mk
@@ -19,7 +19,7 @@ pre_configure_target() {
  LDFLAGS+=" -ltirpc"
 }

-pre_build_target() {
+post_configure_target() {
  # discard native system includes
  sed -i "s%-I/usr/include%%g" Makefile
 }
--- a/packages/addons/addon-depends/protobuf/package.mk
+++ b/packages/addons/addon-depends/protobuf/package.mk
@@ -11,8 +11,6 @@ PKG_DEPENDS_HOST="toolchain zlib:host"
 PKG_DEPENDS_TARGET="toolchain zlib protobuf:host"
 PKG_LONGDESC="Protocol Buffers for Google's data interchange format."

-PKG_CMAKE_SCRIPT="$PKG_BUILD/cmake/CMakeLists.txt"
-
 PKG_CMAKE_OPTS_HOST="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \
                     -DBUILD_SHARED_LIBS=0 \
                     -Dprotobuf_BUILD_TESTS=0 \
@@ -21,6 +19,10 @@ PKG_CMAKE_OPTS_HOST="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=1 \

 PKG_CMAKE_OPTS_TARGET="$PKG_CMAKE_OPTS_HOST"

+configure_package() {
+  PKG_CMAKE_SCRIPT="$PKG_BUILD/cmake/CMakeLists.txt"
+}
+
 post_makeinstall_target() {
  rm -rf $INSTALL/usr/bin

--- a/packages/addons/addon-depends/runc/package.mk
+++ b/packages/addons/addon-depends/runc/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="runc"
-PKG_VERSION="69663f0bd4b60df09991c08812a60108003fa340"
-PKG_SHA256="994a3a0447fcbf7e37614b02aa5604d2d6b9fdb41e6870d8d3ff1138ed6e61ef"
+PKG_VERSION="96ec2177ae841256168fcf76954f7177af9446eb"
+PKG_SHA256="96040a78008abad13b412863813011f4cbe55407e513acad1d8509f4ab9b39cd"
 PKG_LICENSE="APL"
 PKG_SITE="https://github.com/opencontainers/runc"
 PKG_URL="https://github.com/opencontainers/runc/archive/${PKG_VERSION}.tar.gz"
--- a/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk
+++ b/packages/addons/addon-depends/snapcast-depends/alsa-plugins/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="alsa-plugins"
-PKG_VERSION="1.1.7"
-PKG_SHA256="a74b405ab6d9e346e6908a853d5e7631cc61038d9b265bc7f37fab16e827da47"
+PKG_VERSION="1.1.8"
+PKG_SHA256="7f77df171685ccec918268477623a39db4d9f32d5dc5e76874ef2467a2405994"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.alsa-project.org/"
 PKG_URL="ftp://ftp.alsa-project.org/pub/plugins/$PKG_NAME-$PKG_VERSION.tar.bz2"
--- a/packages/addons/addon-depends/system-tools-depends/autossh/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/autossh/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="autossh"
-PKG_VERSION="1.4f"
-PKG_SHA256="0172e5e1bea40c642e0ef025334be3aadd4ff3b4d62c0b177ed88a8384e2f8f2"
+PKG_VERSION="1.4g"
+PKG_SHA256="5fc3cee3361ca1615af862364c480593171d0c54ec156de79fc421e31ae21277"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.harding.motd.ca/"
 PKG_URL="http://www.harding.motd.ca/autossh/autossh-${PKG_VERSION}.tgz"
--- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/depends/efivar/package.mk
@@ -2,22 +2,21 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="efivar"
-PKG_VERSION="70e63d4"
-# 0.15 # Todo: later versions with buildproblems
-PKG_SHA256="2638f1faa22e67bf99b4c537f7c21c336a5851a8c91c8dc09555da946a1b84c9"
+PKG_VERSION="3e687d8072f3ed53ae727ec2cb99ae56dbcdf02b"
+PKG_SHA256="810d386c9f4dafc160c721ef73e491c933c311e3df768e27eec50c28ac0f4d97"
 PKG_ARCH="x86_64"
 PKG_LICENSE="LGPL"
-PKG_SITE="https://github.com/vathpela/efivar"
-PKG_URL="https://github.com/vathpela/efivar-devel/archive/$PKG_VERSION.tar.gz"
+PKG_SITE="https://github.com/rhboot/efivar"
+PKG_URL="https://github.com/rhboot/efivar/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain efivar:host"
 PKG_LONGDESC="Tools and library to manipulate EFI variables."

 make_host() {
-  make -C src/ makeguids
+  make -C src/ include/efivar/efivar-guids.h
 }

 make_target() {
-  make -C src/ libefivar.a efivar-guids.h efivar.h
+  make -C src/ libefivar.a libefiboot.a efivar.h efivar
 }

 makeinstall_host() {
@@ -26,9 +25,8 @@ makeinstall_host() {

 makeinstall_target() {
  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp -P src/libefivar.a $SYSROOT_PREFIX/usr/lib/
+    cp -P src/libefivar.a src/libefiboot.a $SYSROOT_PREFIX/usr/lib/

  mkdir -p $SYSROOT_PREFIX/usr/include/efivar
-    cp -P src/efivar.h $SYSROOT_PREFIX/usr/include/efivar
-    cp -P src/efivar-guids.h $SYSROOT_PREFIX/usr/include/efivar
+    cp -P src/include/efivar/*.h $SYSROOT_PREFIX/usr/include/efivar
 }
--- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch
+++ b/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-01-static_lib.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile	2018-10-01 21:30:06.000000000 +0200
+++ b/src/Makefile	2018-10-17 14:16:46.000000000 +0200
+@@ -69,7 +69,7 @@ libefivar.so : | $(GENERATED_SOURCES) li
+ libefivar.so : LIBS=dl
+ libefivar.so : MAP=libefivar.map
+ 
+-efivar : efivar.c | libefivar.so
+efivar : efivar.c | libefivar.a
+ efivar : LIBS=efivar dl
+ 
+ efivar-static : efivar.c $(patsubst %.o,%.static.o,$(LIBEFIVAR_OBJECTS))
--- a/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-makeguids-allocate-fix.patch
+++ b/packages/addons/addon-depends/system-tools-depends/depends/efivar/patches/efivar-makeguids-allocate-fix.patch
@@ -1,32 +0,0 @@
-fix for
-
-./makeguids guids.txt guids.bin names.bin guid-symbols.S efivar-guids.h
-makeguids: malloc.c:2395: sysmalloc: Assertion `(old_top == initial_top (av) && old_size == 0) || ((unsigned long) (old_size) >= MINSIZE && prev_inuse (old_top) && ((unsigned long) old_end & (pagesize - 1)) == 0)' failed.
-
--- a/src/makeguids.c	2014-10-15 06:48:49.000000000 -0700
-+++ b/src/makeguids.c	2016-05-05 05:40:35.964612900 -0700
-@@ -99,10 +99,8 @@
- 	if (rc < 0)
- 		err(1, "makeguids: could not read \"%s\"", argv[1]);
- 
-	/* strictly speaking, this *has* to be too large. */
-	struct guidname *outbuf = calloc(inlen, sizeof (char));
-	if (!outbuf)
-		err(1, "makeguids");
-+	/* reallocate later to required size */
-+	struct guidname *outbuf = NULL;
- 
- 	char *guidstr = inbuf;
- 	unsigned int line;
-@@ -133,6 +131,11 @@
- 			err(1, "makeguids: \"%s\": 4 invalid data on line %d",
- 				argv[1], line);
- 
-+		outbuf = realloc(outbuf, line * sizeof (struct guidname));
-+		if (!outbuf)
-+			err(1, "makeguids");
-+
-+		bzero(&outbuf[line-1], sizeof (struct guidname));
- 		memcpy(&outbuf[line-1].guid, &guid, sizeof(guid));
- 		strcpy(outbuf[line-1].symbol, "efi_guid_");
- 		strncat(outbuf[line-1].symbol, symbol,
--- a/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/depends/libssh2/package.mk
@@ -9,6 +9,7 @@ PKG_SITE="https://www.libssh2.org"
 PKG_URL="https://www.libssh2.org/download/libssh2-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain openssl"
 PKG_LONGDESC="A library implementing the SSH2 protocol"
+PKG_BUILD_FLAGS="+pic"

 PKG_CMAKE_OPTS_TARGET="-DBUILD_EXAMPLES=OFF \
                       -DBUILD_TESTING=OFF"
--- a/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/depends/oniguruma/package.mk
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="oniguruma"
+PKG_VERSION="6.9.1"
+PKG_SHA256="c7c3feb7be45a5cc9f2dec239b4a317a422e6ffea299cf91ffab1b926633ea12"
+PKG_LICENSE="BSD"
+PKG_SITE="https://github.com/kkos/oniguruma"
+PKG_URL="https://github.com/kkos/oniguruma/releases/download/v$PKG_VERSION/onig-$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain"
+PKG_LONGDESC="A regular expression library"
--- a/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/efibootmgr/package.mk
@@ -2,18 +2,22 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="efibootmgr"
-PKG_VERSION="95f7a63"
-PKG_SHA256="a6f936508c5b50b6fb5693dd2f0db911da298da0f72ffc0e2e74b09b22592fd1"
+PKG_VERSION="99b578501643377e0b1994b2a068b790d189d5ad"
+PKG_SHA256="04bc45dc8a841985d78d8df87b3475eb6e1122f993fae975197bf3adbc6e3341"
 PKG_ARCH="x86_64"
 PKG_LICENSE="GPL"
-PKG_SITE="https://github.com/vathpela/efibootmgr"
-PKG_URL="https://github.com/vathpela/efibootmgr-devel/archive/$PKG_VERSION.tar.gz"
+PKG_SITE="https://github.com/rhboot/efibootmgr"
+PKG_URL="https://github.com/rhboot/efibootmgr/archive/$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain efivar pciutils zlib"
 PKG_LONGDESC="Tool to modify UEFI Firmware Boot Manager Variables."

-pre_make_target() {
-  export EXTRA_CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include -I$SYSROOT_PREFIX/usr/include/efivar -fgnu89-inline"
+make_target() {
+  export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include -I$SYSROOT_PREFIX/usr/include/efivar -fgnu89-inline"
  export LDFLAGS="$LDFLAGS -L$SYSROOT_PREFIX/usr/lib -ludev -ldl"
+
+  make EFIDIR=BOOT EFI_LOADER=bootx64.efi PKG_CONFIG=true \
+    LDLIBS="-lefiboot -lefivar" \
+    efibootmgr
 }

 makeinstall_target() {
--- a/packages/addons/addon-depends/system-tools-depends/efibootmgr/patches/efibootmgr-kernel-4.4.patch
+++ b/packages/addons/addon-depends/system-tools-depends/efibootmgr/patches/efibootmgr-kernel-4.4.patch
@@ -1,12 +0,0 @@
-diff -Naur efibootmgr-ceb177a/src/lib/scsi_ioctls.c efibootmgr-ceb177a.patch/src/lib/scsi_ioctls.c
--- efibootmgr-ceb177a/src/lib/scsi_ioctls.c	2014-10-21 22:17:27.000000000 +0200
-+++ efibootmgr-ceb177a.patch/src/lib/scsi_ioctls.c	2016-03-26 13:49:59.119669675 +0100
-@@ -24,7 +24,7 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-#include <linux/nvme.h>
-+#include <linux/nvme_ioctl.h>
- #include "scsi_ioctls.h"
- 
- int
--- a/packages/addons/addon-depends/system-tools-depends/file/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/file/package.mk
@@ -2,13 +2,13 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="file"
-PKG_VERSION="2198460"
-PKG_SHA256="d825eeee9e0a20b79dbcd00c51022b69fe4468354d8ccc03f441eb349ad8bde0"
+PKG_VERSION="d1ff3af7a2c6b38bdbdde7af26b59e3c50a48fff"
+PKG_SHA256="acc16f878576ad0bb29bbb7c724e29d2827f14ddb39fe94d76c3a859d4a3d0d9"
 PKG_LICENSE="BSD"
 PKG_SITE="http://www.darwinsys.com/file/"
 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_DEPENDS_TARGET="toolchain file:host zlib"
 PKG_LONGDESC="The file utility is used to determine the types of various files."
 PKG_TOOLCHAIN="autotools"

--- a/packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/getscancodes/package.mk
@@ -10,7 +10,9 @@ PKG_URL="$SOURCEFORGE_SRC/keytouch/getscancodes-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Shows the scancode of the pressed or released key."

-PKG_MAKE_OPTS_TARGET="CC=$CC"
+pre_configure_target() {
+  PKG_MAKE_OPTS_TARGET="CC=$CC"
+}

 makeinstall_target() {
  : # nop
--- a/packages/addons/addon-depends/system-tools-depends/hddtemp/db/hddtemp.db
+++ b/packages/addons/addon-depends/system-tools-depends/hddtemp/db/hddtemp.db
@@ -0,0 +1,523 @@
+#
+# Insert a regular expression for support of the model or the serie of your hard drive.
+# If you don't know what to put in the second field, put the number
+# that appears most often for your brand :o)
+# A value of zero meens that we know that the drive doesn't have
+# a temperature sensor (you can set the unit to C or F).
+#
+############################################################################
+# The following list was found at (http://www.almico.com/forumharddisks.php)
+# If your drive is in the list send me a mail.
+#
+# Manufacturer	 Model	 Size	Notes
+# FUJITSU FUJITSU MPF3102AH 10.0GB
+# FUJITSU FUJITSU MPG3204AH E 20.0GB
+# FUJITSU FUJITSU MPG3307AT 30.0GB
+# FUJITSU FUJITSU MPG3409AH 40.0GB
+# FUJITSU FUJITSU MPG3409AH EF 40.0GB
+# HITACHI HITACHI_DK23CA-10 9.8GB
+# HITACHI HITACHI_DK23CA-15 14.7GB
+# SAMSUNG SAMSUNG SV3012H 29.4GB
+# SEAGATE ST310210A 10.0GB
+# SEAGATE ST310211A 9.8GB
+# SEAGATE ST310215A 10.0GB
+# SEAGATE ST315320A 14.9GB
+# SEAGATE ST320410A 19.6GB
+# SEAGATE ST320413A 19.6GB
+# SEAGATE ST320420A 19.9GB
+# SEAGATE ST330610A 29.3GB
+# SEAGATE ST330620A 29.3GB
+# SEAGATE ST330621A 29.3GB
+# SEAGATE ST330630A 29.9GB
+# SEAGATE ST340016A 39.1GB
+# SEAGATE ST340810ACE 39.1GB
+# SEAGATE ST380020ACE 78.2GB
+# WESTERN DIGITAL WDC AC210200D 10.0GB
+# WESTERN DIGITAL WDC AC29100D 8.9GB
+# WESTERN DIGITAL WDC AC420400D 19.9GB
+# WESTERN DIGITAL WDC WD102AA 10.0GB
+#
+#################################################
+
+########################################
+############# ExcelStor drives
+########################################
+# "ExcelStor Technology CT215"	  ??? ? "ExcelStor CT215"
+"ExcelStor Technology J3.0" 194 C "ExcelStor Technology 3xy (xy GB)"
+"ExcelStor Technology J6.0" 194 C "ExcelStor Technology 6xy (xy GB)"
+"ExcelStor Technology J680" 194 C "ExcelStor Technology J680 (80 GB)"
+"ExcelStor Technology J860" 194 C "ExcelStor Technology J860 (60 GB)"
+"ExcelStor Technology J880" 194 C "ExcelStor Technology J880 (80 GB)"
+
+
+
+########################################
+############# Fujitsu drives
+########################################
+"FUJITSU MHM2100AT"		0    C	"Fujitsu MHM2100AT"
+
+"FUJITSU MHN2150AT"		194  C	"Fujitsu MHN2150AT"
+"FUJITSU MHN2200AT"		194  C	"Fujitsu MHN2200AT"
+"FUJITSU MHN2300AT"		194  C	"Fujitsu MHN2300AT"
+
+"FUJITSU MHR2020AT"		194  C	"Fujitsu MHR2020AT"
+"FUJITSU MHR2030AT"		194  C	"Fujitsu MHR2030AT"
+
+"FUJITSU MHS2030AT"		194  C	"Fujitsu MHS2030AT"
+"FUJITSU MHS2040AT"		194  C	"Fujitsu MHS2040AT"
+"FUJITSU MHS2060AT"		194  C	"Fujitsu MHS2060AT (Apple PowerBook G4)"
+
+"FUJITSU MHT2030AC"		194  C	"Fujitsu Mobile 30GB, 2MB, 4200RPM (automotive)"
+
+"FUJITSU MHT2030AT"		194  C	"Fujitsu MHT2030AT"
+"FUJITSU MHT2040AH"		194  C	"Fujitsu MHT2040AH"
+"FUJITSU MHT2040AT"		194  C	"Fujitsu MHT2040AT"
+"FUJITSU MHT2060AH"		194  C	"Fujitsu MHT2060AH"
+"FUJITSU MHT2060AT"		194  C	"Fujitsu MHT2060AT"
+"FUJITSU MHT2080AH"		194  C	"Fujitsu MHT2080AH"
+
+"FUJITSU MHU2100AT"		194  C	"Fujitsu MHU2100AT 100GB, 8MB (4200RPM)"
+
+"FUJITSU MHV2100AH"		194  C	"FUJITSU MHV2100AH" 
+"FUJITSU MHV2100AT"		194  C	"FUJITSU MHV2100AT" 
+"FUJITSU MHV2080[AB]H"		194  C	"FUJITSU MHV2080AH"
+
+"FUJITSU MPF3204AH"		194  C	"Fujitsu MPF3204AH"
+
+"FUJITSU MPG3204AT.*"		194  C	"Fujitsu MPG3204AT"
+"FUJITSU MPG3307AT"		194  C	"Fujitsu MPG3307AT"
+"FUJITSU MPG3409AT.*"		194  C	"Fujitsu MPG3409AT E"
+"FUJITSU MPG3409AH.*"		194  C	"Fujitsu MPG3409AH E"
+"FUJITSU MPG3204AH"		194  C	"Fujitsu MPG3204AH"
+"FUJITSU MPG3102AT E"		194  C	"FUJITSU MPG3102AT E"
+
+
+
+########################################
+############# Hitachi drives
+########################################
+"HITACHI_DK13FA-40B"			194  C	"Hitachi DK13FA-40B"
+"HITACHI_DK228A-65"			0    C	"Hitachi DK228A-65"
+"HITACHI_DK23CA-(15|20|30|30B|75)"	194  C	"Hitachi DK23CA series"
+"HITACHI_DK23DA-[234]0"			194  C	"Hitachi DK23DA series"
+"HITACHI_DK23EA-[2346]0"		194  C	"Hitachi DK23EA series"
+"HITACHI_DK23EB-40"			194  C	"Hitachi DK23EB series"
+"HITACHI_DK23FA-[468]0"			194  C	"Hitachi DK23FA series"
+"HITACHI_DK23FB-[46]0"			194  C	"Hitachi DK23FB series"
+
+"HDS722516VLAT[28]0"		194  C	"Hitachi Deskstar 7K250 160GB 2/8MB cache"
+"HDS722525VLAT80"		194  C	"Hitachi Deskstar 7K250 200/250GB, 7200RPM, 8MB, Parallel-ATA"
+"HDS722512VLAT80"		194  C	"Hitachi Deskstar 7K250 80GB"
+"HDS722540VLAT20"		194  C	"Hitachi Deskstar 7K250, 40GB, 7200RPM, 2MB cache"
+"HDS722580VLAT20"		194  C	"Deskstar 7K250 60GB"
+"HDS724040KLSA80"		194  C	"Hitachi Deskstar 7K250 400GB, 7200RPM, 8MB, Serial-ATA"
+"HDS728080PLAT20"		194  C	"Hitachi Deskstar 7K80 80GB"
+
+"HDS722525VLSA80"		194  C	"Hitachi Deskstar 7K250 250GB, 7200RPM, 8MB, SATA"
+"HDS722516VLSA80"               194  C  "Hitachi Deskstar 7K250 160GB 8Mo cache SATA"
+"HDS722580VLSA80"		194  C	"Hitachi Deskstar 7K250 80GB SATA"
+"HDS728040PLAT20"		194  C	"Hitachi Deskstar 7K80 40GB"
+
+"HDS724040KLAT80"               194  C  "Hitachi Deskstar 7K400  400GB 8Mo cache PATA"
+
+"HDT7225(16|25)DLAT80"		194  C	"Hitachi Deskstar T7K250 series, 7200RPM, 8MB, PATA"
+"HDT722516DLA380 V43O"		194  C	"Hitachi T7K250 SATA"
+"HDT722525DLA380"               194  C  "Hitachi Deskstar T7K250 250GB 8Mo cache SATAII"
+"HDT725050VLA360"               194  C  "Hitachi Deskstar T7K500 500GB, 7200RPM, 16MB, SATA II"
+
+"HTE721010G9AT00"		194  C	"Hitachi Travelstar 100GB (7200RPM)"
+"HTE726060M9AT00"		194  C	"Hitachi Travelstar 60GB (7200RPM)"
+"HTS424030M9AT00"		194  C	"Hitachi Travelstar 30GB (4200RPM)"
+"HTS424040M9AT00"		194  C	"Hitachi Travelstar 4K40 40GB 2MB cache (4200RPM)"
+"HTS541010G9SA00"		194  C  "Hitachi Travelstar 100GB SATA"
+"HTS541040G9AT00"		194  C	"Hitachi Travelstar 40GB (5400RPM)"
+"HTS541080G9AT00"		194  C	"Hitachi Travelstar 80GB (5400RPM)"
+"HTS548020M9AT00"		194  C	"Hitachi Travelstar 20GB (5400RPM)"
+"HTS548030M9AT00"		194  C	"Hitachi Travelstar 30GB (5400RPM)"
+"HTS548040M9AT00"		194  C	"Hitachi Travelstar 40GB (5400RPM)"
+"HTS548060M9AT00"		194  C	"Hitachi Travelstar 60GB (5400RPM)"
+"HTS548080M9AT00"		194  C	"Hitachi Travelstar 80GB (5400RPM)"
+"HTS721080G9AT00"		194  C	"Hitachi Travelstar 7K100 80GB (7200RPM)"
+"HTS726060M9AT00"		194  C	"Hitachi Travelstar 60GB"
+
+
+########################################
+############# IBM drives
+########################################
+
+# DJSA serie is using F0h command to report temperature and also have
+# SMART capabilties but it was reported not to work.
+# "DJSA-2(30|32|10|20|05)"	0    C	"IBM Travelstar 20GN, 32GH, 30GT series"
+
+"IBM-DARA-212000"		0    C	"IBM Travelstar 12GN"
+"IBM-DTTA-35*"			0    C	"IBM Deskstar 16GP serie"
+
+# according to specifications they do not seems to have sensor
+# but I prefer waiting for a report
+#"IBM-DTTA-37*"			0    C	"IBM Deskstar 14GXP serie"
+
+"IBM-DJNA-35.*"			231  C	"IBM Deskstar 25 GP serie"
+"IBM-DJNA-37.*"			231  C	"IBM Deskstar 22 GXP serie"
+"IBM-DHEA-(34330|36480)"	0    C	"IBM Deskstar 5 serie"
+"IBM-DHEA-(34331|36481|38451)"	0    C	"IBM Deskstar 8 serie"
+"IBM-DPTA-37.*"			231  C	"IBM Deskstar 34GXP serie"
+"IBM-DPTA-35.*"			231  C	"IBM Deskstar 37GP serie"
+"IBM-DTLA-30[57]0[123467][05]"	194  C	"IBM Deskstar 40GV & 75GXP series"
+"IC25N0[1234]0ATCS04-0"		194  C	"IBM Travelstar 40GN serie"
+"IC25N0[24]0ATC[SX]05-0"	194  C	"IBM Travelstar 40GNX serie"
+"IC25N0(10|15|20|30)ATDA04-0"	194  C	"IBM Travelstar 30GN serie"
+"IC25N0[23468]0ATMR04*"		194  C	"Hitachi Travelstar 80GN"
+"IC25T048ATDA05-0"		194  C	"IBM Travelstar 48GH serie"
+"IC25T060ATC[SX]05-0"		194  C	"IBM Travelstar 60GH serie"
+"IC35L0[12346]0AVER07"		194  C	"IBM Deskstar 60GXP serie"
+"IC35L[01][02468]0AVV[AN]07*"	194  C	"IBM Deskstar 120GXP serie"  
+"IC35L[01][23689]0AVV207*"	194  C	"IBM Deskstar 180GXP serie"
+
+########################################
+############# Maxtor drives
+########################################
+#"Maxtor 2B0[012][04568]H1"				???  C	"Maxtor Fireball 541DX"
+"Maxtor 2F0[234]0[LJ]0"					194  C	"Maxtor Fireball 3" 
+# which one must I trust ?
+#"Maxtor 4D040H2"					9    C	"Maxtor DiamondMax D540X-4D"
+#"Maxtor 4D040H2"					0    C	"Maxtor 4D040H2"
+#"Maxtor 4D080H4"					12   C	"Maxtor DiamondMax D540X-4D"
+#"Maxtor 4D060H3"					12   C	"Maxtor DiamondMax D540X-4D"
+#"Maxtor 4D080H4"					9    C	"Maxtor DiamondMax D540X-4D"
+"MAXTOR 4K0[468]0H[234]"				194  C	"Maxtor DiamondMax D540X serie"
+"MAXTOR 4K020H1"					194  C	"Maxtor 4K020H1"
+"Maxtor 4A300J0"                                        194  C  "Maxtor MaxLine II 300GB 5400RPM"
+"Maxtor 4[RA](25|16|12|08|06)0[LJ]0"			194  C	"Maxtor DiamondMax 16"
+"Maxtor 5(1024|1369|2049|2732|3073|4098)U(2|3|4|6|8)"	0    C	"Maxtor DiamondMax Plus 40"
+"Maxtor 5A250J0"					194  C	"Maxtor MaXline II 250GB 5400RPM"
+"Maxtor 5A300J0"					194  C	"Maxtor 5A300J0"
+"Maxtor 5T0[24]0H[24]"					0    C	"Maxtor DiamondMax Plus 60"
+"Maxtor 6E0[234]0L0"					194  C	"Maxtor DiamondMax Plus 8"
+"MAXTOR 6L0[2468]0[LJ][1234]"				194  C	"Maxtor DiamondMax Plus D740X family"
+"Maxtor 6V320F0"					194  C  "Maxtor Diamond Max 10 SATA II 320 GB"
+"Maxtor 6Y(06|08|12|16|20|25)0[LPM]0"			194  C	"Maxtor DiamondMax Plus 9" 
+"Maxtor 7L300[RS]0"					194  C  "Maxtor 7L300R0 MaxLine+III 300GB 7200rpm"
+"Maxtor 7Y250[PM]0"					194  C	"Maxtor MaXLine Plus II 250GB 7200RPM"
+"Maxtor 94098U8"					11   C	"Maxtor DiamondMax 40 94098U8"
+
+#"Maxtor 6(B|L)(08|12|16|20|25|30)0[RSPM]0"		194  C	"Maxtor DiamondMax Plus 10"
+"Maxtor 6B080M0"					194  C  "Maxtor DiamondMax 10 80GB 8MB SATA"
+"Maxtor 6B120M0"					194  C  "Maxtor DiamondMax 10 120GB 8MB SATA"
+"Maxtor 6B160M0"					194  C  "Maxtor DiamondMax 10 160GB 8MB SATA"
+"Maxtor 6B160P0"					194  C  "Maxtor DiamondMax 10 160GB 8MB ATA/133"
+"Maxtor 6B200M0"					194  C  "Maxtor DiamondMax 10 200GB 8MB SATA"
+"Maxtor 6B200P0"					194  C  "Maxtor DiamondMax 10 200GB 8MB ATA/133"
+"Maxtor 6B250R0"					194  C  "Maxtor DiamondMax 10 250GB 16MB ATA/133"
+"Maxtor 6B250S0"					194  C  "Maxtor DiamondMax 10 250GB 16MB SATA"
+"Maxtor 6B300R0"					194  C  "Maxtor DiamondMax 10 300GB 16MB ATA/133"
+"Maxtor 6B300S0"					194  C  "Maxtor DiamondMax 10 300GB 16MB SATA"
+"Maxtor 6L080L0"					194  C  "Maxtor DiamondMax 10 80GB 2MB ATA/133 RoHS"
+"Maxtor 6L080M0"					194  C  "Maxtor DiamondMax 10 80GB 8MB SATA RoHS"
+"Maxtor 6L080P0"					194  C  "Maxtor DiamondMax 10 80GB 8MB ATA/133 RoHS"
+"Maxtor 6L120M0"					194  C  "Maxtor DiamondMax 10 120GB 8MB SATA RoHS"
+"Maxtor 6L120P0"					194  C  "Maxtor DiamondMax 10 120GB 8MB ATA/133 RoHS"
+"Maxtor 6L160M0"					194  C  "Maxtor DiamondMax 10 160GB 8MB SATA RoHS"
+"Maxtor 6L160P0"					194  C  "Maxtor DiamondMax 10 160GB 8MB ATA/133 RoHS"
+"Maxtor 6L200M0"					194  C  "Maxtor DiamondMax 10 200GB 8MB SATA RoHS"
+"Maxtor 6L200P0"					194  C  "Maxtor DiamondMax 10 200GB 8MB ATA/133 RoHS"
+"Maxtor 6L250R0"					194  C  "Maxtor DiamondMax 10 250GB 16MB ATA/133 RoHS"
+"Maxtor 6L250S0"					194  C  "Maxtor DiamondMax 10 250GB 16MB SATA RoHS"
+"Maxtor 6L300R0"					194  C  "Maxtor DiamondMax 10 300GB 16MB ATA/133 RoHS"
+"Maxtor 6L300S0"					194  C  "Maxtor DiamondMax 10 300GB 16MB SATA RoHS"
+"Maxtor 6V080E0"					194  C  "Maxtor DiamondMax 10 80GB 8MB SATAII RoHS"
+"Maxtor 6V160E0"					194  C  "Maxtor DiamondMax 10 160GB 8MB SATAII RoHS"
+"Maxtor 6V200E0"					194  C  "Maxtor DiamondMax 10 200GB 8MB SATAII RoHS"
+"Maxtor 6V250F0"					194  C  "Maxtor DiamondMax 10 250GB 16MB SATAII RoHS"
+"Maxtor 6V300F0"					194  C  "Maxtor DiamondMax 10 300GB 16MB SATAII RoHS"
+
+
+
+########################################
+############# Quantum drives
+########################################
+"QUANTUM FIREBALLP AS40.0"		0  C  "Quantum Fireball AS40"
+"QUANTUM FIREBALL CX10.2A"		0  C  "Quantum Fireball CX10.2A"
+#"QUANTUM FIREBALLlct10 20"		4  C  "Quantum Fireball CT10 20GB"
+# I suspect the QUANTUM FIREBALL_TM2110A to have a sensor in field 9...
+# "QUANTUM FIREBALL_TM2110A"		9  C  "Quantum Fireball TM2110A"
+
+
+
+########################################
+############# Samsung drives
+########################################
+# somenone reported a problem with the SP8004H which reports a temperature
+# 10<31>C below the ambient temperature
+"SAMSUNG HA(200|250)JC"					194  C	"Samsung SpinPoint V120CE series"
+"SAMSUNG HD160JJ"                                       194  C  "Samsung 160GB, 7200RPM, 8MB cache, SATA" 
+"SAMSUNG HD160JJ/P"					194  C	"Samsung SpinPoint P80 SD 160GB (7200RPM, 8MB cache)"
+"SAMSUNG HD[30|32|40][01]L[DJ]"                         194  C  "Samsung SpinPoint T133 series (300-400MB)"
+"SAMSUNG HD250KD"                                       194  C  "Samsung SpinPoint T133 series (250 MB PATA)"
+"SAMSUNG HD321KJ"					194  C  "Samsung Spinpoint T166 (7200RPM, 16MB cache) - SATA"
+"SAMSUNG HD501LJ"					194  C  "Samsung HD501LJ"
+"SAMSUNG MP0(302|402|603|804)H"				194  C	"Samsung SpinPoint M40 2.5inch"
+"SAMSUNG SW0434A"					0    C	"Samsung SW0434A"
+"SAMSUNG SP(2001|4002|6003|8004|40A2)H"			194  C	"Samsung SpinPoint P40 serie"
+"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)N"	194  C	"Samsung SpinPoint P80 serie"
+"SAMSUNG SP(0612|0802|1203|1604|0812|1213|1614)C"	194  C	"Samsung SpinPoint P80 series - SATA"
+"SAMSUNG SP0411N"					194  C	"Samsung SpinPoint PL40 serie"
+"SAMSUNG SP0822N"					194  C	"Samsung SP0822N"
+"SAMSUNG SP(0812|1213|1614)C"				194  C	"Samsung Spinpoint 160G SATA"
+"SAMSUNG SP2[05]14N"					194  C	"Samsung SpinPoint P120 series (7200RPM, 8MB cache)"
+"SAMSUNG SP2[05]04C"					194  C	"Samsung SpinPoint P120 series - SATA"
+"SAMSUNG SV0432A"					0    C	"Samsung SV0432A"
+"SAMSUNG SV3002H"					0    C	"Samsung SpinPoint V30 serie"
+"SAMSUNG SV(2001|4002|4012|6003|8004)H"			194  C	"Samsung SpinPoint V40 serie"
+#"SAMSUNG SV(0221|0602|0813|1204)H"			9    C	"Samsung SpinPoint V60 serie"
+#"SAMSUNG SV1204H"					194  C	"Samsung 120G"
+"SAMSUNG SV(0401|0802|1203|1604)N"			194  C	"Samsung SpinPoint V80 serie"
+"SAMSUNG SV4012H"					194  C	"Samsung 40GB, 5400RPM, 2MB cache"
+
+########################################
+############# Seagate drives
+########################################
+"Seagate Technology 1275MB - ST31276A"	0    C	"Seagate ST31276A"
+"ST3412A"				0    C	"Seagate ST3412A"
+"ST38641A"				0    C	"Seagate ST38641A"
+"ST310014A"				194  C	"Seagate ST310014A"
+"ST310210A"				0    C	"Seagate ST310210A"
+"ST310211A"				194  C	"Seagate ST310211A"
+"ST310220A"				0    C	"Seagate ST310220A"
+# SEAGATE ST313021A 13.0GB
+"ST313021A"				0    C	"Seagate U8 ST313021A"
+"ST310240A"				0    C	"Seagate Medalist 10240 Ultra ATA-3"
+"ST315320A"				194  C	"Seagate ST315320A"
+"ST320423A"				0    C	"Seagate U10 20423, Ultra ATA/66"
+"ST320011A"				194  C	"Seagate ST320011A"
+"ST320014A"				194  C	"Seagate ST320014A (5400 rpm, 20Gb)"
+"ST320410A"				194  C	"Seagate ST320410A"
+"ST320413A"				194  C	"Seagate ST320413A"
+"ST320414A"				194  C	"Seagate ST320414A"
+"ST320420A"				194  C	"Seagate Barracuda II ST320420A"
+"ST330013A"				194  C	"Seagate ST330013A Barracuda ATA V 30GB, 7200 rpm"
+"ST330620A"				194  C	"Seagate ST330620A"
+"ST330621A"				194  C	"Seagate ST330621A"
+"ST330630A"				194  C	"Seagate Barracuda ST330630A"
+"ST340014A"				194  C	"Seagate Barracuda 7200.7 40Gb"
+"ST340015A"				194  C	"Seagate Barracuda 5400.1 40GB" 
+"ST340016A"				194  C	"Seagate ST340016A"
+"ST340810A"				194  C	"Seagate U Series 40810 (40Gb, Ultra ATA/100, 5400 rpm)"
+"ST340823A"				194  C	"Seagate U Series 5 40823"
+"ST340824A"				194  C	"Seagate Barracuda III"
+"ST360015A"				194  C	"Seagate Barracuda V ST360015A"
+"ST360020A"				194  C	"Seagate U Series 60020"
+"ST360021A"				194  C	"Seagate Barracuda IV ST360021A"
+"ST380011A"				194  C	"Seagate Barracuda 7200.7 80GB"
+"ST380012A"				194  C	"Seagate ST380012A 80GB"
+"ST380013A"				194  C	"Seagate Barracuda 7200.7 80GB" 
+"ST380013AS"				194  C	"Seagate Barracuda 7200.7 80GB (Serial ATA)"
+"ST380020A"				194  C	"Seagate U Series 80020 (80Gb, Ultra ATA/100, 5400 rpm)"
+"ST380021A"				194  C	"Seagate Barracuda IV ST380021A"
+"ST380022A"				194  C	"Seagate Barracuda U7 80022, Ultra ATA/100"
+"ST380023A"				194  C	"Seagate Barracuda V ST380023A"
+"ST380817AS"				194  C	"Seagate Barracuda 7200.7 80GB - SATA"
+"ST39111A"				194  C	"Seagate ST39111A (from Sun Ultra)"
+"ST3120020A"				194  C	"Seagate ST3120020A"
+"ST3120022A"				194  C	"Seagate Baraccuda 7200.7 120GB"
+"ST3120023A"				194  C	"Seagate Barracuda V ST3120023A"
+"ST3120024A"				194  C	"Seagate Barracuda V ST3120024A"
+"ST3120025ACE"				194  C	"Seagate Barracuda V ST3120025ACE"
+"ST3120026A"				194  C	"Seagate Barracuda V ST3120026A"
+"ST3160021A"				194  C	"Seagate Barracuda 7200.7 - ST3160021A"
+"ST3160023(A|AS)"			194  C	"Seagate Barracuda V ST3160023A and AS (160Gb, ATA100 or Serial ATA)"
+"ST3160827AS"				194  C	"Seagate Barracuda 7200.7 160GB (Serial ATA)" 
+"ST3200021A"				194  C	"Seagate Barracuda 7200.7 Plus 200GB"
+"ST3200822(A|AS)"			194  C	"Seagate Barracuda 7200.7 Plus 200GB (PATA or SATA)"
+"ST3200826A"				194  C	"Seagate Barracuda 7200.8 200Gb"
+"ST3250623A"				194  C	"Seagate Barracuda 7200.16 250GB"
+"ST3250823A"				194  C	"Seagate Barracuda 7200.8 250GB"
+"ST3250823A"				194  C	"Seagate Barracuda 7200.7 Plus 250GB"
+"ST3250823NS"				194  C	"Seagate NL35 SATA (RAID-Edition) 7200 250GB"
+"ST3300831A"				194  C	"Seagate 300GB ST3300831A"
+"ST3400832A"				194  C	"Seagate Barracuda 7200.8 Plus 400GB"
+"ST3400633(A|AS)"                       194  C  "Seagate Barracuda 7200.7 400 GB"
+"ST3500630NS"				194  C  "Seagate"
+"ST3400632NS"				194  C	"Seagate"
+"ST3320620AS"                           194  C  "Seagate Barracuda 7200.7 320 GB"
+"ST3500630AS"                           194  C  "Seagate Barracuda 7200.7 500 GB"
+"ST3802110A"				194  C	"Seagate Barracuda 7200.9 80 GB"
+"ST910021A"				194  C	"Seagate Momentus 7200.1 100GB" 
+"ST910082[35]A"				194  C	"Seagate Momentus 5400.2 100GB"
+"ST9120821A"				194  C	"Seagate Momentus 5400.2 120GB"
+"ST94019A"				194  C	"Seagate ST94019A"
+"ST94813A"				194  C	"Seagate Momentus 5400.2 40GB"
+"ST94[08]11A"				194  C	"Seagate ST94011A"
+"ST960821A"				194  C	"Seagate ST960821A"
+"ST960822A"				194  C	"Seagate Momentus 5400.2 60GB"
+"ST96812AS"				194  C	"Seagate Momentus 5400.2 60GB SATA"
+"ST9808211A"				194  C	"Seagate Momentus 5400.2 80GB"
+
+########################################
+############# TOSHIBA Laptops
+########################################
+"MK4313MAT"				220  C	"Toshiba MK4313MAT"
+"TOSHIBA MK1032GAX"			194  C	"Toshiba MK1032GAX"
+"TOSHIBA MK1517GAP"			0    C	"Toshiba MK1517GAP"
+"TOSHIBA MK2018GAS"			226  F	"Toshiba MK2018GAS"
+"TOSHIBA MK2023GAS"			194  C	"Toshiba MK2023GAS"
+
+"TOSHIBA MK3017GAP"			0    C	"Toshiba MK3017GAP"
+"TOSHIBA MK3021GAS"			194  C	"Toshiba MK3021GAS"
+"TOSHIBA MK3025GAS"			194  C	"Toshiba MK3025GAS" 
+
+#"TOSHIBA MK4019GAX"			222  C	"Toshiba MK4019GAX"
+"TOSHIBA MK4021GAS"			194  C	"Toshiba MK4021GAS"
+"TOSHIBA MK4025GAS"			194  C	"Toshiba MK4025GAS 40 Go"
+"TOSHIBA MK4026GAS"			194  C	"Toshiba MK4026GAS 40 Go"
+"TOSHIBA MK4032GAX"			194  C	"Toshiba MK4032GAX" 
+
+"TOSHIBA MK6021GAS"			194  C	"Toshiba MK6021GAS"
+"TOSHIBA MK6022GAX"			194  C	"Toshiba MK6022GAX"
+"TOSHIBA MK6025GAS"			194  C	"Toshiba MK6025GAS"
+"TOSHIBA MK6026GAX"			194  C	"Toshiba MK6026GAX" 
+"TOSHIBA MK8025GAS"			194  C	"Toshiba MK8025GAS"
+"TOSHIBA MK8026GAX"			194  C	"Toshiba MK8026GAX" 
+
+"MK4025GAS"				194  C	"Toshiba MK4025GAS"
+
+
+########################################
+############# Western Digital drives
+########################################
+# WDC AC310100B and WDC AC2850F are reported not working
+# no more informations were given
+"WDC AC22000L"							  0 C "Western Digital Caviar AC22000"
+"WDC AC420400D"							231 C "Western Digital Caviar AC420400D"
+"WDC AC418000D"							231 C "Western Digital AC418000D"
+"WDC WD135BA"							231 C "Western Digital WD135BA"
+
+"WDC WD100EB-00BHF0"						  0 C "Western Digital 100EB-00BHF0"
+"WDC WD200BB-00AUA1"						  0 C "Western Digital Caviar WD200BB"
+#"WDC WD200BB-60DGA0"						  0 C "Western Digital Caviar WD200BB"
+"WDC WD300BB-00CAA0"						  0 C "Western Digital WD300BB"
+"WDC WD360GD-00FNA0"						194 C "Western Digital SATA Raptor 36.7GB"
+"WDC WD400BB-00CAA0"						  0 C "Western Digital 400BB-00CAA0"
+"WDC WD400BB-00J[KH]A0"						194 C "Western Digital Caviar WD400BB"
+"WDC WD400BB-23JHC0"						194 C "Western Digital 23JHC0"
+#"WDC WD400BB-00GFA0"						  0 C ""
+"WDC WD400BB-55HEA0"						194 C "Western Digital Caviar WD400BB"
+"WDC WD400BB-(18CA|00DE)A0"					  0 C "Western Digital Caviar WD400BB"
+"WDC WD400BB-75FJA1"						194 C "Western Digital Caviar WD400BB"
+"WDC WD400EB-00CPF0"						  0 C "Western Digital 400EB-00CPF0"
+"WDC WD400JB-00(JJ|FM|FS)A0"					194 C "Western Digital Caviar 40GB Special Edition 8MB"
+"WDC WD400JB-00ETA0"						194 C "Western Digital 400JB-00ETA0"
+"WDC WD400JB-00JJC0"						194 C "Western Digital 400JB-00JJC0 40GB"
+"WDC WD400LB-00DNA0"						194 C "Western Digital 400LB-00DNA0"
+"WDC WD400UE-22HCT0"						194 C "Western Digital 40GB Notebook HDD"
+"WDC WD400VE-75HDT1"						194 C "Western Digital Scorpio 40GB"
+"WDC WD600BB-32BSA0"						  0 C "Western Digital 600BB-32BSA0"
+"WDC WD600JB-00ETA0"						194 C "Western Digital 600JB-00ETA0"
+"WDC WD600LB-00DNA0"						194 C "Western Digital 60GB"
+"WDC WD600VE-75HDT0"						194 C "Western Digital 600VE-75HDT0"
+"WDC WD600VE-00HDT0"						194 C "Western Digital 600VE-00HDT0"
+"WDC WD740GD-00FL21.0"						194 C "Western Digital SATA Raptor"
+"WDC WD740GD-([05]0FL[AC]0|75FLA1)"				194 C "Western Digital SATA Raptor 74GB 8MB"
+"WDC WD800BB-00CAA1"						  0 C "Western Digital WD800BB-00CAA1"
+"WDC WD800BB-(00|22)DKA0"					194 C "Western Digital WD800BB 80 Go"
+"WDC WD800BB-32CCB0"						194 C "Western Digital 800BB-32CCB0"
+"WDC WD800BB-55HEA0"						194 C "Western Digital 800BB-55HEA0"
+"WDC WD800BB-00JHA0"						194 C "Western Digital 800BB-00JHA0" 
+"WDC WD800BB-00JKA0"						194 C "Western Digital 800BB-00JKA0" 
+"WDC WD800BB-55JKA0"						194 C "Western Digital 800BB-55JKA0" 
+"WDC WD800BB-75FRA0"						194 C "Western Digital Caviar WD800BB"				
+"WDC WD800JB-00CRA1"						  0 C "Western Digital Caviar WD800JB"
+"WDC WD800JB-00(ET|FM|FS)A0"					194 C "Western Digital Caviar 80GB Special Edition 8MB"
+"WDC WD800JB-00JJ[AC]0"						194 C "Western Digital WD800JB"
+"WDC WD800JD-(00|55)(HK|JR)A0"					194 C "Western Digital SATA 80GB, 8MB Cache"
+"WDC WD800JD-00(HK|JN)A0"					194 C "Western Digital SATA 80GB, 8MB Cache"
+"WDC WD800LB-(00|55)DNA0"					194 C "Western Digital Caviar WD800LB 80 Go ATA-100"
+"WDC WD800VE-07HDT0"						194 C "Western Digital 800VE-07HDT0"
+"WDC WD1200BB-00(FTA|GUA)0"					194 C "Western Digital Caviar EIDE 2MB Cache"
+"WDC WD1200JB-00(EV|FU|GV)A0"					194 C "Western Digital Caviar 120GB Special Edition 8MB" 
+"WDC WD1200JB-22GVA0"						194 C "Western Digital Caviar 120GB"
+"WDC WD1200JD-00(GBB|HBC)0"					194 C "Western Digital WD1200JD"
+"WDC WD1200LB-55EDA0"						194 C "Western Digital WD1220LB"
+"WDC WD1200SB-01KB[AC]0"					194 C "Western Digital Caviar RE (Raid Edition) 120 GB"
+"WDC WD1600BB-00DWA0"						194 C "Western Digital Caviar WD1600BB"
+"WDC WD1600JB-(00EV|00FU|00GV|22GV|75GV)A0"			194 C "Western Digital Caviar 160GB Special Edition 8MB"
+"WDC WD2000BB-00FTA0"						194 C "Western Digital WD2000BB"
+"WDC WD2000JB-(00EV|32EV|34EV|00FU|00GV|55GV|98GV|00KF)A0"	194 C "Western Digital Caviar 200GB Special Edition 8MB"
+"WDC WD2000JB-00GVC0"						194 C "Western Digital WD2000JB"
+"WDC WD2000JS-00MHB1"						194 C "Western Digital SATA 200GB"
+"WDC WD2500JB-(00RE|00EV|00FU|32FU|00GV|55GV)A0"		194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500JB-00GVC0"						194 C "Western Digital 250GB"
+"WDC WD2500JD-(00G|32H)BB0"					194 C "Western Digital SATA Caviar 250GB Special Edition 8MB"
+"WDC WD2500JD-40HBC0"						194 C "Western Digital WD2500JD-40HBC0" 
+"WDC WD2500PB-98FBA0"						194 C "Western Digital Caviar 250GB Special Edition 8MB"
+"WDC WD2500PD-00FZB1"						194 C "Western Digital WD2500PD-00FZB1" 
+"WDC WD2500SD-01KCB0"						194 C "Western Digital Caviar RE 250GB 8MB"
+"WDC WD3000JB-00KFA0"						194 C "Western Digital WD3000JB"
+"WDC WD3200JB-00KFA0"						194 C "Western Digital Caviar 320GB 8MB"
+"WDC WD4000KD-00NAB0"						194 C "Western Digital Caviar SE16 400GB 16MB"
+"WDC WD4000YR-01PLB0"						194 C "Western Digital Caviar RE2 400GB 16MB"
+"WD4000YS-01MPB0"						194  C  "Western Digital RE2 7200 SATA II 400 GB"
+
+# not sure for next
+# "WDC WD1200JB-00CRA1"		9   C "Western Digital 1200JB-00CRA1"
+# "WDC WD273BA"			9   C "Western Digital WD273BA"
+
+
+
+
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+########################################################################################################################
+
+"ST3750640AS"                           194    C  "Seagate Barracuda 7200.10 SATA 750GB"
+"ST3750840AS"                           194    C  "Seagate Barracuda 7200.10 SATA 750GB"
+"ST3500630AS"                           194    C  "Seagate Barracuda 7200.10 SATA 500GB"
+"ST3500830AS"                           194    C  "Seagate Barracuda 7200.10 SATA 500GB"
+"ST3400620AS"                           194    C  "Seagate Barracuda 7200.10 SATA 400GB"
+"ST3400620A"                            194    C  "Seagate Barracuda 7200.10 400GB"
+"ST3400820AS"                           194    C  "Seagate Barracuda 7200.10 SATA 400GB"
+"ST3320620AS"                           194    C  "Seagate Barracuda 7200.10 SATA 320GB"
+"ST3320820AS"                           194    C  "Seagate Barracuda 7200.10 SATA 320GB"
+"ST3300620AS"                           194    C  "Seagate Barracuda 7200.10 SATA 300GB"
+"ST3300820AS"                           194    C  "Seagate Barracuda 7200.10 SATA 300GB"
+"ST3250620AS"                           194    C  "Seagate Barracuda 7200.10 SATA 250GB"
+"ST3250820AS"                           194    C  "Seagate Barracuda 7200.10 SATA 250GB"
+"ST3250410AS"                           194    C  "Seagate Barracuda 7200.10 SATA 250GB"
+"ST3250310AS"                           194    C  "Seagate Barracuda 7200.10 SATA 250GB"
+"ST3200820AS"                           194    C  "Seagate Barracuda 7200.10 SATA 200GB"
+"ST3160815AS"                           194    C  "Seagate Barracuda 7200.10 SATA 160GB"
+"ST3160215AS"                           194    C  "Seagate Barracuda 7200.10 SATA 160GB"
+"ST3120815AS"                           194    C  "Seagate Barracuda 7200.10 SATA 120GB"
+"ST3120215AS"                           194    C  "Seagate Barracuda 7200.10 SATA 120GB"
+"ST380815AS"                            194    C  "Seagate Barracuda 7200.10 SATA 80GB"
+"ST380215AS"                            194    C  "Seagate Barracuda 7200.10 SATA 80GB"
+"ST340815AS"                            194    C  "Seagate Barracuda 7200.10 SATA 40GB"
+"ST340215AS"                            194    C  "Seagate Barracuda 7200.10 SATA 40GB"
+"ST3300622AS"				194  C  "Seagate Barracuda 7200.9 SATA2.5 300GB"
+"ST3300831A"				194  C	"Seagate Barracuda 7200.8 PATA 300GB"
+
+"Maxtor 7(L|V)250(F|R|S)0"		194 C "Maxtor MaXLine III 250GB 7200rpm"
+"Maxtor 7(L|V)300(F|R|S)0"		194 C "Maxtor MaXLine III 300GB 7200rpm"
+"MAXTOR STM3320620AS"			194 C ""
+
+"WDC WD1500ADFD-00NLR1"                                         194 C "Western Digital Raptor 150GB"
+"WDC WD1600JS-00NCB1"						194 C "Western Digital Caviar 1600JS 160GB Sata"
+"WDC WD1600SD-01KCC0"						194 C "Western Digital Caviar RE Serial ATA series"
+"WDC WD2500JD-57HBC0"                                           194 C "Western Digital Caviar SE (Serial ATA) 250 GB"
+"WDC WD2500JS"							194 C "Western Digital WD2500JS"
+"WDC WD2500JS-41MVB1"						194 C "Western Digital SATAII Caviar 250GB Special Edition 8MB"
+"WDC WD2500JD-00HBB0"						194 C   "Western Digital SATA 250GB" 
+"WDC WD2500KS-00MJB0"						194 C "Western Digital SATA-II Caviar 250GB Special Edition 16MB"
+"WDC WD3000JS-00PDB0"						194 C "Western Digital WD3000JS"
+"WDC WD3200KS-00PFB0"						194 C	""
+"WDC WD3200JD-22KLB0"                                           194 C "Western Digital Caviar SE 320GB 8MB" 
--- a/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/hddtemp/package.mk
@@ -5,7 +5,7 @@ PKG_NAME="hddtemp"
 PKG_VERSION="e16aed6"
 PKG_SHA256="5d5af74ba7449b6e56a8f872a0e10d654a512ed65d62beaef1575b0c1826d9f3"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.guzu.net/linux/hddtemp.php"
+PKG_SITE="https://savannah.nongnu.org/projects/hddtemp"
 PKG_URL="https://github.com/guzu/hddtemp/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="A utility that gives you the temperature of your hard drive by reading S.M.A.R.T.."
@@ -13,8 +13,7 @@ PKG_LONGDESC="A utility that gives you the temperature of your hard drive by rea
 PKG_CONFIGURE_OPTS_TARGET="--with-db-path=/storage/.kodi/addons/virtual.system-tools/data/hddtemp.db"

 post_unpack() {
-  cd $PKG_BUILD
-  wget -O hddtemp.db http://www.guzu.net/linux/hddtemp.db
+  cp $PKG_DIR/db/* $PKG_BUILD
 }

 makeinstall_target() {
--- a/packages/addons/addon-depends/system-tools-depends/htop/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/htop/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="htop"
-PKG_VERSION="3.0.0beta4"
-PKG_SHA256="5f4cd645c40599efd4a9598a7cbd07bac77cf666427450a71d7b6dec5a4bf96f"
+PKG_VERSION="3.0.0beta5"
+PKG_SHA256="c439add8d6a463699629fc3f0103f55b045d519c31611fa4a68629063238985a"
 PKG_LICENSE="GPL"
 PKG_SITE="https://hisham.hm/htop"
 PKG_URL="https://github.com/hishamhm/htop/archive/$PKG_VERSION.tar.gz"
--- a/packages/addons/addon-depends/system-tools-depends/jq/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/jq/package.mk
@@ -2,18 +2,20 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="jq"
-PKG_VERSION="1.5"
-PKG_SHA256="c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c"
+PKG_VERSION="1.6"
+PKG_SHA256="5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72"
 PKG_LICENSE="MIT"
 PKG_SITE="http://stedolan.github.io/jq/"
 PKG_URL="https://github.com/stedolan/jq/releases/download/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain"
+PKG_DEPENDS_TARGET="toolchain oniguruma"
 PKG_LONGDESC="A like sed for JSON data."

 PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
                           --enable-static \
-                           --disable-maintainer-mode"
+                           --disable-docs \
+                           --disable-maintainer-mode \
+                           --disable-valgrind"

 makeinstall_target() {
-  : # nop
+  :
 }
--- a/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/lm_sensors/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="lm_sensors"
-PKG_VERSION="1c48b19"
-PKG_SHA256="1db77e206b28c9194e5c017c88460e730fdf849cff7ef704fb3e4b8b49fd6d31"
+PKG_VERSION="e8afbda10fba571c816abddcb5c8180afc435bba"
+PKG_SHA256="255b9a9b30c7969b3df0460392a807239c18b15baac1ff33ff5fef3b1cc1169d"
 PKG_ARCH="arm x86_64"
 PKG_LICENSE="GPL"
 PKG_SITE="http://secure.netroedge.com/~lm78/"
@@ -11,10 +11,11 @@ PKG_URL="https://github.com/groeck/lm-sensors/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Provides user-space support for the hardware monitoring drivers."

-PKG_MAKE_OPTS_TARGET="PREFIX=/usr CC=$CC AR=$AR"
 PKG_MAKEINSTALL_OPTS_TARGET="PREFIX=/usr"

 pre_make_target() {
+  PKG_MAKE_OPTS_TARGET="PREFIX=/usr CC=$CC AR=$AR"
+
  export CFLAGS="$TARGET_CFLAGS"
  export CPPFLAGS="$TARGET_CPPFLAGS"
 }
--- a/packages/addons/addon-depends/system-tools-depends/mc/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/mc/package.mk
@@ -3,8 +3,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="mc"
-PKG_VERSION="4.8.20"
-PKG_SHA256="017ee7f4f8ae420a04f4d6fcebaabe5b494661075c75442c76e9c8b1923d501c"
+PKG_VERSION="4.8.21"
+PKG_SHA256="8f37e546ac7c31c9c203a03b1c1d6cb2d2f623a300b86badfd367e5559fe148c"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.midnight-commander.org"
 PKG_URL="http://ftp.midnight-commander.org/mc-${PKG_VERSION}.tar.xz"
@@ -13,7 +13,8 @@ PKG_LONGDESC="Midnight Commander is a text based filemanager that emulates Norto

 PKG_CONFIGURE_OPTS_TARGET=" \
  --datadir=/storage/.kodi/addons/virtual.system-tools/data \
-  --libdir=/storage/.kodi/addons/virtual.system-tools/mclib \
+  --libexecdir=/storage/.kodi/addons/virtual.system-tools/mclib \
+  --with-homedir=/storage/.kodi/userdata/addon_data/virtual.system-tools \
  --sysconfdir=/storage/.kodi/addons/virtual.system-tools/etc \
  --with-screen=ncurses \
  --with-sysroot=$SYSROOT_PREFIX \
@@ -41,4 +42,7 @@ pre_configure_target() {
 post_makeinstall_target() {
  rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/locale
  rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/mc/help/mc.hlp.*
+  mv $INSTALL/usr/bin/mc $INSTALL/usr/bin/mc-bin
+  rm -f $INSTALL/usr/bin/{mcedit,mcview}
+  cp $PKG_DIR/wrapper/* $INSTALL/usr/bin
 }
--- a/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mc
+++ b/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mc
@@ -0,0 +1,4 @@
+#!/bin/sh
+HISTFILE="/run/mc_histfile"
+export HISTFILE
+exec mc-bin "$@"
--- a/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcedit
+++ b/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcedit
@@ -0,0 +1,4 @@
+#!/bin/sh
+HISTFILE="/run/mc_histfile"
+export HISTFILE
+exec mc-bin -e "$@"
--- a/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcview
+++ b/packages/addons/addon-depends/system-tools-depends/mc/wrapper/mcview
@@ -0,0 +1,4 @@
+#!/bin/sh
+HISTFILE="/run/mc_histfile"
+export HISTFILE
+exec mc-bin -v "$@"
--- a/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/mtpfs/package.mk
@@ -2,12 +2,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="mtpfs"
-PKG_VERSION="fd3864d"
+PKG_VERSION="fd3864dd6f0e8183fa2598d4cf890401d3a1e09a"
 PKG_SHA256="f004136a82452d13362581277eb2496033aa13a6c3f35d0501327248f3120456"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.adebenham.com/mtpfs/"
 PKG_URL="https://github.com/cjd/mtpfs/archive/${PKG_VERSION}.tar.gz"
-PKG_DEPENDS_TARGET="toolchain fuse libmtp glib"
+PKG_DEPENDS_TARGET="toolchain fuse glib libmtp"
 PKG_LONGDESC="MTPfs is a FUSE filesystem that supports reading and writing from any MTP device."
 PKG_TOOLCHAIN="autotools"

--- a/packages/addons/addon-depends/system-tools-depends/nmon/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/nmon/package.mk
@@ -2,7 +2,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="nmon"
-PKG_VERSION="411b08f"
+PKG_VERSION="411b08f1c98bca8b24670fc2d9ee6325b4fcb3d2"
 PKG_SHA256="aa88257728e820db10b1f04792dfcc1b8a483de51bfda70db016da016a4879a2"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/axibase/nmon"
--- a/packages/addons/addon-depends/system-tools-depends/patch/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/patch/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="patch"
-PKG_VERSION="2.7.5"
-PKG_SHA256="fd95153655d6b95567e623843a0e77b81612d502ecf78a489a4aed7867caa299"
+PKG_VERSION="2.7.6"
+PKG_SHA256="ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd"
 PKG_LICENSE="GPL"
 PKG_SITE="http://savannah.gnu.org/projects/patch/"
 PKG_URL="http://ftpmirror.gnu.org/patch/$PKG_NAME-$PKG_VERSION.tar.xz"
@@ -13,5 +13,5 @@ PKG_LONGDESC="Patch takes a patch file containing a difference listing produced
 PKG_CONFIGURE_OPTS_TARGET="--disable-xattr"

 makeinstall_target() {
-  : # nop
+  :
 }
--- a/packages/addons/addon-depends/system-tools-depends/pv/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/pv/package.mk
@@ -2,16 +2,16 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="pv"
-PKG_VERSION="1.6.0"
-PKG_SHA256="9dd45391806b0ed215abee4c5ac1597d018c386fe9c1f5afd2f6bc3b07fd82c3"
+PKG_VERSION="1.6.6"
+PKG_SHA256="608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1"
 PKG_LICENSE="GNU"
 PKG_SITE="http://www.ivarch.com/programs/pv.shtml"
-PKG_URL="http://www.ivarch.com/programs/sources/$PKG_NAME-$PKG_VERSION.tar.gz"
+PKG_URL="http://www.ivarch.com/programs/sources/pv-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Pipe Viwer can be inserted into any normal pipeline between two processes."

 PKG_CONFIGURE_OPTS_TARGET="--enable-static-nls"

 makeinstall_target() {
-        : # nop
+  :
 }
--- a/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/smartmontools/package.mk
@@ -2,11 +2,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="smartmontools"
-PKG_VERSION="6.6"
-PKG_SHA256="51f43d0fb064fccaf823bbe68cf0d317d0895ff895aa353b3339a3b316a53054"
+PKG_VERSION="7.0"
+PKG_SHA256="e5e1ac2786bc87fdbd6f92d0ee751b799fbb3e1a09c0a6a379f9eb64b3e8f61c"
 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_URL="https://downloads.sourceforge.net/sourceforge/smartmontools/smartmontools-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Control and monitor storage systems using S.M.A.R.T."

--- a/packages/addons/addon-depends/system-tools-depends/strace/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/strace/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="strace"
-PKG_VERSION="4.22"
-PKG_SHA256="068cd09264c95e4d591bbcd3ea08f99a693ed8663cd5169b0fdad72eb5bdb39d"
+PKG_VERSION="4.26"
+PKG_SHA256="7c4d2ffeef4f7d1cdc71062ca78d1130eb52f947c2fca82f59f6a1183bfa1e1c"
 PKG_LICENSE="BSD"
 PKG_SITE="https://strace.io/"
 PKG_URL="https://strace.io/files/$PKG_VERSION/strace-$PKG_VERSION.tar.xz"
--- a/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/stress-ng/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="stress-ng"
-PKG_VERSION="0.09.36"
-PKG_SHA256="16102abee20fe26b1a8784ab05c61b3e72474503bc50b9debc9f457cb4b4e228"
+PKG_VERSION="0.09.50"
+PKG_SHA256="b07290495794092cdf2f8d51ac631f28b8cec9455a16552d8ca48bc1f376c634"
 PKG_LICENSE="GPLv2"
 PKG_SITE="http://kernel.ubuntu.com/~cking/stress-ng/"
 PKG_URL="http://kernel.ubuntu.com/~cking/tarballs/stress-ng/stress-ng-$PKG_VERSION.tar.xz"
--- a/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0001-rename-statx_timestamp-to-shim_statx_timestamp.patch
+++ b/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0001-rename-statx_timestamp-to-shim_statx_timestamp.patch
@@ -1,44 +0,0 @@
-From bf606ae577cd9142517a2170e14d4f9377a49deb Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Sat, 4 Aug 2018 07:05:17 +0100
-Subject: stress-ng.h: rename statx_timestamp to shim_statx_timestamp
-
-Newer versions of glibc now habe statx_timestamp defined, so
-rename this struct so it won't clash.
-
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
- stress-ng.h | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/stress-ng.h b/stress-ng.h
-index ae03a7b..b9359a4 100644
--- a/stress-ng.h
-+++ b/stress-ng.h
-@@ -2932,7 +2932,7 @@ struct shim_sched_attr {
- #define SHIM_STATX_BTIME             0x00000800U
- #define SHIM_STATX_ALL               0x00000fffU
- 
-struct statx_timestamp {
-+struct shim_statx_timestamp {
-         int64_t		tv_sec;
-         int32_t		tv_nsec;
-         int32_t		__reserved;
-@@ -2952,10 +2952,10 @@ struct shim_statx {
-         uint64_t   stx_size;
-         uint64_t   stx_blocks;
-         uint64_t   __spare1[1];
-        struct statx_timestamp  stx_atime;
-        struct statx_timestamp  stx_btime;
-        struct statx_timestamp  stx_ctime;
-        struct statx_timestamp  stx_mtime;
-+        struct shim_statx_timestamp  stx_atime;
-+        struct shim_statx_timestamp  stx_btime;
-+        struct shim_statx_timestamp  stx_ctime;
-+        struct shim_statx_timestamp  stx_mtime;
-         uint32_t   stx_rdev_major;
-         uint32_t   stx_rdev_minor;
-         uint32_t   stx_dev_major;
-- 
-cgit v0.11.2
-
--- a/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0002-only-use-ustat-if-HAVE_USTAT-is-defined.patch
+++ b/packages/addons/addon-depends/system-tools-depends/stress-ng/patches/stress-ng-0002-only-use-ustat-if-HAVE_USTAT-is-defined.patch
@@ -1,48 +0,0 @@
-From 04322c0d653aec755517f771e6e400fc14cf611c Mon Sep 17 00:00:00 2001
-From: Colin Ian King <colin.king@canonical.com>
-Date: Sat, 4 Aug 2018 07:11:58 +0100
-Subject: stress-sysbadaddr: only use ustat if HAVE_USTAT is defined
-
-We should be using HAVE_USTAT as ustat.h is not available on
-newer versions of glibc and HAVE_USTAT is undefined if this
-is not available.
-
-Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
- stress-sysbadaddr.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/stress-sysbadaddr.c b/stress-sysbadaddr.c
-index eab9213..0b6465f 100644
--- a/stress-sysbadaddr.c
-+++ b/stress-sysbadaddr.c
-@@ -28,7 +28,7 @@
- #include <sys/sysinfo.h>
- #include <utime.h>
- #include <sys/vfs.h>
-#if defined(__NR_ustat)
-+#if defined(HAVE_USTAT)
- #include <ustat.h>
- #endif
- #endif
-@@ -379,7 +379,7 @@ static int bad_times(void *addr)
- 	return times(addr);
- }
- 
-#if defined(__linux__) && defined(__NR_ustat)
-+#if defined(HAVE_USTAT)
- static int bad_ustat(void *addr)
- {
- 	dev_t dev = { 0 };
-@@ -495,7 +495,7 @@ static bad_syscall_t bad_syscalls[] = {
- 	bad_timer_create,
- #endif
- 	bad_times,
-#if defined(__linux__) && defined(__NR_ustat)
-+#if defined(HAVE_USTAT)
- 	bad_ustat,
- #endif
- #if defined(__linux__)
-- 
-cgit v0.11.2
-
--- a/packages/addons/addon-depends/system-tools-depends/unrar/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/unrar/package.mk
@@ -2,14 +2,15 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="unrar"
-PKG_VERSION="5.6.3"
-PKG_SHA256="c590e70a745d840ae9b9f05ba6c449438838c8280d76ce796a26b3fcd0a1972e"
+PKG_VERSION="5.6.8"
+PKG_SHA256="a4cc0ac14a354827751912d2af4a0a09e2c2129df5766576fa7e151791dd3dff"
 PKG_LICENSE="free"
 PKG_SITE="http://www.rarlab.com"
 PKG_URL="http://www.rarlab.com/rar/unrarsrc-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="unrar extract, test and view RAR archives"
 PKG_TOOLCHAIN="manual"
+PKG_BUILD_FLAGS="+pic"

 make_target() {
  make CXX="$CXX" \
@@ -17,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
 }
--- a/packages/addons/addon-depends/system-tools-depends/usb-modeswitch/package.mk
+++ b/packages/addons/addon-depends/system-tools-depends/usb-modeswitch/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="usb-modeswitch"
-PKG_VERSION="2.3.0"
-PKG_SHA256="f93e940c2eb0c585a5d2210177338e68a9b24f409e351e4a854132453246b894"
+PKG_VERSION="2.5.2"
+PKG_SHA256="abffac09c87eacd78e101545967dc25af7e989745b4276756d45dbf4008a2ea6"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.draisberghof.de/usb_modeswitch/"
 PKG_URL="http://www.draisberghof.de/usb_modeswitch/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
@@ -11,5 +11,5 @@ PKG_DEPENDS_TARGET="toolchain libusb"
 PKG_LONGDESC="USB_ModeSwitch - Handling Mode-Switching USB Devices on Linux"

 makeinstall_target() {
-  : # nop
+  :
 }
--- a/packages/addons/addon-depends/tini/package.mk
+++ b/packages/addons/addon-depends/tini/package.mk
@@ -11,9 +11,9 @@ PKG_URL="https://github.com/krallin/tini/archive/${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="Tini is a simplest init system."

-PKG_CMAKE_TARGET_OPTS="-DMINIMAL=ON"
+PKG_CMAKE_OPTS_TARGET="-DMINIMAL=ON"

-PKG_MAKE_TARGET_OPTS="tini-static"
+PKG_MAKE_OPTS_TARGET="tini-static"

 pre_configure_target(){
  sed -i "s|@tini_VERSION_GIT@| - git.${PKG_VERSION}|" $PKG_BUILD/src/tiniConfig.h.in
--- a/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk
+++ b/packages/addons/addon-depends/tvh-dtv-scan-tables/package.mk
@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="tvh-dtv-scan-tables"
-PKG_VERSION="421c08b31b24e0cd5d8fb54e6f3278a1ef9d3666"
-PKG_SHA256="2377c0edec0997d320f121a8f7944b37935e0fd40249252d4098b7002df82693"
+PKG_VERSION="68f86b42272fc364cdd53d7cfeaa2a78d676dbfa"
+PKG_SHA256="2bb102094696bbaf440b9319a9e8a4c93e2ecbcf2d2c556fb719b1febf1a7d3b"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/tvheadend"
 PKG_URL="https://github.com/tvheadend/dtv-scan-tables/archive/$PKG_VERSION.tar.gz"
--- a/packages/addons/driver/sapphire/package.mk
+++ b/packages/addons/driver/sapphire/package.mk
@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="sapphire"
-PKG_VERSION="6.9"
-PKG_SHA256="191661e8186712fe4a08a7555dbca36676338c630536a48373048afbbb3ad2ff"
-PKG_REV="104"
+PKG_VERSION="7.1"
+PKG_SHA256="24c662c45c581f8fe395d1cdcd6e1dca3db9e0eb590433f39de6037b2d4c5764"
+PKG_REV="105"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="https://libreelec.tv"
--- a/packages/addons/service/dispmanx_vnc/changelog.txt
+++ b/packages/addons/service/dispmanx_vnc/changelog.txt
@@ -1,3 +1,6 @@
+106
+- Fix versioning
+
 105
 - Update to 5bde54b

--- a/packages/addons/service/dispmanx_vnc/package.mk
+++ b/packages/addons/service/dispmanx_vnc/package.mk
@@ -4,7 +4,8 @@
 PKG_NAME="dispmanx_vnc"
 PKG_VERSION="5bde54b5a43a2e6f65994f3b9c665db90c45923f"
 PKG_SHA256="1f096cd70d86620596db947757486064fe37dc2766ad33530318c35b279472aa"
-PKG_REV="105"
+PKG_VERSION_DATE="2018-08-18"
+PKG_REV="106"
 PKG_ARCH="arm"
 PKG_ADDON_PROJECTS="RPi"
 PKG_LICENSE="OSS"
@@ -13,7 +14,7 @@ PKG_URL="https://github.com/patrikolausson/dispmanx_vnc/archive/$PKG_VERSION.tar
 PKG_DEPENDS_TARGET="toolchain libvncserver bcm2835-bootloader bcm2835-driver libconfig openssl"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Raspberry Pi VNC: a Virtual Network Computing server for Raspberry Pi"
-PKG_LONGDESC="Raspberry Pi VNC ($PKG_VERSION) is a Virtual Network Computing (VNC) server for Raspberry Pi using dispmanx"
+PKG_LONGDESC="Raspberry Pi VNC ($PKG_VERSION_DATE) is a Virtual Network Computing (VNC) server for Raspberry Pi using dispmanx"

 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Raspberry Pi VNC"
@@ -25,7 +26,7 @@ pre_make_target() {
 }

 makeinstall_target() {
-  : # nop
+  :
 }

 addon() {
--- a/packages/addons/service/docker/changelog.txt
+++ b/packages/addons/service/docker/changelog.txt
@@ -1,3 +1,15 @@
+122
+- Update to docker 18.09.1
+
+121
+- Update to docker 18.09.1-rc1
+
+120
+- Update to docker 18.09.1-beta1
+
+119
+- Update to docker 18.09.0
+
 118
 - Update to docker 18.06.1-ce

--- a/packages/addons/service/docker/package.mk
+++ b/packages/addons/service/docker/package.mk
@@ -3,14 +3,14 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="docker"
-PKG_VERSION="18.06.1"
-PKG_SHA256="153cb489033686260dfe7a42acbdd1753d56f7a9c2d7ad90633f0c8cce563b23"
-PKG_REV="119"
+PKG_VERSION="18.09.1"
+PKG_SHA256="9eadb1eae1954b0322aadf6505f5397d1b1eccf6395ab511cadf8e6975cfc576"
+PKG_REV="122"
 PKG_ARCH="any"
 PKG_ADDON_PROJECTS="any !WeTek_Core !WeTek_Play"
 PKG_LICENSE="ASL"
 PKG_SITE="http://www.docker.com/"
-PKG_URL="https://github.com/docker/docker-ce/archive/v${PKG_VERSION}-ce.tar.gz"
+PKG_URL="https://github.com/docker/docker-ce/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain sqlite go:host containerd runc libnetwork tini systemd"
 PKG_SECTION="service/system"
 PKG_SHORTDESC="Docker is an open-source engine that automates the deployment of any application as a lightweight, portable, self-sufficient container that will run virtually anywhere."
@@ -74,7 +74,23 @@ configure_target() {
    mv $PKG_CLI_PATH/vendor $PKG_BUILD/.gopath_cli/src
  fi

-  cp -rf $PKG_BUILD/.gopath/src/* $PKG_BUILD/.gopath_cli/src
+  # Fix missing/incompatible .go files
+  cp -rf $PKG_BUILD/.gopath/src/github.com/moby/buildkit/frontend/* $PKG_BUILD/.gopath_cli/src/github.com/moby/buildkit/frontend
+  cp -rf $PKG_BUILD/.gopath/src/github.com/moby/buildkit/frontend/gateway/* $PKG_BUILD/.gopath_cli/src/github.com/moby/buildkit/frontend/gateway
+  cp -rf $PKG_BUILD/.gopath/src/github.com/moby/buildkit/solver/* $PKG_BUILD/.gopath_cli/src/github.com/moby/buildkit/solver
+  cp -rf $PKG_BUILD/.gopath/src/github.com/moby/buildkit/util/progress/* $PKG_BUILD/.gopath_cli/src/github.com/moby/buildkit/util/progress
+  cp -rf $PKG_BUILD/.gopath/src/github.com/docker/swarmkit/manager/* $PKG_BUILD/.gopath_cli/src/github.com/docker/swarmkit/manager
+  cp -rf $PKG_BUILD/.gopath/src/github.com/coreos/etcd/raft/* $PKG_BUILD/.gopath_cli/src/github.com/coreos/etcd/raft
+  cp -rf $PKG_BUILD/.gopath/src/golang.org/x/* $PKG_BUILD/.gopath_cli/src/golang.org/x
+  cp -rf $PKG_BUILD/.gopath/src/github.com/opencontainers/runtime-spec/specs-go/* $PKG_BUILD/.gopath_cli/src/github.com/opencontainers/runtime-spec/specs-go
+
+  rm -rf $PKG_BUILD/.gopath_cli/src/github.com/containerd/containerd
+  mkdir -p $PKG_BUILD/.gopath_cli/src/github.com/containerd/containerd
+  cp -rf $PKG_BUILD/.gopath/src/github.com/containerd/containerd/* $PKG_BUILD/.gopath_cli/src/github.com/containerd/containerd
+
+  rm -rf $PKG_BUILD/.gopath_cli/src/github.com/containerd/continuity
+  mkdir -p $PKG_BUILD/.gopath_cli/src/github.com/containerd/continuity
+  cp -rf $PKG_BUILD/.gopath/src/github.com/containerd/continuity/* $PKG_BUILD/.gopath_cli/src/github.com/containerd/continuity

  mkdir -p $PKG_BUILD/.gopath_cli/src/github.com/docker/docker/builder
  cp -rf $PKG_ENGINE_PATH/builder/* $PKG_BUILD/.gopath_cli/src/github.com/docker/docker/builder
@@ -88,8 +104,8 @@ configure_target() {
  fi

  # used for docker version
-  export GITCOMMIT=${PKG_VERSION}-ce
-  export VERSION=${PKG_VERSION}-ce
+  export GITCOMMIT=${PKG_VERSION}
+  export VERSION=${PKG_VERSION}
  export BUILDTIME="$(date --utc)"

  cd $PKG_ENGINE_PATH
@@ -116,14 +132,14 @@ addon() {
    cp -P $PKG_BUILD/bin/dockerd $ADDON_BUILD/$PKG_ADDON_ID/bin

    # containerd
-    cp -P $(get_build_dir containerd)/bin/containerd $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd
-    cp -P $(get_build_dir containerd)/bin/containerd-shim $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-containerd-shim
+    cp -P $(get_build_dir containerd)/bin/containerd $ADDON_BUILD/$PKG_ADDON_ID/bin/containerd
+    cp -P $(get_build_dir containerd)/bin/containerd-shim $ADDON_BUILD/$PKG_ADDON_ID/bin/containerd-shim

    # libnetwork
    cp -P $(get_build_dir libnetwork)/bin/docker-proxy $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-proxy

    # runc
-    cp -P $(get_build_dir runc)/bin/runc $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-runc
+    cp -P $(get_build_dir runc)/bin/runc $ADDON_BUILD/$PKG_ADDON_ID/bin/runc

    # tini
    cp -P $(get_build_dir tini)/.$TARGET_NAME/tini-static $ADDON_BUILD/$PKG_ADDON_ID/bin/docker-init
--- a/packages/addons/service/emby4/changelog.txt
+++ b/packages/addons/service/emby4/changelog.txt
@@ -0,0 +1,2 @@
+100
+- Initial release
--- a/packages/addons/service/emby4/icon/icon.png
+++ b/packages/addons/service/emby4/icon/icon.png
--- a/packages/addons/service/emby4/package.mk
+++ b/packages/addons/service/emby4/package.mk
@@ -0,0 +1,35 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="emby4"
+PKG_VERSION="4.0.0.2"
+PKG_SHA256="cac3de0f4b75d421719676377bae80274338a493e79c0498c8772e7e51cd8edf"
+PKG_REV="100"
+PKG_ARCH="any"
+PKG_LICENSE="prop."
+PKG_SITE="http://emby.media"
+PKG_URL="https://github.com/MediaBrowser/Emby.Releases/releases/download/$PKG_VERSION/embyserver-netcore_$PKG_VERSION.zip"
+PKG_SOURCE_DIR="system"
+PKG_DEPENDS_TARGET="toolchain imagemagick"
+PKG_SECTION="service"
+PKG_SHORTDESC="Emby Server: a personal media server"
+PKG_LONGDESC="Emby Server ($PKG_VERSION) brings your home videos, music, and photos together, automatically converting and streaming your media on-the-fly to any device"
+PKG_TOOLCHAIN="manual"
+
+PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="Emby Server 4"
+PKG_ADDON_TYPE="xbmc.service"
+PKG_ADDON_REQUIRES="tools.ffmpeg-tools:0.0.0 tools.dotnet-runtime:0.0.0"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
+
+addon() {
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/emby
+  cp -r $PKG_BUILD/* \
+        -d $ADDON_BUILD/$PKG_ADDON_ID/emby
+
+  mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib
+  cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickCore-7.Q16HDRI.so.? \
+        $ADDON_BUILD/$PKG_ADDON_ID/lib/
+  cp -L $(get_build_dir imagemagick)/.install_pkg/usr/lib/libMagickWand-7.Q16HDRI.so \
+        $ADDON_BUILD/$PKG_ADDON_ID/lib/CORE_RL_Wand_.so
+}
--- a/packages/addons/service/emby4/source/bin/emby4.start
+++ b/packages/addons/service/emby4/source/bin/emby4.start
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+. /etc/profile
+oe_setup_addon service.emby4
+
+LD_PRELOAD="$ADDON_DIR/lib/libMagickCore-7.Q16HDRI.so.6 \
+            $ADDON_DIR/lib/CORE_RL_Wand_.so" \
+nice -n "$emby_nice" \
+le_dotnet $ADDON_DIR/emby/EmbyServer.dll \
+  -programdata $ADDON_HOME \
+  -ffmpeg /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffmpeg \
+  -ffprobe /storage/.kodi/addons/tools.ffmpeg-tools/bin/ffprobe
--- a/packages/addons/service/emby4/source/default.py
+++ b/packages/addons/service/emby4/source/default.py
@@ -0,0 +1,46 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
+
+import json
+import subprocess
+import xbmc
+import xbmcaddon
+import xbmcgui
+
+
+def jsonrpc(request):
+    return json.loads(xbmc.executeJSONRPC(json.dumps(request)))
+
+
+def disable_conflicting(conficting,
+        message='{that} conflicts with {this} and has been disabled'):
+    is_enabled = {'jsonrpc': '2.0', 'method': 'Addons.GetAddonDetails', 'id': 1,
+                  'params': {'addonid': conficting, 'properties': ['enabled']}}
+    disable = {'jsonrpc': '2.0', 'method': 'Addons.SetAddonEnabled', 'id': 1,
+               'params': {'addonid': conficting, 'enabled': False}}
+    try:
+        if jsonrpc(is_enabled)['result']['addon']['enabled']:
+            this = xbmcaddon.Addon().getAddonInfo('name')
+            that = xbmcaddon.Addon(conficting).getAddonInfo('name')
+            jsonrpc(disable)
+            dialog = xbmcgui.Dialog()
+            dialog.ok(this, message.format(
+                this=this, that=that))
+            del dialog
+    except KeyError:
+        pass
+
+
+class Monitor(xbmc.Monitor):
+
+    def __init__(self, *args, **kwargs):
+        xbmc.Monitor.__init__(self)
+        self.id = xbmcaddon.Addon().getAddonInfo('id')
+
+    def onSettingsChanged(self):
+        subprocess.call(['systemctl', 'restart', self.id])
+
+
+if __name__ == '__main__':
+    disable_conflicting('service.emby')
+    Monitor().waitForAbort()
--- a/packages/addons/service/emby4/source/resources/language/English/strings.po
+++ b/packages/addons/service/emby4/source/resources/language/English/strings.po
@@ -0,0 +1,14 @@
+# Kodi Media Center language file
+# Addon Name: emby4
+# Addon id: service.emby4
+# Addon Provider: Team LibreELEC
+msgid ""
+msgstr ""
+
+msgctxt "#30000"
+msgid "Configuration"
+msgstr ""
+
+msgctxt "#30001"
+msgid "Priority (nice, 0=max, 19=min)"
+msgstr ""
--- a/packages/addons/service/emby4/source/resources/settings.xml
+++ b/packages/addons/service/emby4/source/resources/settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings>
+   <category   label="30000">
+      <setting label="30001" id="emby_nice" type="slider" default="10" range="0,1,19" option="int" />
+    </category>
+</settings>
--- a/packages/addons/service/emby4/source/settings-default.xml
+++ b/packages/addons/service/emby4/source/settings-default.xml
@@ -0,0 +1,3 @@
+<settings version="2">
+    <setting id="emby_nice" default="true">10</setting>
+</settings>
--- a/packages/addons/service/emby4/source/system.d/service.emby4.service
+++ b/packages/addons/service/emby4/source/system.d/service.emby4.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Emby 4 - streaming server
+Documentation=http://emby.media
+Wants=kodi.service
+After=kodi.service
+Conflicts=service.emby.service
+
+[Service]
+ExecStart=/bin/sh /storage/.kodi/addons/service.emby4/bin/emby4.start
+Restart=always
+
+[Install]
+WantedBy=kodi.service
--- a/packages/addons/service/hyperion/changelog.txt
+++ b/packages/addons/service/hyperion/changelog.txt
@@ -1,3 +1,6 @@
+109
+- Update to version 2018-12-20
+
 108
 - Update to version 1d125d8
  * Kodi 18 fix merged
--- a/packages/addons/service/hyperion/package.mk
+++ b/packages/addons/service/hyperion/package.mk
@@ -3,9 +3,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="hyperion"
-PKG_VERSION="1d125d8df863ad176002f591d72dbba79ce9be63"
-PKG_SHA256="1f3bcd1422dffb7c4398b1c22c63f78151c52c9a44505d1a4ba31278290fd47c"
-PKG_REV="108"
+PKG_VERSION="22f7be8df010fe8f0a51e3677fe0c8e709042622"
+PKG_SHA256="51cb6c5694d4bad67255ac4ae61a3c0aa481395c4868fb044a3ee19ca35bf19d"
+PKG_VERSION_DATE="2018-12-20"
+PKG_REV="109"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/hyperion-project/hyperion"
@@ -13,7 +14,7 @@ PKG_URL="https://github.com/hyperion-project/hyperion/archive/$PKG_VERSION.tar.g
 PKG_DEPENDS_TARGET="toolchain Python2 libusb qtbase protobuf rpi_ws281x"
 PKG_SECTION="service"
 PKG_SHORTDESC="Hyperion: an AmbiLight controller"
-PKG_LONGDESC="Hyperion($PKG_VERSION) is an modern opensource AmbiLight implementation."
+PKG_LONGDESC="Hyperion($PKG_VERSION_DATE) is an modern opensource AmbiLight implementation."

 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Hyperion"
@@ -36,14 +37,6 @@ elif [ "$DISPLAYSERVER" = "x11" ]; then
  PKG_X11_SUPPORT="-DENABLE_X11=1"
 fi

-pre_build_target() {
-  cp -a $(get_build_dir rpi_ws281x)/* $PKG_BUILD/dependencies/external/rpi_ws281x
-}
-
-pre_configure_target() {
-  echo "" > ../cmake/FindGitVersion.cmake
-}
-
 PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
                       -DHYPERION_VERSION_ID="$PKG_VERSION" \
                       $PKG_AMLOGIC_SUPPORT \
@@ -61,6 +54,14 @@ PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
                       -DENABLE_TESTS=0 \
                       -Wno-dev"

+pre_build_target() {
+  cp -a $(get_build_dir rpi_ws281x)/* $PKG_BUILD/dependencies/external/rpi_ws281x
+}
+
+pre_configure_target() {
+  echo "" > ../cmake/FindGitVersion.cmake
+}
+
 makeinstall_target() {
  : # nothing to do here
 }
--- a/packages/addons/service/lcdd/changelog.txt
+++ b/packages/addons/service/lcdd/changelog.txt
@@ -1,22 +1,25 @@
-106:
+107
+- Update to 0.5dev+2018-11-04
+
+106
 - Build with -O3 to avoid undefined symbols

-105:
+105
 - Rebuild after glibc bump

-104:
+104
 - Update to 466edd3

-103:
+103
 - Update to 0.5.8

-102:
+102
 - Update to c05a7de
 - Reintroduce dm140 driver
 - Build with libugpio

-101:
+101
 - Update to upstream 1554506

-100:
+100
 - Initial addon
--- a/packages/addons/service/lcdd/package.mk
+++ b/packages/addons/service/lcdd/package.mk
@@ -2,9 +2,10 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="lcdd"
-PKG_VERSION="466edd3"
-PKG_SHA256="786aab192a788fd09119645d60576ba258eec3de1a455aaa6d9ddea5e30e1749"
-PKG_REV="106"
+PKG_VERSION="e08546c13a4157ed98cd4a8e9086e7acd66f93c0"
+PKG_SHA256="23d0fd14e16767d4907d724404b96216c0c7338c6206760e53cf6a7662dd3af2"
+PKG_VERSION_DATE="0.5dev+2018-11-04"
+PKG_REV="107"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://lcdproc.org/"
--- a/packages/addons/service/librespot/changelog.txt
+++ b/packages/addons/service/librespot/changelog.txt
@@ -1,3 +1,7 @@
+114
+- Fix discovery mode setting
+- Start after Kodi
+
 113
 - Update to 96557b4

--- a/packages/addons/service/librespot/package.mk
+++ b/packages/addons/service/librespot/package.mk
@@ -5,7 +5,8 @@
 PKG_NAME="librespot"
 PKG_VERSION="96557b4ec1c45413cdf34673695f1269f99e3545"
 PKG_SHA256="09fe8f8de50d25e460bdc75d02239961336ac4db837509386ac17057b00cc49a"
-PKG_REV="113"
+PKG_VERSION_DATE="2018-11-07"
+PKG_REV="114"
 PKG_ARCH="any"
 PKG_LICENSE="MIT"
 PKG_SITE="https://github.com/librespot-org/librespot/"
@@ -13,7 +14,7 @@ PKG_URL="https://github.com/librespot-org/librespot/archive/$PKG_VERSION.zip"
 PKG_DEPENDS_TARGET="toolchain avahi pulseaudio pyalsaaudio rust"
 PKG_SECTION="service"
 PKG_SHORTDESC="Librespot: play Spotify through LibreELEC using a Spotify app as a remote"
-PKG_LONGDESC="Librespot ($PKG_VERSION) plays Spotify through LibreELEC using the open source librespot library using a Spotify app as a remote."
+PKG_LONGDESC="Librespot ($PKG_VERSION_DATE) plays Spotify through LibreELEC using the open source librespot library using a Spotify app as a remote."
 PKG_TOOLCHAIN="manual"

 PKG_IS_ADDON="yes"
--- a/packages/addons/service/librespot/source/bin/librespot.start
+++ b/packages/addons/service/librespot/source/bin/librespot.start
@@ -63,7 +63,7 @@ init_alsa() {

  case "$LIBREELEC_ARCH" in
    RPi*.arm)
-      [ "$(readlink /proc/asound/ALSA)" == "card$index" ] && [ "$pcm_3" ] &&
+      [ "$(readlink /proc/asound/ALSA)" = "card$index" ] && [ "$pcm_3" ] &&
        amixer -c "$index" cset name="PCM Playback Route" "$pcm_3"
      ;;
  esac
@@ -82,13 +82,13 @@ if [ -n "$ls_b" -a "$ls_b" != "-" ]; then
  LIBRESPOT="$LIBRESPOT --bitrate $ls_b"
 fi

-if [ -n "$ls_p" -a -n "$ls_u" ]; then
+if [ "$ls_a" = "true" -a -n "$ls_p" -a -n "$ls_u" ]; then
  LIBRESPOT="$LIBRESPOT --disable-discovery \
                        --password \"$ls_p\" \
                        --username \"$ls_u\""
 fi

-if [ "$ls_m" == "Kodi" ]; then
+if [ "$ls_m" = "Kodi" ]; then
  LIBRESPOT="$LIBRESPOT --backend pulseaudio --device-type TV"
 else
  init_alsa
--- a/packages/addons/service/librespot/source/resources/language/English/strings.po
+++ b/packages/addons/service/librespot/source/resources/language/English/strings.po
@@ -48,7 +48,7 @@ msgid "Password"
 msgstr ""

 msgctxt "#30112"
-msgid "Discovery mode"
+msgid "User mode"
 msgstr ""

 msgctxt "#30113"
--- a/packages/addons/service/librespot/source/resources/settings.xml
+++ b/packages/addons/service/librespot/source/resources/settings.xml
@@ -7,5 +7,5 @@
    <setting id="ls_b"  label="30102" type="labelenum" lvalues="30103|30104|30105|30106" />
    <setting id="ls_a"  label="30112" type="bool"      default="false" />
    <setting id="ls_u"  label="30110" type="text"      subsetting="true" visible="eq(-1,true)" default="" />
-    <setting id="ls_p"  label="30111" type="text"      subsetting="true" visible="eq(-2,true)" default="" />
+    <setting id="ls_p"  label="30111" type="text"      subsetting="true" visible="eq(-2,true)" default="" option="hidden" />
 </settings>
--- a/packages/addons/service/librespot/source/system.d/service.librespot.service
+++ b/packages/addons/service/librespot/source/system.d/service.librespot.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=librespot
-After=kodi.service network-online.target sound.target
-Requires=kodi.service network-online.target sound.target
+Wants=kodi.service
+After=kodi.service

 [Service]
 EnvironmentFile=/storage/.kodi/addons/service.librespot/bin/librespot.env
@@ -10,4 +10,4 @@ ExecStopPost=/usr/bin/pactl suspend-sink "$LS_SINK" 1
 Restart=on-failure

 [Install]
-WantedBy=kodi.target
+WantedBy=kodi.service
--- a/packages/addons/service/mariadb/changelog.txt
+++ b/packages/addons/service/mariadb/changelog.txt
@@ -0,0 +1,11 @@
+102
+- do not change password on addon update
+
+101
+- update MariaDB to 10.3.12
+  removed optimizer_search_depth from config file to speed it up
+  moved some paths for logs to addon home
+  added alias for service name (mariadb == service.mariadb)
+
+100
+- initial version
--- a/packages/addons/service/mariadb/icon/icon.png
+++ b/packages/addons/service/mariadb/icon/icon.png
--- a/packages/addons/service/mariadb/package.mk
+++ b/packages/addons/service/mariadb/package.mk
@@ -0,0 +1,97 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="mariadb"
+PKG_VERSION="10.3.12"
+PKG_REV="102"
+PKG_SHA256="f7449a34c25e0455928d7983dae83fd2069fe1f16c4c5f4aeed9ed9d3f081ff6"
+PKG_LICENSE="GPL2"
+PKG_SITE="https://mariadb.org"
+PKG_URL="https://downloads.mariadb.org/interstitial/${PKG_NAME}-${PKG_VERSION}/source/${PKG_NAME}-${PKG_VERSION}.tar.gz"
+PKG_DEPENDS_HOST="toolchain ncurses:host"
+PKG_DEPENDS_TARGET="toolchain binutils bzip2 libaio libxml2 lzo ncurses openssl systemd zlib mariadb:host"
+PKG_SHORTDESC="MariaDB is a community-developed fork of the MySQL."
+PKG_LONGDESC="MariaDB (${PKG_VERSION}) is a fast SQL database server and a drop-in replacement for MySQL."
+PKG_TOOLCHAIN="cmake"
+PKG_BUILD_FLAGS="-gold"
+
+PKG_IS_ADDON="yes"
+PKG_SECTION="service"
+PKG_ADDON_NAME="MariaDB SQL database server"
+PKG_ADDON_TYPE="xbmc.service"
+
+configure_package() {
+  PKG_CMAKE_OPTS_HOST=" \
+    -DCMAKE_INSTALL_MESSAGE=NEVER \
+    -DSTACK_DIRECTION=-1 \
+    -DHAVE_IB_GCC_ATOMIC_BUILTINS=1 \
+    -DCMAKE_CROSSCOMPILING=OFF \
+    import_executables"
+
+  PKG_CMAKE_OPTS_TARGET=" \
+    -DCMAKE_INSTALL_MESSAGE=NEVER \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_CONFIG=mysql_release \
+    -DFEATURE_SET=classic \
+    -DSTACK_DIRECTION=1 \
+    -DDISABLE_LIBMYSQLCLIENT_SYMBOL_VERSIONING=ON \
+    -DCMAKE_CROSSCOMPILING=ON \
+    -DIMPORT_EXECUTABLES=${PKG_BUILD}/.${HOST_NAME}/import_executables.cmake \
+    -DWITHOUT_AWS_KEY_MANAGEMENT=ON \
+    -DWITH_EXTRA_CHARSETS=complex \
+    -DWITH_SSL=system \
+    -DWITH_SSL=${SYSROOT_PREFIX}/usr \
+    -DWITH_JEMALLOC=OFF \
+    -DWITH_PCRE=bundled \
+    -DWITH_ZLIB=bundled \
+    -DWITH_EDITLINE=bundled \
+    -DWITH_LIBEVENT=bundled \
+    -DCONNECT_WITH_LIBXML2=bundled \
+    -DSKIP_TESTS=ON \
+    -DWITH_DEBUG=OFF \
+    -DWITH_UNIT_TESTS=OFF \
+    -DENABLE_DTRACE=OFF \
+    -DSECURITY_HARDENED=OFF \
+    -DWITH_EMBEDDED_SERVER=OFF \
+    -DWITHOUT_SERVER=OFF \
+    -DPLUGIN_AUTH_SOCKET=STATIC \
+    -DDISABLE_SHARED=NO \
+    -DENABLED_PROFILING=OFF \
+    -DENABLE_STATIC_LIBS=OFF \
+    -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+    -DWITH_SAFEMALLOC=OFF \
+    -DWITHOUT_AUTH_EXAMPLES=ON"
+}
+
+make_host() {
+  ninja ${NINJA_OPTS} import_executables
+}
+
+makeinstall_host() {
+  :
+}
+
+makeinstall_target() {
+  # use only for addon
+  DESTDIR=${PKG_BUILD}/.install_addon ninja ${NINJA_OPTS} install
+  rm -rf "${PKG_BUILD}/.install_addon/usr/mysql-test"
+}
+
+addon() {
+  local ADDON="${ADDON_BUILD}/${PKG_ADDON_ID}"
+  local MARIADB="${PKG_BUILD}/.install_addon/usr"
+
+  mkdir -p ${ADDON}/bin
+  mkdir -p ${ADDON}/config
+
+  cp ${MARIADB}/bin/mysql \
+     ${MARIADB}/bin/mysqld \
+     ${MARIADB}/bin/mysqladmin \
+     ${MARIADB}/bin/mysql_secure_installation \
+     ${MARIADB}/bin/my_print_defaults \
+     ${MARIADB}/bin/resolveip \
+     ${MARIADB}/scripts/mysql_install_db \
+     ${ADDON}/bin
+
+  cp -PR ${MARIADB}/share ${ADDON}
+}
--- a/packages/addons/service/mariadb/source/bin/mariadb.start
+++ b/packages/addons/service/mariadb/source/bin/mariadb.start
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+. /etc/profile
+oe_setup_addon service.mariadb
+
+# create dir for socket and pid
+mkdir -p /var/run/mysqld
+
+# exit if already running
+PID=$(ps aux | awk '/\/bin\/mysqld/ {print $1; exit 0}')
+if [ -n "$PID" ]; then
+  echo "MariaDB server is already running"
+  exit 0
+fi
+
+# copy config file
+if [ ! -f $ADDON_HOME/my.cnf ]; then
+  cp $ADDON_DIR/config/my.cnf $ADDON_HOME
+fi
+
+# install database
+if [ ! -d "$ADDON_HOME/data/mysql" ]; then
+  echo "Installing database"
+  $ADDON_DIR/bin/mysql_install_db --basedir=$ADDON_DIR --datadir=$ADDON_HOME/data
+fi
+
+# check for first run and generate passwords
+if grep -q "@MYSQL_ROOT_PASS@" $ADDON_HOME/settings.xml; then
+  MYSQL_ROOT_PASS="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8)"
+  MYSQL_KODI_PASS="$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8)"
+
+  sed -e "s|@MYSQL_ROOT_PASS@|$MYSQL_ROOT_PASS|g" \
+      -e "s|@MYSQL_KODI_PASS@|$MYSQL_KODI_PASS|g" \
+      -i $ADDON_HOME/settings.xml
+fi
+
+# init script to create user kodi and change passwords
+init_file=""
+if [[ ! -f $ADDON_HOME/set_mysql_passwords.sql ]] || [[ $ADDON_HOME/settings.xml -nt $ADDON_HOME/set_mysql_passwords.sql ]]; then
+  cat << SQL_DATA > $ADDON_HOME/set_mysql_passwords.sql
+SET PASSWORD FOR 'root'@'localhost'=PASSWORD('$MYSQL_ROOT_PASS');
+CREATE USER IF NOT EXISTS 'kodi';
+SET PASSWORD FOR 'kodi'=PASSWORD('$MYSQL_KODI_PASS');
+GRANT ALL ON *.* TO 'kodi';
+flush privileges;
+SQL_DATA
+
+  init_file="--init-file=$ADDON_HOME/set_mysql_passwords.sql"
+fi
+
+echo "Starting mysqld"
+MYSQL_HOME="$ADDON_HOME" exec $ADDON_DIR/bin/mysqld $init_file &
--- a/packages/addons/service/mariadb/source/bin/mariadb.stop
+++ b/packages/addons/service/mariadb/source/bin/mariadb.stop
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+kill $(cat /var/run/mysqld/mysqld.pid)
--- a/packages/addons/service/mariadb/source/config/my.cnf
+++ b/packages/addons/service/mariadb/source/config/my.cnf
@@ -0,0 +1,207 @@
+# MariaDB database server configuration file.
+#
+# You can copy this file to one of:
+# - "/etc/mysql/my.cnf" to set global options,
+# - "~/.my.cnf" to set user-specific options.
+#
+# One can use all long options that the program supports.
+# Run program with --help to get a list of available options and with
+# --print-defaults to see which it would actually understand and use.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+# This will be passed to all mysql clients
+# It has been reported that passwords should be enclosed with ticks/quotes
+# escpecially if they contain "#" chars...
+# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
+[client]
+port		= 3306
+socket	= /var/run/mysqld/mysqld.sock
+
+# Here is entries for some specific programs
+# The following values assume you have at least 32M ram
+
+# This was formally known as [safe_mysqld]. Both versions are currently parsed.
+[mysqld_safe]
+socket	= /var/run/mysqld/mysqld.sock
+nice		= 0
+
+[mysqld]
+#
+# * Basic Settings
+#
+user		  = root
+pid-file	= /var/run/mysqld/mysqld.pid
+socket		= /var/run/mysqld/mysqld.sock
+port		  = 3306
+basedir   = /storage/.kodi/addons/service.mariadb
+datadir   = /storage/.kodi/userdata/addon_data/service.mariadb/data
+log-error = /storage/.kodi/userdata/addon_data/service.mariadb/mysqld.log
+tmpdir		= /tmp
+#lc_messages_dir	= /usr/share/mysql
+lc_messages	= en_US
+skip-external-locking
+# Kodi needs more for library (256K should probably be enough)
+#thread_stack = 128K
+thread_stack = 384K
+#
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+#bind-address		= 127.0.0.1
+#
+# * Fine Tuning
+#
+max_connections		= 100
+connect_timeout		= 5
+wait_timeout			= 600
+max_allowed_packet	= 16M
+thread_cache_size   = 128
+sort_buffer_size	= 4M
+bulk_insert_buffer_size	= 16M
+tmp_table_size		= 32M
+max_heap_table_size	= 32M
+#
+# * MyISAM
+#
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched. On error, make copy and try a repair.
+myisam_recover_options = BACKUP
+key_buffer_size		= 128M
+#open-files-limit	= 2000
+#table_open_cache	= 400
+table_open_cache	= 1000
+myisam_sort_buffer_size	= 512M
+concurrent_insert	= 2
+read_buffer_size	= 2M
+read_rnd_buffer_size	= 1M
+#
+# * Query Cache Configuration
+#
+# Cache only tiny result sets, so we can fit more in the query cache.
+query_cache_limit		= 128K
+query_cache_size		= 64M
+# for more write intensive setups, set to DEMAND or OFF
+#query_cache_type		= DEMAND
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /storage/.kodi/userdata/addon_data/service.mariadb/mysql.log
+#general_log             = 1
+#
+# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
+#
+# we do want to know about network errors and such
+log_warnings		= 2
+#
+# Enable the slow query log to see queries with especially long duration
+#slow_query_log[={0|1}]
+slow_query_log_file	= /storage/.kodi/userdata/addon_data/mariadb-slow.log
+long_query_time = 10
+#log_slow_rate_limit	= 1000
+log_slow_verbosity	= query_plan
+
+#log-queries-not-using-indexes
+#log_slow_admin_statements
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id		= 1
+#report_host		= master1
+#auto_increment_increment = 2
+#auto_increment_offset	= 1
+# disable binary log
+#log_bin		= /storage/.kodi/userdata/addon_data/service.mariadb/mariadb-bin
+#log_bin_index		= /storage/.kodi/userdata/addon_data/service.mariadb/mariadb-bin.index
+# not fab for performance, but safer
+#sync_binlog		= 1
+expire_logs_days	= 10
+max_binlog_size         = 100M
+# slaves
+#relay_log		= /storage/.kodi/userdata/addon_data/service.mariadb/relay-bin
+#relay_log_index	= /storage/.kodi/userdata/addon_data/service.mariadb/relay-bin.index
+#relay_log_info_file	= /storage/.kodi/userdata/addon_data/service.mariadb/relay-bin.info
+#log_slave_updates
+#read_only
+#
+# If applications support it, this stricter sql_mode prevents some
+# mistakes like inserting invalid dates etc.
+#sql_mode		= NO_ENGINE_SUBSTITUTION,TRADITIONAL
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# Read the manual for more InnoDB related options. There are many!
+default_storage_engine	= InnoDB
+# you can't just change log file size, requires special procedure
+#innodb_log_file_size	= 50M
+
+# optimizations https://forum.kodi.tv/showthread.php?tid=329046&pid=2708799 #pid2708799
+#               https://discourse.coreelec.org/t/kodi-and-mariadb-part-2/513
+#  innodb_buffer_pool_size=2G  # MariaDB recommends using 80% of your available memory but the default 1G might be enough. Always set to multiples of 1G.
+#  innodb_buffer_pool_instances=2  # When innodb_buffer_pool_size is > 1G, MariaDB will split the pool in instances. They should be even dividers of 1G.
+#  innodb_file_format=Barracuda  # Gone in 10.3 / This is an optimized storage engine not available in MySQL
+#  innodb_log_block_size=4096  # Gone in 10.3 / Default is 512, when using an SSD or 4k drives, block size should be 4096
+#  innodb_adaptive_hash_index=OFF  # For Kodi no benefit is gained from additional indexes. This should only be used with large databases.
+#  character-set-server=utf8  # I really hope you all used this in MySQL already.  This avoids potential pitfalls with text in exotic codepages.
+#  key-buffer-size=64k  # When not using MyISAM as storage engine, this buffer can be reduced to a minimum
+#  skip-name-resolve  # Avoids name resolving in the local network, thus reducing overhead. That also means that all connections are done by IP only.
+#  optimizer_search_depth=1  # Here we are, this is winner of the year.
+
+innodb_buffer_pool_size	= 256M
+innodb_log_buffer_size	= 8M
+innodb_file_per_table	= 1
+innodb_open_files	= 400
+innodb_io_capacity	= 400
+innodb_flush_method	= O_DIRECT
+character-set-server=utf8    # This avoids potential pitfalls with text in exotic codepages.
+#skip-name-resolve            # Avoids name resolving in the local network, thus reducing overhead. That also means that all connections are done by IP only.
+# well, not really according to use cases :(
+#optimizer_search_depth=0     # Here we are, this is winner of the year.
+
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+
+#
+# * Galera-related settings
+#
+[galera]
+# Mandatory settings
+#wsrep_on=ON
+#wsrep_provider=
+#wsrep_cluster_address=
+#binlog_format=row
+#default_storage_engine=InnoDB
+#innodb_autoinc_lock_mode=2
+#
+# Allow server to accept connections on all interfaces.
+#
+#bind-address=0.0.0.0
+#
+# Optional setting
+#wsrep_slave_threads=1
+#innodb_flush_log_at_trx_commit=0
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet	= 16M
+
+[mysql]
+#no-auto-rehash	# faster start of mysql but no tab completion
+
+[isamchk]
+key_buffer		= 16M
--- a/packages/addons/service/mariadb/source/default.py
+++ b/packages/addons/service/mariadb/source/default.py
@@ -0,0 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
+
+import subprocess
+import xbmc
+import xbmcaddon
+
+class Monitor(xbmc.Monitor):
+   def __init__(self, *args, **kwargs):
+      xbmc.Monitor.__init__(self)
+      self.id = xbmcaddon.Addon().getAddonInfo('id')
+
+   def onSettingsChanged(self):
+      subprocess.call(['systemctl', 'restart', self.id])
+
+if __name__ == "__main__":
+   Monitor().waitForAbort()
+
--- a/Show More
+++ b/Show More