diff --git a/0001-add-loongarch-support.patch b/add-loongarch-support-for-libxcrypt.patch similarity index 49% rename from 0001-add-loongarch-support.patch rename to add-loongarch-support-for-libxcrypt.patch index 5384adf84624747b50553ac23d4709c0450617cf..9a7f82223b8ac36f76e9ad60a9463e638cc8ce67 100644 --- a/0001-add-loongarch-support.patch +++ b/add-loongarch-support-for-libxcrypt.patch @@ -1,7 +1,7 @@ -From 4756f6073be004be96f26cac2c557bf3af9323f7 Mon Sep 17 00:00:00 2001 +From 81a7703ef861bb049fb36af00ec73d862e6314a9 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang -Date: Fri, 23 Sep 2022 11:16:27 +0800 -Subject: [PATCH] add loongarch support +Date: Thu, 7 Mar 2024 02:22:07 +0000 +Subject: [PATCH] add loongarch support for libxcrypt --- lib/libcrypt.map.in | 2 +- @@ -9,27 +9,29 @@ Subject: [PATCH] add loongarch support 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libcrypt.map.in b/lib/libcrypt.map.in -index e746a1b..a9059ac 100644 +index 88ea911..2142757 100644 --- a/lib/libcrypt.map.in +++ b/lib/libcrypt.map.in -@@ -42,5 +42,5 @@ fcrypt - GLIBC_2.0 +@@ -42,6 +42,6 @@ fcrypt - GLIBC_2.0 # libcrypt.minver. The ordering is left to right, top to bottom. %chain GLIBC_2.0 GLIBC_2.2 GLIBC_2.2.1 GLIBC_2.2.2 GLIBC_2.2.5 GLIBC_2.2.6 %chain GLIBC_2.3 GLIBC_2.4 GLIBC_2.12 GLIBC_2.16 GLIBC_2.17 GLIBC_2.18 --%chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 -+%chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 GLIBC_2.34 +-%chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 GLIBC_2.35 ++%chain GLIBC_2.21 GLIBC_2.27 GLIBC_2.29 GLIBC_2.32 GLIBC_2.33 GLIBC_2.34 GLIBC_2.35 + %chain GLIBC_2.36 %chain OW_CRYPT_1.0 XCRYPT_2.0 XCRYPT_4.3 XCRYPT_4.4 diff --git a/lib/libcrypt.minver b/lib/libcrypt.minver -index 445b946..b9099b6 100644 +index 8478077..34cae9d 100644 --- a/lib/libcrypt.minver +++ b/lib/libcrypt.minver -@@ -87,6 +87,7 @@ GLIBC_2.0 linux.*gnu s390 - GLIBC_2.0 linux.*gnu sh - GLIBC_2.0 linux.*gnu sparc - GLIBC_2.0 linux.*gnu x86_64 -+GLIBC_2.34 linux.*gnu loongarch64 - ERROR linux.*gnu . - - # Other systems. +@@ -62,6 +62,7 @@ ERROR kfreebsd.*gnu . + # Linux with GNU libc + GLIBC_2.36 linux.*gnu loongarch64 __WORDSIZE == 64 && ULONG_MAX != UINT_MAX /* lp64* ABI */ + GLIBC_2.35 linux.*gnu or1k ++GLIBC_2.34 linux.*gnu loongarch64 + GLIBC_2.33 linux.*gnu riscv32 + GLIBC_2.32 linux.*gnu arc + GLIBC_2.29 linux.*gnu csky -- -2.27.0 +2.43.0 + diff --git a/libxcrypt.spec b/libxcrypt.spec index d147ad68147965dd22c03680e8d15c90ce9e69b5..4328dd6a7768c783de6297db0c4a7b061ba7da6c 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -1,16 +1,14 @@ %define libdir /lib64 Name: libxcrypt Version: 4.4.36 -Release: 1 +Release: 2 Summary: Extended crypt library for DES, MD5, Blowfish and others License: LGPLv2+ and BSD and Public Domain URL: https://github.com/besser82/%{name} Source0: https://github.com/besser82/%{name}/archive/v%{version}.tar.gz Patch9000: add-sm3-crypt-support.patch -%ifarch loongarch64 -Patch9001: 0001-add-loongarch-support.patch -%endif +Patch9001: add-loongarch-support-for-libxcrypt.patch BuildRequires: perl >= 5.14.0 BuildRequires: autoconf libtool fipscheck @@ -104,6 +102,9 @@ autoreconf -fiv %changelog +* Wed Mar 6 2024 Wenlong Zhang - 4.4.36-2 +- Fix build error for loongarch64 + * Thu Jul 13 2023 yixiangzhike - 4.4.36-1 - update to 4.4.36