Merge pull request #8135 from heitbaum/addon

Addon updates

packages/addons/addon-depends/chrome-depends/at-spi2-core/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="at-spi2-core"
-PKG_VERSION="2.48.0"
-PKG_SHA256="905a5b6f1790b68ee803bffa9f5fab4ceb591fb4fae0b2f8c612c54f1d4e8a30"
+PKG_VERSION="2.49.1"
+PKG_SHA256="53ed9eb77e4c48b3bf6ac4afb5689391e0d7d0f44f7ca4443d8b13c7dd26119c"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.gnome.org/"
 PKG_URL="https://download.gnome.org/sources/at-spi2-core/${PKG_VERSION:0:4}/at-spi2-core-${PKG_VERSION}.tar.xz"

packages/addons/addon-depends/chrome-depends/cups/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="cups"
-PKG_VERSION="2.4.2"
-PKG_SHA256="7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682"
+PKG_VERSION="2.4.6"
+PKG_SHA256="7d89f684aace50e17100c78812069168f1bdc06f95623117094f8c47ef867aef"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.cups.org"
 PKG_URL="https://github.com/openprinting/cups/archive/v${PKG_VERSION}.tar.gz"

packages/addons/addon-depends/chrome-depends/gtk3/package.mk

@@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gtk3"
-PKG_VERSION="3.24.37"
-PKG_SHA256="6745f0b4c053794151fd0f0e2474b077cccff5f83e9dd1bf3d39fe9fe5fb7f57"
+PKG_VERSION="3.24.38"
+PKG_SHA256="ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://www.gtk.org/"
 PKG_URL="https://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION:0:4}/gtk+-${PKG_VERSION}.tar.xz"

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.13-mt1"
-PKG_SHA256="093e48e14fdbde0761c31c5899a81b36b11078b17411bb8b3723c1e32285d404"
+PKG_VERSION="3.14"
+PKG_SHA256="bbafa2c9687f0f7fe00947dc779b83c91663911e22460005c0ad4623797b3dbd"
 PKG_LICENSE="BSD"
 PKG_SITE="http://software.es.net/iperf/"
 PKG_URL="https://github.com/esnet/iperf/archive/${PKG_VERSION}.tar.gz"

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

@@ -2,8 +2,8 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="nmap"
-PKG_VERSION="7.93"
-PKG_SHA256="55bcfe4793e25acc96ba4274d8c4228db550b8e8efd72004b38ec55a2dd16651"
+PKG_VERSION="7.94"
+PKG_SHA256="d71be189eec43d7e099bac8571509d316c4577ca79491832ac3e1217bc8f92cc"
 PKG_LICENSE="GPL"
 PKG_SITE="https://nmap.org/"
 PKG_URL="https://nmap.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
@@ -18,7 +18,9 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \
                            --with-libdnet=included \
                            --with-liblua=included \
                            --with-liblinear=included \
