From 94456ec3f9f49fcd83196cd845418e9d5a00fc48 Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Fri, 7 Nov 2025 18:20:38 +0300
Subject: [PATCH] libxcrypt rebuild

---
 system/base/libxcrypt/actions.py | 25 ++++++++++++++++++++++---
 system/base/libxcrypt/pspec.xml  | 10 ++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/system/base/libxcrypt/actions.py b/system/base/libxcrypt/actions.py
index 7b470547..09b82bf0 100644
--- a/system/base/libxcrypt/actions.py
+++ b/system/base/libxcrypt/actions.py
@@ -9,8 +9,23 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
+import os
+
+arch = "x86-64" if get.ARCH() == "x86_64" and not get.buildTYPE() == "emul32" else "i686"
+defaultflags = "-O3 -g -fasynchronous-unwind-tables -mtune=generic -march=%s" % arch
+if get.buildTYPE() == "emul32": defaultflags += " -m32"
 
 def setup():
+    shelltools.export("LANGUAGE","C")
+    shelltools.export("LANG","C")
+    shelltools.export("LC_ALL","C")
+
+    shelltools.export("CC", "gcc %s " % defaultflags)
+    shelltools.export("CXX", "g++ %s " % defaultflags)
+
+    shelltools.export("CFLAGS", defaultflags)
+    shelltools.export("CXXFLAGS", defaultflags)
+
     shelltools.system("mkdir build-libxcrypt build-libxcrypt-compat")
 
     if not get.buildTYPE() == "emul32":
@@ -35,7 +50,7 @@ def setup():
         shelltools.cd("..")
 
     if get.buildTYPE() == "emul32":
-        shelltools.export("CC", "%s -m32" % get.CC())
+        # shelltools.export("CC", "%s -m32" % get.CC())
         shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
 
         shelltools.cd("build-libxcrypt")
@@ -45,7 +60,8 @@ def setup():
                            --disable-static \
                            --enable-hashes=strong,glibc \
                            --enable-obsolete-api=no \
-                           --disable-failure-tokens")
+                           --disable-failure-tokens \
+                           --enable-multi-arch i686-pc-linux-gnu")
 
         shelltools.cd("..")
 
@@ -57,7 +73,8 @@ def setup():
                           --disable-static \
                           --enable-hashes=strong,glibc \
                           --enable-obsolete-api=glibc \
-                          --disable-failure-tokens")
+                          --disable-failure-tokens \
+                          --enable-multi-arch i686-pc-linux-gnu")
 
         # shelltools.cd("..")
 
@@ -78,6 +95,8 @@ def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
     if get.buildTYPE() == "emul32":
+        pisitools.dosym("/usr/lib/libcrypt.so.1.1.0", "/lib/libcrypt.so.1")
+        pisitools.dosym("/usr/lib32/libcrypt.so.1.1.0", "/lib32/libcrypt.so.1")
         return
 
     # Fix conflicts with glibc
diff --git a/system/base/libxcrypt/pspec.xml b/system/base/libxcrypt/pspec.xml
index 64279edb..55db7f21 100644
--- a/system/base/libxcrypt/pspec.xml
+++ b/system/base/libxcrypt/pspec.xml
@@ -24,6 +24,7 @@
 <!--             <Dependency></Dependency> -->
         </RuntimeDependencies>
         <Files>
+            <Path fileType="library">/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="man">/usr/share/man</Path>
             <Path fileType="library">/usr/lib</Path>
@@ -42,6 +43,7 @@
             <Dependency release="current">libxcrypt</Dependency>
         </RuntimeDependencies>
         <Files>
+            <Path fileType="library">/lib32</Path>
             <Path fileType="library">/usr/lib32</Path>
         </Files>
     </Package>
@@ -55,9 +57,17 @@
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="library">/usr/lib/pkgconfig</Path>
+            <Path fileType="library">/usr/lib32/pkgconfig</Path>
         </Files>
     </Package>
     <History>
+        <Update release="9">
+            <Date>2025-11-06</Date>
+            <Version>4.4.38</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="8">
             <Date>2025-10-30</Date>
             <Version>4.4.38</Version>