Update openssl, and openssh. Include the gpu driver version in device options.

packages/graphics/libmali/package.mk

@@ -8,7 +8,7 @@ PKG_LICENSE="nonfree"
 PKG_SITE="https://github.com/JustEnoughLinuxOS/libmali"
 PKG_URL="${PKG_SITE}.git"
 PKG_VERSION="7d7e1a4"
-MALI_VERSION="1.9.0"
+MALI_LIB_VERSION="1.9.0"
 GET_HANDLER_SUPPORT="git"
 PKG_DEPENDS_TARGET="toolchain libdrm"
 PKG_LONGDESC="OpenGL ES user-space binary for the ARM Mali GPU family"
@@ -24,6 +24,7 @@ PKG_CMAKE_OPTS_TARGET+=" -DMALI_ARCH=${INSTARCH}"
 
 PKG_MESON_OPTS_TARGET+=" -Darch=${TARGET_ARCH} \
                          -Dgpu=${MALI_FAMILY} \
+                         -Dversion=${MALI_VERSION} \
                          -Dplatform=gbm \
                          -Dkhr-header=true"
 
@@ -31,6 +32,6 @@ post_makeinstall_target() {
   for lib in libEGL.so.1 libgbm.so.1 libGLESv1_CM.so.1 libGLESv2.so.2 libMaliOpenCL.so.1
   do
     rm -f ${PKG_BUILD}/.install_pkg/usr/lib/${lib}
-    ln -s libmali.so.${MALI_VERSION} ${PKG_BUILD}/.install_pkg/usr/lib/${lib}
+    ln -s libmali.so.${MALI_LIB_VERSION} ${PKG_BUILD}/.install_pkg/usr/lib/${lib}
   done
 }

packages/network/openssh/package.mk

@@ -3,7 +3,7 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="openssh"
-PKG_VERSION="8.8p1"
+PKG_VERSION="8.9p1"
 PKG_LICENSE="OSS"
 PKG_SITE="https://www.openssh.com/"
 PKG_URL="https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$PKG_NAME-$PKG_VERSION.tar.gz"

packages/network/openssh/patches/openssh-7.9p1-keydir.patch

@@ -1,7 +1,7 @@
-diff -u a/configure.ac b/configure.ac
---- a/configure.ac	2018-10-16 20:01:20.000000000 -0400
-+++ b/configure.ac	2018-12-06 04:08:42.718993760 -0500
-@@ -4903,6 +4903,19 @@
+diff -rupN openssh.orig/configure.ac openssh/configure.ac
+--- openssh.orig/configure.ac	2022-02-26 19:58:30.546051700 -0500
++++ openssh/configure.ac	2022-02-26 19:59:22.049729742 -0500
+@@ -5185,6 +5185,19 @@ AC_ARG_WITH([superuser-path],
  )
  
  
