Merge pull request #1408 from fewtarius/dev

Bug fixes and updates.

packages/jelos/sources/scripts/setrootpass

@@ -19,7 +19,14 @@ sed -i "s#root:${CURRENT}:${LPC}::::::#root:${NEW}:${LPC}::::::#g" /storage/.cac
 echo -ne "${ROOTPASS}\n${ROOTPASS}\n" | smbpasswd -sa root 2>/dev/null
 
 # Set the root user and password for SyncThing
-syncthing generate --gui-user "root" --gui-password "${ROOTPASS}"
+syncthing generate --gui-user "root" --gui-password "${ROOTPASS}" >/dev/null 2>&1
 
 # Save the password so we can display it in ES
 set_setting root.password "${ROOTPASS}"
+
+# Restart syncthing if it was enabled.
+SYNCSTATUS=$(get_setting syncthing.enabled)
+if [ "${SYNCSTATUS}" = "1" ]
+then
+  systemctl restart syncthing >/dev/null 2>&1
+fi

packages/network/openssh/package.mk

@@ -3,8 +3,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="openssh"
-PKG_VERSION="9.2p1"
-PKG_SHA256="3f66dbf1655fb45f50e1c56da62ab01218c228807b21338d634ebcdf9d71cf46"
+PKG_VERSION="9.3p1"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.openssh.com/"
 PKG_URL="https://cdn.openbsd.org/pub/OpenBSD/OpenSSH/portable/${PKG_NAME}-${PKG_VERSION}.tar.gz"

packages/network/samba/package.mk

@@ -3,8 +3,7 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="samba"
-PKG_VERSION="4.17.0"
-PKG_SHA256="04868ecda82fcbeda7b8bf519a2461a64d55c6e70efc6f6053b2fbba55f1823a"
+PKG_VERSION="4.18.2"
 PKG_LICENSE="GPLv3+"
 PKG_SITE="https://www.samba.org"
 PKG_URL="https://download.samba.org/pub/samba/stable/${PKG_NAME}-${PKG_VERSION}.tar.gz"

packages/network/samba/patches/samba-200-4.11-fix-ASN1-bso14164.patch

@@ -1,88 +0,0 @@
-From 2e53f331104b29db7caf1641a30d3e9316b57184 Mon Sep 17 00:00:00 2001
-From: Uri Simchoni <uri@samba.org>
-Date: Sun, 20 Oct 2019 00:03:14 +0300
-Subject: [PATCH] build: find pre-built heimdal build tools in case of embedded
- heimdal
-
-This patch fixes the case of finding asn1_compile and compile_et for
-building embedded heimdal, by setting
---bundled-libraries='!asn1_compile,!compile_et' as configure flags.
-
-The Heimdal build tools compile_et and asn1_compile are needed *only*
-if we use the embedded heimdal (otherwise we don't build heimdal and
-use headers that have been generated by those tools elsewhere).
-
-For cross-compilation with embedded heimdal, it is vital to use host build
-tools, and so asn1_compile and compile_et must be supplied and not
-built. One way of doing this would be to set the COMPILE_ET and
-ASN1_COMPILE env vars to the location of supplied binaries. Another way,
-which is more commonly used, is to exclude asn1_compile and compile_et
-from bundled packages via the switch
--bundled-libraries='!asn1_compile,!compile_et'. When this is done,
-the build script searches the path for those tools and sets the
-ASN1_COMPILE and COMPILE_ET vars accordingly. (this is admittedly
-kind of a round-about way of doing things but this has become the
-de-facto standard amongst embedded distro builders).
-
-In commit 8061983d4882f3ba3f12da71443b035d7b672eec, this process of
-finding the binaris has been moved to be carried out only in the
-system heimdal case. As explained above, we only need these tools,
-and hence the check, in bundled mode.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14164
-
-Signed-off-by: Uri Simchoni <uri@samba.org>
----
- wscript_configure_embedded_heimdal | 11 +++++++++++
- wscript_configure_system_heimdal   | 11 -----------
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/wscript_configure_embedded_heimdal b/wscript_configure_embedded_heimdal
-index 8c55ae2..4fdae80 100644
---- a/wscript_configure_embedded_heimdal
-+++ b/wscript_configure_embedded_heimdal
-@@ -6,3 +6,14 @@
- 
- conf.define('USING_EMBEDDED_HEIMDAL', 1)
- conf.RECURSE('third_party/heimdal_build')
-+
-+def check_system_heimdal_binary(name):
-+    if conf.LIB_MAY_BE_BUNDLED(name):
-+        return False
-+    if not conf.find_program(name, var=name.upper()):
-+        return False
-+    conf.define('USING_SYSTEM_%s' % name.upper(), 1)
-+    return True
-+
-+check_system_heimdal_binary("compile_et")
-+check_system_heimdal_binary("asn1_compile")
-diff --git a/wscript_configure_system_heimdal b/wscript_configure_system_heimdal
-index 235fa19..4f4a83cd 100644
---- a/wscript_configure_system_heimdal
-+++ b/wscript_configure_system_heimdal
-@@ -37,14 +37,6 @@ def check_system_heimdal_lib(name, functions='', headers='', onlyif=None):
-     conf.define('USING_SYSTEM_%s' % name.upper(), 1)
-     return True
- 
--def check_system_heimdal_binary(name):
--    if conf.LIB_MAY_BE_BUNDLED(name):
--        return False
--    if not conf.find_program(name, var=name.upper()):
--        return False
--    conf.define('USING_SYSTEM_%s' % name.upper(), 1)
--    return True
--
- check_system_heimdal_lib("com_err", "com_right_r com_err", "com_err.h")
- 
- if check_system_heimdal_lib("roken", "rk_socket_set_reuseaddr", "roken.h"):
-@@ -86,7 +78,4 @@ finally:
- #if conf.CHECK_BUNDLED_SYSTEM('tommath', checkfunctions='mp_init', headers='tommath.h'):
- #    conf.define('USING_SYSTEM_TOMMATH', 1)
- 
--check_system_heimdal_binary("compile_et")
--check_system_heimdal_binary("asn1_compile")
--
- conf.env.KRB5_VENDOR = 'heimdal'
--- 
-2.20.1
-

packages/sysutils/systemd/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="systemd"
-PKG_VERSION="253.3"
+PKG_VERSION="253.4"
 PKG_LICENSE="LGPL2.1+"
 PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd"
 PKG_URL="https://github.com/systemd/systemd-stable/archive/v${PKG_VERSION}.tar.gz"