diff --git a/0001-add-loongarch-support.patch b/0001-add-loongarch-support.patch new file mode 100644 index 0000000000000000000000000000000000000000..703bcee9e27fa6cacaf0da0198f7d18963811919 --- /dev/null +++ b/0001-add-loongarch-support.patch @@ -0,0 +1,36 @@ +From 4756f6073be004be96f26cac2c557bf3af9323f7 Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Fri, 23 Sep 2022 11:16:27 +0800 +Subject: [PATCH] add loongarch support + +--- + lib/libcrypt.map.in | 2 +- + lib/libcrypt.minver | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/libcrypt.map.in b/lib/libcrypt.map.in +index e746a1b..a9059ac 100644 +--- a/lib/libcrypt.map.in ++++ b/lib/libcrypt.map.in +@@ -42,5 +42,5 @@ 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 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 +--- 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. +-- +2.27.0 + diff --git a/add-loongarch.patch b/add-loongarch.patch deleted file mode 100644 index f3ebd15dcfd7867c70ff6a89349bedfd65290c57..0000000000000000000000000000000000000000 --- a/add-loongarch.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/libcrypt.minver b/lib/libcrypt.minver -index 445b946..1149b03 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.27 linux.*gnu loongarch64 - ERROR linux.*gnu . - - # Other systems. diff --git a/libxcrypt.spec b/libxcrypt.spec index b90de3cf500f49325bea87dcc01e9a85725b89bb..6f7942028331e56d1f5719d49f1ba8337e966bf3 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -1,14 +1,14 @@ %define libdir /lib64 Name: libxcrypt Version: 4.4.26 -Release: 4 +Release: 5 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 -Patch0001: add-loongarch.patch Patch9000: add-sm3-crypt-support.patch +Patch9001: 0001-add-loongarch-support.patch BuildRequires: autoconf libtool fipscheck BuildRequires: perl >= 5.14.0 @@ -102,6 +102,9 @@ make check %changelog +* Tue Apr 26 2022 Wenlong Zhang - 4.4.26-5 +- modify the patch for loongarch64 + * Tue Apr 26 2022 Wenlong Zhang - 4.4.26-4 - modify the patch for loongarch64