@@ -21,7 +21,7 @@ diff -u a/configure.ac b/configure.ac
  AC_MSG_CHECKING([if we need to convert IPv4 in IPv6-mapped addresses])
  IPV4_IN6_HACK_MSG="no"
  AC_ARG_WITH(4in6,
-@@ -5277,6 +5290,7 @@
+@@ -5565,6 +5578,7 @@ G=`eval echo ${piddir}` ; G=`eval echo $
  H=`eval echo ${PRIVSEP_PATH}` ; H=`eval echo ${H}`
  I=`eval echo ${user_path}` ; I=`eval echo ${I}`
  J=`eval echo ${superuser_path}` ; J=`eval echo ${J}`
@@ -29,7 +29,7 @@ diff -u a/configure.ac b/configure.ac
  
  echo ""
  echo "OpenSSH has been configured with the following options:"
-@@ -5300,6 +5314,9 @@
+@@ -5588,6 +5602,9 @@ fi
  if test ! -z "$superuser_path" ; then
  echo "          sshd superuser user PATH: $J"
  fi
@@ -39,22 +39,22 @@ diff -u a/configure.ac b/configure.ac
  echo "                    Manpage format: $MANTYPE"
  echo "                       PAM support: $PAM_MSG"
  echo "                   OSF SIA support: $SIA_MSG"
-Common subdirectories: a/contrib and b/contrib
-diff -u a/Makefile.in b/Makefile.in
---- a/Makefile.in	2018-10-16 20:01:20.000000000 -0400
-+++ b/Makefile.in	2018-12-06 04:00:04.301968236 -0500
-@@ -28,8 +28,10 @@
+diff -rupN openssh.orig/Makefile.in openssh/Makefile.in
+--- openssh.orig/Makefile.in	2022-02-26 19:58:30.542051725 -0500
++++ openssh/Makefile.in	2022-02-26 20:00:16.313389959 -0500
+@@ -31,9 +31,11 @@ PRIVSEP_PATH=@PRIVSEP_PATH@
  SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
  STRIP_OPT=@STRIP_OPT@
  TEST_SHELL=@TEST_SHELL@
 +KEYDIR=@KEYDIR@
+ BUILDDIR=@abs_top_builddir@
  
  PATHS= -DSSHDIR=\"$(sysconfdir)\" \
 +	-DKEYDIR=\"$(KEYDIR)\" \
  	-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
  	-D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\" \
  	-D_PATH_SFTP_SERVER=\"$(SFTP_SERVER)\" \
-@@ -133,11 +135,11 @@
+@@ -168,11 +170,11 @@ PATHSUBS	= \
  	-e 's|/etc/ssh/sshd_config|$(sysconfdir)/sshd_config|g' \
  	-e 's|/usr/libexec|$(libexecdir)|g' \
  	-e 's|/etc/shosts.equiv|$(sysconfdir)/shosts.equiv|g' \
@@ -71,10 +71,10 @@ diff -u a/Makefile.in b/Makefile.in
  	-e 's|/var/run/sshd.pid|$(piddir)/sshd.pid|g' \
  	-e 's|/etc/moduli|$(sysconfdir)/moduli|g' \
  	-e 's|/etc/ssh/moduli|$(sysconfdir)/moduli|g' \
-Common subdirectories: a/openbsd-compat and b/openbsd-compat
-diff -u a/pathnames.h b/pathnames.h
---- a/pathnames.h	2018-10-16 20:01:20.000000000 -0400
-+++ b/pathnames.h	2018-12-06 04:15:01.286012398 -0500
+Binary files openssh.orig/.Makefile.in.rej.swp and openssh/.Makefile.in.rej.swp differ
+diff -rupN openssh.orig/pathnames.h openssh/pathnames.h
+--- openssh.orig/pathnames.h	2022-02-26 19:58:30.550051674 -0500
++++ openssh/pathnames.h	2022-02-26 19:59:22.049729742 -0500
 @@ -18,6 +18,10 @@
  #define SSHDIR				ETCDIR "/ssh"
  #endif
@@ -98,7 +98,7 @@ diff -u a/pathnames.h b/pathnames.h
  
  /*
   * Of these, ssh_host_key must be readable only by root, whereas ssh_config
-@@ -36,11 +40,11 @@
+@@ -36,12 +40,12 @@
   */
  #define _PATH_SERVER_CONFIG_FILE	SSHDIR "/sshd_config"
  #define _PATH_HOST_CONFIG_FILE		SSHDIR "/ssh_config"

packages/security/openssl/package.mk

@@ -3,8 +3,7 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="openssl"
-PKG_VERSION="1.1.1g"
-PKG_SHA256="ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46"
+PKG_VERSION="1.1.1m"
 PKG_LICENSE="BSD"
 PKG_SITE="https://www.openssl.org"
 PKG_URL="https://www.openssl.org/source/$PKG_NAME-$PKG_VERSION.tar.gz"

projects/Rockchip/devices/RG552/options

@@ -46,6 +46,7 @@
  
   # Mali GPU family
     MALI_FAMILY="midgard-t86x"
+    DRIVER_VERSION="r18p0"
     OPENGLES="libmali"
     GRAPHIC_DRIVERS=""