From 79a4a5dd8ca5894744874d5a15ea5b1dc8976f3c Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 9 Oct 2021 19:55:45 +0000 Subject: [PATCH] functions: add_user: replace python with openssl python's crypt module is deprecated in 3.11 and to be removed in 3.13. Replace its usage with openssl's passwd. Signed-off-by: Ian Leonard --- config/functions | 2 +- packages/virtual/toolchain/package.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/functions b/config/functions index 7fd8972f1c..9ddf319095 100644 --- a/config/functions +++ b/config/functions @@ -1612,7 +1612,7 @@ add_user() { if [ "$PASSWORD" = "x" ]; then PASSWORD="*" else - PASSWORD=$(python -c "import crypt; print(crypt.crypt('$PASSWORD', crypt.mksalt(crypt.METHOD_SHA512)))") + PASSWORD=$(openssl passwd -6 "${PASSWORD}") fi if ! grep -q "^$1:" ${INSTALL}/usr/cache/shadow; then echo "$1:$PASSWORD:::::::" >> ${INSTALL}/usr/cache/shadow diff --git a/packages/virtual/toolchain/package.mk b/packages/virtual/toolchain/package.mk index 2231b828b3..dc3ff1ea58 100644 --- a/packages/virtual/toolchain/package.mk +++ b/packages/virtual/toolchain/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_HOST="autoconf:host autoconf-archive:host automake:host bison:host configtools:host cmake:host flex:host intltool:host libtool:host ninja:host make:host meson:host p7zip:host pigz:host sed:host xmlstarlet:host xz:host" +PKG_DEPENDS_HOST="autoconf:host autoconf-archive:host automake:host bison:host configtools:host cmake:host flex:host intltool:host libtool:host ninja:host make:host meson:host openssl:host p7zip:host pigz:host sed:host xmlstarlet:host xz:host" PKG_DEPENDS_TARGET="toolchain:host gcc:host" PKG_SECTION="virtual" PKG_LONGDESC="LibreELEC.tv' toolchain to compile all packages"