Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 crypto/libxcrypt/BUILD     |    4 ++++
 crypto/libxcrypt/FINAL     |    4 ++++
 crypto/libxcrypt/HISTORY   |    8 ++++++++
 crypto/libxcrypt/PRE_BUILD |   10 ++++++----
 4 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 57042108dffe426d3af31b292486c0a6780672cd
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    libxcrypt: Keep libcrypt.so.2
    
    sshd, passwd, perl and the rest are linked against the old soname, so
    keep it working.

commit ad50360f4d9434d3e50d882b0d4169ab02d077af
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    libxcrypt: build the library as libxcrypt

commit 96274cef6e239cd6ec4c4e3a4f5321be9f4add30
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    libxcrypt: install the header under xcrypt/
    
    To avoid conflict with a libc implementation.

diff --git a/crypto/libxcrypt/BUILD b/crypto/libxcrypt/BUILD
index 5078586..4fde412 100755
--- a/crypto/libxcrypt/BUILD
+++ b/crypto/libxcrypt/BUILD
@@ -1,3 +1,7 @@
+# keep libxcrypt out of libc's way
+OPTS+=" --includedir=$INSTALL_ROOT/usr/include/xcrypt" &&
+OPTS+=" --disable-xcrypt-compat-files" &&
+
 OPTS="$BUILD_STATIC $OPTS" &&
 OPTS="$OBSOLETE_APIS $OPTS" &&
 OPTS="$OBSOLETE_STUBS $OPTS" &&
diff --git a/crypto/libxcrypt/FINAL b/crypto/libxcrypt/FINAL
index 2f2e3ba..850fcdb 100755
--- a/crypto/libxcrypt/FINAL
+++ b/crypto/libxcrypt/FINAL
@@ -3,4 +3,8 @@ default_final
 
 sed -i '/libcrypt/D;/crypt.h/D' /var/log/sorcery/{install,md5sum}/glibc-*
 rm -f  /lib/libcrypt*
+
+# keep what is already linked against the old soname working
+ln -sfv libxcrypt.so.2 "$INSTALL_ROOT/usr/lib/libcrypt.so.2"
+
 ldconfig
diff --git a/crypto/libxcrypt/HISTORY b/crypto/libxcrypt/HISTORY
index 7f54b69..3a47e06 100644
--- a/crypto/libxcrypt/HISTORY
+++ b/crypto/libxcrypt/HISTORY
@@ -1,3 +1,11 @@
+2026-11-07 Ismael Luceno <ismael AT sourcemage.org>
+       * BUILD: install header as xcrypt/crypt.h rather than
+         replacing libc's own header (e.g. musl's)
+       * BUILD, PRE_BUILD: build the library as libxcrypt, point its
+         pkg-config file at -lxcrypt and disable the upstream compatibility
+         symlinks
+       * FINAL: keep libcrypt.so.2 pointing at the renamed library
+
 2025-12-01 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 4.5.2
 
diff --git a/crypto/libxcrypt/PRE_BUILD b/crypto/libxcrypt/PRE_BUILD
index d79ff00..d880e65 100755
--- a/crypto/libxcrypt/PRE_BUILD
+++ b/crypto/libxcrypt/PRE_BUILD
@@ -1,4 +1,6 @@
-default_pre_build                          &&
-cd "${SOURCE_DIRECTORY}"                   &&
-patch_bundled_libtool build-aux/m4-autogen/ltmain.sh
-
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch_bundled_libtool build-aux/m4-autogen/ltmain.sh &&
+sed -E -i -e 's/\<libcrypt_la_/libxcrypt_la_/g' \
+          -e 's/\<libcrypt\.la\>/libxcrypt.la/g' Makefile.in &&
+sed -i 's/-lcrypt/-lxcrypt/' lib/libxcrypt.pc.in