From 12ea11d86efa62af8f4b19cd871adf4c90981f52 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 5 Apr 2024 17:36:22 +0200 Subject: [PATCH] package/dropbear: add optional dependency to libxcrypt When glibc was bumped to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97 it removed the deprecated libcrypt support. Due to this removal dropbear was unable to accept connections using password authentication. Signed-off-by: Bernd Kuhls Tested-by: James Hilliard Signed-off-by: Yann E. MORIN --- package/dropbear/Config.in | 1 + package/dropbear/dropbear.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in index e14a670c19..6a9161d659 100644 --- a/package/dropbear/Config.in +++ b/package/dropbear/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_DROPBEAR bool "dropbear" select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL select BR2_PACKAGE_LIBTOMCRYPT if !BR2_PACKAGE_DROPBEAR_SMALL + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help A small SSH 2 server designed for small memory environments. diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk index 440ebd44a2..1571c5d957 100644 --- a/package/dropbear/dropbear.mk +++ b/package/dropbear/dropbear.mk @@ -36,6 +36,10 @@ ifeq ($(BR2_SHARED_STATIC_LIBS),y) DROPBEAR_CONF_OPTS += --disable-static endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +DROPBEAR_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) define DROPBEAR_SVR_PAM_AUTH echo '#define DROPBEAR_SVR_PASSWORD_AUTH 0' >> $(@D)/localoptions.h