Hello Adolf,

> On 22 Jan 2025, at 12:43, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> - Update from version 4.4.36 to 4.4.38
> - Update of rootfile
> - Changelog
>    4.4.38
> * Fix several "-Wunterminated-string-initialization", which are seen by
>  upcoming GCC 15.x (issue #194).
> * Fix "-Wmaybe-uninitialized" in crypt.c, which is seen by GCC 13.3.0.
> * Skip test/explicit-bzero if compiling with ASAN.
> * Drop hard requirement for the pkg-config binary (issue #198).
>    4.4.37
> * Several fixes to the manpages (issue #185).
> * Add binary compatibility for x86_64 GNU/Hurd (issue #189).
> * Only test the needed makecontext signature during configure (issue #178).
> * Fix -Werror=strict-overflow in lib/crypt-bcrypt.c, which is seen
>  by GCC 4.8.5 (issue #197).
> 
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/rootfiles/common/libxcrypt | 3 +--
> lfs/libxcrypt                     | 6 +++---
> 2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/config/rootfiles/common/libxcrypt b/config/rootfiles/common/libxcrypt
> index 1cbb05816..7febd9254 100644
> --- a/config/rootfiles/common/libxcrypt
> +++ b/config/rootfiles/common/libxcrypt
> @@ -1,3 +1,4 @@
> +#root/libcrypt.pc

Can we have a fix for this where the pkg-config files are installed in /usr/lib/pkgconfig again?

I think there is just a configure switch required and auto-detection seems to fail.

If other packages cannot find lib(x)crypt through pkg-config, they might fall back to their own implementation which we don’t want.

Best,
-Michael

> #usr/include/crypt.h
> #usr/include/xcrypt.h
> #usr/lib/libcrypt.la
> @@ -7,8 +8,6 @@ usr/lib/libcrypt.so.1.1.0
> #usr/lib/libowcrypt.so
> #usr/lib/libowcrypt.so.1
> #usr/lib/libxcrypt.so
> -#usr/lib/pkgconfig/libcrypt.pc
> -#usr/lib/pkgconfig/libxcrypt.pc
> #usr/share/man/man3/crypt.3
> #usr/share/man/man3/crypt_checksalt.3
> #usr/share/man/man3/crypt_gensalt.3
> diff --git a/lfs/libxcrypt b/lfs/libxcrypt
> index 4ec63516a..2f40385ca 100644
> --- a/lfs/libxcrypt
> +++ b/lfs/libxcrypt
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2023  IPFire Team  <info(a)ipfire.org>                     #
> +# Copyright (C) 2007-2025  IPFire Team  <info(a)ipfire.org>                     #
> #                                                                             #
> # This program is free software: you can redistribute it and/or modify        #
> # it under the terms of the GNU General Public License as published by        #
> @@ -24,7 +24,7 @@
> 
> include Config
> 
> -VER        = 4.4.36
> +VER        = 4.4.38
> 
> THISAPP    = libxcrypt-$(VER)
> DL_FILE    = $(THISAPP).tar.xz
> @@ -47,7 +47,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_BLAKE2 = 9f028e0fe2cb7bb4273f3f6d1e579e0fe93cd71eba21286aa7dc078c904ea3cdce38b2955bdcd618853f7657b01aea7e28c4d898680e69fdf75f812b5a304c1d
> +$(DL_FILE)_BLAKE2 = 42d594fe36f61a1b5343d9fda22541b09373fe74c587537db8203f9c92120b6c73edef2e1b3d7febda14ae979845405b5fdaeb31dd2b89eedc423b0924ea7cff
> 
> install : $(TARGET)
> 
> -- 
> 2.48.1
>