From 102b0ae459cc051bbf39ebe680e65167c5de6be7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 7 Apr 2024 15:45:37 +0200 Subject: [PATCH] package/freeradius-server: add libxcrypt optional dependency Fix the following build failure raised since bump of glibc to version 2.39 in commit b5680f53d60acf8ff6010082f873438a39bd5d97: src/lib/missing.c:31:7: error: conflicting types for 'crypt'; have 'char *(char *, char *)' 31 | char *crypt(UNUSED char *key, char *salt) | ^~~~~ In file included from src/freeradius-devel/missing.h:60, from src/freeradius-devel/libradius.h:71, from src/lib/missing.c:26: /home/buildroot/autobuild/instance-2/output-1/host/mipsel-buildroot-linux-gnu/sysroot/usr/include/unistd.h:1162:14: note: previous declaration of 'crypt' with type 'char *(const char *, const char *)' 1162 | extern char *crypt (const char *__key, const char *__salt) | ^~~~~ Fixes: b5680f53d60acf8ff6010082f873438a39bd5d97 - http://autobuild.buildroot.org/results/dc45f1291245a0dadd382cea2ad41573ad976d60 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/freeradius-server/Config.in | 1 + package/freeradius-server/freeradius-server.mk | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/package/freeradius-server/Config.in b/package/freeradius-server/Config.in index d51d92714d..e99778ea49 100644 --- a/package/freeradius-server/Config.in +++ b/package/freeradius-server/Config.in @@ -6,6 +6,7 @@ config BR2_PACKAGE_FREERADIUS_SERVER depends on BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_LIBOPENSSL_ENABLE_MD4 if BR2_PACKAGE_LIBOPENSSL select BR2_PACKAGE_LIBTALLOC + select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC help FreeRADIUS is an open source server which implements a protocol for remote user Authorization, Authentication diff --git a/package/freeradius-server/freeradius-server.mk b/package/freeradius-server/freeradius-server.mk index 1e8ada6bb9..c64ae79918 100644 --- a/package/freeradius-server/freeradius-server.mk +++ b/package/freeradius-server/freeradius-server.mk @@ -119,6 +119,10 @@ else FREERADIUS_SERVER_CONF_OPTS += --without-pcap endif +ifeq ($(BR2_PACKAGE_LIBXCRYPT),y) +FREERADIUS_SERVER_DEPENDENCIES += libxcrypt +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) FREERADIUS_SERVER_CONF_OPTS += --with-rlm_pam FREERADIUS_SERVER_DEPENDENCIES += linux-pam