From efd8a3138e501b18d0f4b06b4455ba6b90b4781c Mon Sep 17 00:00:00 2001 From: Hailiang Date: Tue, 11 Mar 2025 14:05:32 +0800 Subject: [PATCH] add sw_64 support --- add-sw_64-support.patch | 38 ++++++++++++++++++++++++++++++++++++++ libxcrypt.spec | 6 +++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 add-sw_64-support.patch diff --git a/add-sw_64-support.patch b/add-sw_64-support.patch new file mode 100644 index 0000000..bd268c5 --- /dev/null +++ b/add-sw_64-support.patch @@ -0,0 +1,38 @@ +From fd686c9b41f666db84aee25b17c4c564901ff534 Mon Sep 17 00:00:00 2001 +From: Hailiang +Date: Mon, 17 Mar 2025 14:01:47 +0800 +Subject: [PATCH] add sw_64 support + +--- + lib/crypt-bcrypt.c | 2 +- + lib/libcrypt.minver | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/crypt-bcrypt.c b/lib/crypt-bcrypt.c +index ba61003..3d28016 100644 +--- a/lib/crypt-bcrypt.c ++++ b/lib/crypt-bcrypt.c +@@ -52,7 +52,7 @@ + #if INCLUDE_bcrypt || INCLUDE_bcrypt_a || INCLUDE_bcrypt_x || INCLUDE_bcrypt_y + + #if defined(__i386__) || defined(__x86_64__) || \ +- defined(__alpha__) || defined(__hppa__) ++ defined(__alpha__) || defined(__hppa__) || defined(__sw_64__) + #define BF_SCALE 1 + #else + #define BF_SCALE 0 +diff --git a/lib/libcrypt.minver b/lib/libcrypt.minver +index 68d58cb..937dc49 100644 +--- a/lib/libcrypt.minver ++++ b/lib/libcrypt.minver +@@ -81,6 +81,7 @@ GLIBC_2.3 linux.*gnu powerpc64 + GLIBC_2.2.5 linux.*gnu x86_64 defined __x86_64__ && ULONG_MAX != UINT_MAX /* 64 */ + GLIBC_2.2 linux.*gnu s390x + GLIBC_2.0 linux.*gnu alpha ++GLIBC_2.0 linux.*gnu sw_64 + GLIBC_2.0 linux.*gnu e2k + GLIBC_2.0 linux.*gnu hppa + GLIBC_2.0 linux.*gnu i[3-9]86 +-- +2.20.1 + diff --git a/libxcrypt.spec b/libxcrypt.spec index 5da269e..057a611 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -1,6 +1,6 @@ Name: libxcrypt Version: 4.4.38 -Release: 2 +Release: 3 Summary: Extended crypt library for DES, MD5, Blowfish and others License: LGPL-2.1-or-later AND BSD-3-Clause AND BSD-2-Clause AND 0BSD AND Apache-2.0 AND CC0-1.0 AND Public Domain URL: https://github.com/besser82/%{name} @@ -8,6 +8,7 @@ Source0: https://github.com/besser82/libxcrypt/releases/download/v%{versi Patch9000: add-sm3-crypt-support.patch Patch9001: add-loongarch-support-for-libxcrypt.patch +Patch9002: add-sw_64-support.patch BuildRequires: perl >= 5.14.0 BuildRequires: autoconf libtool @@ -90,6 +91,9 @@ autoreconf -fiv %{_mandir}/man5/crypt.5.* %changelog +* Tue Mar 11 2025 mahailiang - 4.4.38-3 +- add sw_64 support + * Wed Feb 12 2025 Funda Wang - 4.4.38-2 - drop unused fipscheck build dependency -- Gitee