From 2b2b3d017d47f4ae357de8e52249c895a87a68a3 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 1 Aug 2023 10:22:15 +0000
Subject: [PATCH 1/3] libxcrypt: initial package

---
 packages/security/libxcrypt/package.mk | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 packages/security/libxcrypt/package.mk

diff --git a/packages/security/libxcrypt/package.mk b/packages/security/libxcrypt/package.mk
new file mode 100644
index 0000000000..c7fc0fd4e2
--- /dev/null
+++ b/packages/security/libxcrypt/package.mk
@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="libxcrypt"
+PKG_VERSION="4.4.36"
+PKG_SHA256="e5e1f4caee0a01de2aee26e3138807d6d3ca2b8e67287966d1fefd65e1fd8943"
+PKG_LICENSE="LGPL-2.1"
+PKG_SITE="https://github.com/besser82/libxcrypt"
+PKG_URL="https://github.com/besser82/libxcrypt/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
+PKG_DEPENDS_TARGET="glibc"
+PKG_LONGDESC="Extended crypt library for descrypt, md5crypt, bcrypt, and others"

From 6366053a68602f83b621a5c3ce0e716ec3b0b86e Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 1 Aug 2023 10:20:16 +0000
Subject: [PATCH 2/3] glibc: drop --enable-crypt which is now deprecated and
 use libxcrypt

---
 packages/devel/glibc/package.mk  | 1 -
 packages/lang/gcc/package.mk     | 2 +-
 packages/virtual/libc/package.mk | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
index a312a69c93..d7a9c14832 100644
--- a/packages/devel/glibc/package.mk
+++ b/packages/devel/glibc/package.mk
@@ -26,7 +26,6 @@ PKG_CONFIGURE_OPTS_TARGET="BASH_SHELL=/bin/sh \
                            --disable-sanity-checks \
                            --enable-add-ons \
                            --enable-bind-now \
-                           --enable-crypt \
                            --with-elf \
                            --with-tls \
                            --with-__thread \
diff --git a/packages/lang/gcc/package.mk b/packages/lang/gcc/package.mk
index d95e71c1ca..41ac3177a3 100644
--- a/packages/lang/gcc/package.mk
+++ b/packages/lang/gcc/package.mk
@@ -10,7 +10,7 @@ PKG_SITE="https://gcc.gnu.org/"
 PKG_URL="https://ftpmirror.gnu.org/gcc/${PKG_NAME}-${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_BOOTSTRAP="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host"
 PKG_DEPENDS_TARGET="toolchain"
-PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host glibc"
+PKG_DEPENDS_HOST="ccache:host autoconf:host binutils:host gmp:host mpfr:host mpc:host zstd:host glibc libxcrypt"
 PKG_DEPENDS_INIT="toolchain"
 PKG_LONGDESC="This package contains the GNU Compiler Collection."
 
diff --git a/packages/virtual/libc/package.mk b/packages/virtual/libc/package.mk
index 8aae341393..2c07b6ec7b 100644
--- a/packages/virtual/libc/package.mk
+++ b/packages/virtual/libc/package.mk
@@ -7,7 +7,7 @@ PKG_VERSION=""
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain glibc tz libidn2"
+PKG_DEPENDS_TARGET="toolchain glibc libxcrypt tz libidn2"
 PKG_DEPENDS_INIT="toolchain glibc:init"
 PKG_SECTION="virtual"
 PKG_LONGDESC="Meta package for installing various tools and libs needed for libc"

From d5b87a6cd1c39cfb70f9189f6f5a261be140aaa2 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Tue, 1 Aug 2023 10:40:44 +0000
Subject: [PATCH 3/3] libxcrypt: disable obsolete api

---
 packages/security/libxcrypt/package.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/security/libxcrypt/package.mk b/packages/security/libxcrypt/package.mk
index c7fc0fd4e2..a440240df3 100644
--- a/packages/security/libxcrypt/package.mk
+++ b/packages/security/libxcrypt/package.mk
@@ -9,3 +9,5 @@ PKG_SITE="https://github.com/besser82/libxcrypt"
 PKG_URL="https://github.com/besser82/libxcrypt/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
 PKG_DEPENDS_TARGET="glibc"
 PKG_LONGDESC="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
+
+PKG_CONFIGURE_OPTS_TARGET="--disable-obsolete-api"