-                           --with-openssl=${SYSROOT_PREFIX}"
+                           --with-openssl=${SYSROOT_PREFIX} \
+                           --with-ndiff=no \
+                           --with-zenmap=no"
 
 pre_configure_target() {
 # nmap fails to build in subdirs

packages/addons/addon-depends/snapcast-depends/asio/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="asio"
-PKG_VERSION="1.28.0"
-PKG_SHA256="5c2af07ef73b42a2d48e34c0ecbf41cd40dc823bc681bf5833c129384999c963"
+PKG_VERSION="1.28.1"
+PKG_SHA256="8c6adab3a94690773668ded084d3b0dc01d7231ec1edf1ad862f8db0e275ee56"
 PKG_LICENSE="BSL"
 PKG_SITE="http://think-async.com/Asio"
 PKG_URL="https://github.com/chriskohlhoff/asio/archive/asio-${PKG_VERSION//./-}.zip"

packages/addons/addon-depends/snapcast-depends/nqptp/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="nqptp"
-PKG_VERSION="1.2.1"
-PKG_SHA256="fab700572961ca81addb405e8bd4bd57c47259f91e7e8e0f5f82240c38c63ce5"
+PKG_VERSION="1.2.3"
+PKG_SHA256="cf965fd4f5b860070cd71a4aa1c98dc7525c5ff4a8447bd2c6434a28b11765a0"
 PKG_LICENSE="GPL-2.0"
 PKG_SITE="https://github.com/mikebrady/nqptp"
 PKG_URL="https://github.com/mikebrady/nqptp/archive/${PKG_VERSION}.tar.gz"

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

@@ -2,13 +2,13 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="jq"
-PKG_VERSION="1.6"
-PKG_SHA256="5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72"
+PKG_VERSION="1.7"
+PKG_SHA256="402a0d6975d946e6f4e484d1a84320414a0ff8eb6cf49d2c11d144d4d344db62"
 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_SITE="https://jqlang.github.io/jq/"
+PKG_URL="https://github.com/jqlang/jq/releases/download/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain oniguruma"
-PKG_LONGDESC="A like sed for JSON data."
+PKG_LONGDESC="Command-line JSON processor"
 PKG_BUILD_FLAGS="-sysroot"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared \

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.16.04"
-PKG_SHA256="3453719508e9e02c57a736c154408538372d078be7dcf8e0165d37a821cdba45"
+PKG_VERSION="0.16.05"
+PKG_SHA256="ecb56e42a5ac6d94385de10ae8163a4fe50116d6b07e3ff61752d3854b630037"
 PKG_LICENSE="GPLv2"
 PKG_SITE="https://github.com/ColinIanKing/stress-ng"
 PKG_URL="https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V${PKG_VERSION}.tar.gz"

packages/addons/browser/chrome/package.mk

@@ -4,8 +4,8 @@
 PKG_NAME="chrome"
 PKG_VERSION="1.0"
 # curl -s http://dl.google.com/linux/chrome/deb/dists/stable/main/binary-amd64/Packages | grep -B 1 Version
-PKG_VERSION_NUMBER="109.0.5414.74"
-PKG_REV="0"
+PKG_VERSION_NUMBER="116.0.5845.179"
+PKG_REV="1"
 PKG_ARCH="x86_64"
 PKG_LICENSE="Custom"
 PKG_SITE="http://www.google.com/chrome"

packages/addons/service/mariadb/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="mariadb"
 PKG_VERSION="10.11.5"
-PKG_REV="1"
+PKG_REV="2"
 PKG_SHA256="4c9484048d4d0c71dd076ab33fc2a9ce8510bdf762886de0d63fe52496f3dbbb"
 PKG_LICENSE="GPL2"
 PKG_SITE="https://mariadb.org"
@@ -66,7 +66,8 @@ configure_package() {
     -DMASK_LONGDOUBLE_EXITCODE=0 \
     -DMASK_LONGDOUBLE_EXITCODE__TRYRUN_OUTPUT='' \
     -DSTAT_EMPTY_STRING_BUG_EXITCODE=0 \
-    -DSTAT_EMPTY_STRING_BUG_EXITCODE__TRYRUN_OUTPUT=''"
+    -DSTAT_EMPTY_STRING_BUG_EXITCODE__TRYRUN_OUTPUT='' \
+    -DWITH_LIBFMT=system"
 }
 
 make_host() {

packages/addons/service/mariadb/patches/mariadb-2732--fix-build-with-libfmt.patch

@@ -0,0 +1,134 @@
+From c657a1973e274b16db0631dc3862e276ab354564 Mon Sep 17 00:00:00 2001
+From: Ruoyu Zhong <zhongruoyu@outlook.com>
+Date: Sat, 19 Aug 2023 22:48:16 +0800
+Subject: [PATCH 1/2] MDEV-31963 cmake: fix libfmt usage
+
+`fmt::detail::make_arg` does not accept temporaries, so the code snippet
+checking system libfmt needs to be adjusted.
+
+Signed-off-by: Ruoyu Zhong <zhongruoyu@outlook.com>
+---
+ cmake/libfmt.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/libfmt.cmake b/cmake/libfmt.cmake
+index 7eaa0dfa0128e..70b6a07216f90 100644
+--- a/cmake/libfmt.cmake
++++ b/cmake/libfmt.cmake
+@@ -33,8 +33,9 @@ MACRO (CHECK_LIBFMT)
+      #include <fmt/format-inl.h>
+      #include <iostream>
+      int main() {
++       int answer= 42;
+        fmt::format_args::format_arg arg=
+-         fmt::detail::make_arg<fmt::format_context>(42);
++         fmt::detail::make_arg<fmt::format_context>(answer);
+          std::cout << fmt::vformat(\"The answer is {}.\",
+                                    fmt::format_args(&arg, 1));
+      }" HAVE_SYSTEM_LIBFMT)
+
+From bf43b3972c5e8f445dd439ecb28068e0e173aa5d Mon Sep 17 00:00:00 2001
+From: Ruoyu Zhong <zhongruoyu@outlook.com>
+Date: Sun, 20 Aug 2023 19:43:57 +0800
+Subject: [PATCH 2/2] MDEV-31963 Fix libfmt usage in SFORMAT
+
+`fmt::detail::make_arg` does not accept temporaries. Make it happy by
+storing the format arg values in a temporary array first.
+
+Signed-off-by: Ruoyu Zhong <zhongruoyu@outlook.com>
+---
+ sql/item_strfunc.cc | 43 ++++++++++++++++++++++++++++++++++++-------
+ 1 file changed, 36 insertions(+), 7 deletions(-)
+
+diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
+index 007e2bbc16f6f..4bbf36ec1cf30 100644
+--- a/sql/item_strfunc.cc
++++ b/sql/item_strfunc.cc
+@@ -1407,11 +1407,24 @@ namespace fmt {
+ */
+ String *Item_func_sformat::val_str(String *res)
+ {
++  /*
++    A union that stores a numeric format arg value.
++    fmt::detail::make_arg does not accept temporaries, so all of its numeric
++    args are temporarily stored in the fmt_args array.
++    See: https://github.com/fmtlib/fmt/issues/3596
++  */
++  union Format_arg_store {
++    longlong val_int;
++    float    val_float;
++    double   val_double;
++  };
++
+   DBUG_ASSERT(fixed());
+-  using                         ctx=     fmt::format_context;
+-  String                       *fmt_arg= NULL;
+-  String                       *parg=    NULL;
+-  fmt::format_args::format_arg *vargs=   NULL;
++  using                         ctx=      fmt::format_context;
++  String                       *fmt_arg=  NULL;
++  String                       *parg=     NULL;
++  fmt::format_args::format_arg *vargs=    NULL;
++  Format_arg_store             *fmt_args= NULL;
+ 
+   null_value= true;
+   if (!(fmt_arg= args[0]->val_str(res)))
+@@ -1420,25 +1433,39 @@ String *Item_func_sformat::val_str(String *res)
+   if (!(vargs= new fmt::format_args::format_arg[arg_count - 1]))
+     return NULL;
+ 
++  if (!(fmt_args= new Format_arg_store[arg_count - 1]))
++  {
++    delete [] vargs;
++    return NULL;
++  }
++
+   /* Creates the array of arguments for vformat */
+   for (uint carg= 1; carg < arg_count; carg++)
+   {
+     switch (args[carg]->result_type())
+     {
+     case INT_RESULT:
+-      vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_int());
++      fmt_args[carg-1].val_int= args[carg]->val_int();
++      vargs[carg-1]= fmt::detail::make_arg<ctx>(fmt_args[carg-1].val_int);
+       break;
+     case DECIMAL_RESULT: // TODO
+     case REAL_RESULT:
+       if (args[carg]->field_type() == MYSQL_TYPE_FLOAT)
+-        vargs[carg-1]= fmt::detail::make_arg<ctx>((float)args[carg]->val_real());
++      {
++        fmt_args[carg-1].val_float= (float)args[carg]->val_real();
++        vargs[carg-1]= fmt::detail::make_arg<ctx>(fmt_args[carg-1].val_float);
++      }
+       else
+-        vargs[carg-1]= fmt::detail::make_arg<ctx>(args[carg]->val_real());
++      {
++        fmt_args[carg-1].val_double= args[carg]->val_real();
++        vargs[carg-1]= fmt::detail::make_arg<ctx>(fmt_args[carg-1].val_double);
++      }
+       break;
+     case STRING_RESULT:
+       if (!(parg= args[carg]->val_str(&val_arg[carg-1])))
+       {
+         delete [] vargs;
++        delete [] fmt_args;
+         return NULL;
+       }
+       vargs[carg-1]= fmt::detail::make_arg<ctx>(*parg);
+@@ -1448,6 +1475,7 @@ String *Item_func_sformat::val_str(String *res)
+     default:
+       DBUG_ASSERT(0);
+       delete [] vargs;
++      delete [] fmt_args;
+       return NULL;
+     }
+   }
+@@ -1471,6 +1499,7 @@ String *Item_func_sformat::val_str(String *res)
+     null_value= true;
+   }
+   delete [] vargs;
++  delete [] fmt_args;
+   return null_value ? NULL : res;
+ }
+ 

packages/addons/service/minidlna/package.mk

@@ -2,9 +2,9 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="minidlna"
-PKG_VERSION="1.3.2"
-PKG_SHA256="222ce45a1a60c3ce3de17527955d38e5ff7a4592d61db39577e6bf88e0ae1cb0"
-PKG_REV="0"
+PKG_VERSION="1.3.3"
+PKG_SHA256="39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="BSD-3c/GPLv2"
 PKG_SITE="https://sourceforge.net/projects/minidlna/"

packages/addons/service/minisatip/package.mk

@@ -2,9 +2,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="minisatip"
-PKG_VERSION="1.2.84"
-PKG_SHA256="d5a06b0c371e1f5ccba6fcb3d76abf348e93e14ab4d7317bb701ae023c085e4b"
-PKG_REV="0"
+PKG_VERSION="1.3.0"
+PKG_SHA256="8d91d15ea183f25fb662dc7fa542360c36ede61a2dae499eaafd3a0acd5d029a"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/catalinii/minisatip"

packages/addons/service/mpd/package.mk

@@ -3,9 +3,9 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="mpd"
-PKG_VERSION="0.23.12"
-PKG_SHA256="b7fca62284ecc25a681ea6a07abc49200af5353be42cb5a31e3173be9d8702e7"
-PKG_REV="0"
+PKG_VERSION="0.23.13"
+PKG_SHA256="a96b01e6fbbb7e8ab25eb7c15d5c811c62eb19b76d143a802f51674791f1d519"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.musicpd.org"

packages/addons/service/snapclient/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="snapclient"
 PKG_VERSION="0.27.0"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_DEPENDS_TARGET="toolchain alsa-plugins snapcast"

packages/addons/service/snapserver/package.mk

@@ -3,7 +3,7 @@
 
 PKG_NAME="snapserver"
 PKG_VERSION="0.27.0"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3"
 PKG_DEPENDS_TARGET="toolchain nqptp shairport-sync snapcast"

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

@@ -3,7 +3,7 @@
 
 PKG_NAME="network-tools"
 PKG_VERSION="1.0"
-PKG_REV="0"
+PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"

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

@@ -3,7 +3,7 @@
 
 PKG_NAME="system-tools"
 PKG_VERSION="1.0"
-PKG_REV="3"
+PKG_REV="4"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"