From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 24 Jan 2026 13:12:38 +0000 (+0000)
Subject: libxcrypt: Fix FTBFS with glibc >= 2.43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f164e7aeaaf4fd4c0d3d6cac18cded292eea7e8;p=ipfire-2.x.git

libxcrypt: Fix FTBFS with glibc >= 2.43

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/lfs/libxcrypt b/lfs/libxcrypt
index 6fdf996bf..e8f144d28 100644
--- a/lfs/libxcrypt
+++ b/lfs/libxcrypt
@@ -77,6 +77,7 @@ $(subst %,%_BLAKE2,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libxcrypt-4.5.1-174c24d6e87aeae631bc0a7bb1ba983cf8def4de.patch
 	cd $(DIR_APP) && autoreconf -vfi
 	cd $(DIR_APP) && \
 		./configure \
diff --git a/src/patches/libxcrypt-4.5.1-174c24d6e87aeae631bc0a7bb1ba983cf8def4de.patch b/src/patches/libxcrypt-4.5.1-174c24d6e87aeae631bc0a7bb1ba983cf8def4de.patch
new file mode 100644
index 000000000..15cb405b4
--- /dev/null
+++ b/src/patches/libxcrypt-4.5.1-174c24d6e87aeae631bc0a7bb1ba983cf8def4de.patch
@@ -0,0 +1,38 @@
+From 174c24d6e87aeae631bc0a7bb1ba983cf8def4de Mon Sep 17 00:00:00 2001
+From: Stanislav Zidek <szidek@redhat.com>
+Date: Wed, 10 Dec 2025 14:03:54 +0100
+Subject: [PATCH] fix -Werror=discarded-qualifiers
+
+On Fedora rawhide (to be Fedora 44), gcc became more strict
+wrt. const-ness.
+---
+ lib/crypt-gost-yescrypt.c | 2 +-
+ lib/crypt-sm3-yescrypt.c  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/crypt-gost-yescrypt.c b/lib/crypt-gost-yescrypt.c
+index 190ae94b..e9dc7e80 100644
+--- a/lib/crypt-gost-yescrypt.c
++++ b/lib/crypt-gost-yescrypt.c
+@@ -131,7 +131,7 @@ crypt_gost_yescrypt_rn (const char *phrase, size_t phr_size,
+   intbuf->outbuf[1] = 'g';
+ 
+   /* extract yescrypt output from "$y$param$salt$output" */
+-  char *hptr = strchr ((const char *) intbuf->retval + 3, '$');
++  char *hptr = strchr ((char *) intbuf->retval + 3, '$');
+   if (!hptr)
+     {
+       errno = EINVAL;
+diff --git a/lib/crypt-sm3-yescrypt.c b/lib/crypt-sm3-yescrypt.c
+index 4f42aa66..17da83e1 100644
+--- a/lib/crypt-sm3-yescrypt.c
++++ b/lib/crypt-sm3-yescrypt.c
+@@ -136,7 +136,7 @@ crypt_sm3_yescrypt_rn (const char *phrase, size_t phr_size,
+   intbuf->outbuf[3] = '3';
+ 
+   /* extract yescrypt output from "$y$param$salt$output" */
+-  char *hptr = strchr ((const char *) intbuf->retval + 3, '$');
++  char *hptr = strchr ((char *) intbuf->retval + 3, '$');
+   if (!hptr)
+     {
+       errno = EINVAL;