Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
865f0ae0a5
!47 [sync] PR-45: add sw_64 support
From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2025-03-04 07:15:31 +00:00
Hailiang
cffe51c7a8 add sw_64 support
(cherry picked from commit 39bb75ebd16a419a289a634442b91ef0d3f0736d)
2025-03-04 14:59:53 +08:00
openeuler-ci-bot
2b197b4387
!40 [sync] PR-39: Fix build error for loongarch64
From: @openeuler-sync-bot 
Reviewed-by: @HuaxinLuGitee 
Signed-off-by: @HuaxinLuGitee
2024-03-29 02:11:32 +00:00
Wenlong Zhang
f431e3eba8 Fix build error for loongarch64
(cherry picked from commit 7ceb27ca7d4e61012df970e187ea6bbad233e43f)
2024-03-26 15:19:26 +08:00
openeuler-ci-bot
10169398b3
!34 【Mainline】Update to 4.4.36
From: @yixiangzhike 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
2023-07-13 02:13:55 +00:00
yixiangzhike
08da83ef40 Update to 4.4.36 2023-07-13 10:07:31 +08:00
openeuler-ci-bot
8afeb44ed5
!31 【Mainline】Update to 4.4.33
From: @yixiangzhike 
Reviewed-by: @HuaxinLuGitee 
Signed-off-by: @HuaxinLuGitee
2023-01-28 01:55:28 +00:00
yixiangzhike
7cfd18c650 update to 4.4.33
Signed-off-by: yixiangzhike <yixiangzhike007@163.com>
2023-01-28 09:35:56 +08:00
openeuler-ci-bot
f8bcbd4cda
!30 add loongarch support for libxcrypt
From: @zhangwenlong01 
Reviewed-by: @zcfsite, @HuaxinLuGitee 
Signed-off-by: @HuaxinLuGitee
2022-11-18 07:24:27 +00:00
Wenlong Zhang
6564502218 add loongarch support for libxcrypt 2022-11-14 11:22:30 +00:00
5 changed files with 80 additions and 2 deletions

View File

@ -0,0 +1,37 @@
From 81a7703ef861bb049fb36af00ec73d862e6314a9 Mon Sep 17 00:00:00 2001
From: Wenlong Zhang <zhangwenlong@loongson.cn>
Date: Thu, 7 Mar 2024 02:22:07 +0000
Subject: [PATCH] add loongarch support for libxcrypt
---
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 88ea911..2142757 100644
--- a/lib/libcrypt.map.in
+++ b/lib/libcrypt.map.in
@@ -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 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 8478077..34cae9d 100644
--- a/lib/libcrypt.minver
+++ b/lib/libcrypt.minver
@@ -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.43.0

24
libxcrypt-4.4.26-sw.patch Normal file
View File

@ -0,0 +1,24 @@
diff -uNar libxcrypt-4.4.26.org/lib/crypt-bcrypt.c libxcrypt-4.4.26.sw/lib/crypt-bcrypt.c
--- libxcrypt-4.4.26.org/lib/crypt-bcrypt.c 2022-02-15 12:55:07.000000000 +0000
+++ libxcrypt-4.4.26.sw/lib/crypt-bcrypt.c 2022-02-15 12:55:49.510000000 +0000
@@ -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 -uNar libxcrypt-4.4.26.org/lib/libcrypt.minver libxcrypt-4.4.26.sw/lib/libcrypt.minver
--- libxcrypt-4.4.26.org/lib/libcrypt.minver 2022-02-15 12:55:07.000000000 +0000
+++ libxcrypt-4.4.26.sw/lib/libcrypt.minver 2022-02-15 14:16:36.550000000 +0000
@@ -80,6 +80,7 @@
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

View File

@ -1,13 +1,15 @@
%define libdir /lib64
Name: libxcrypt
Version: 4.4.26
Release: 2
Version: 4.4.36
Release: 3
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
Patch9001: add-loongarch-support-for-libxcrypt.patch
Patch9002: libxcrypt-4.4.26-sw.patch
BuildRequires: perl >= 5.14.0
BuildRequires: autoconf libtool fipscheck
@ -101,6 +103,21 @@ autoreconf -fiv
%changelog
* Fri Feb 28 2025 mahailiang <mahailiang@uniontech.com> - 4.4.36-3
- add sw_64 support
* Wed Mar 6 2024 Wenlong Zhang <zhangwenlong@loongson.cn> - 4.4.36-2
- Fix build error for loongarch64
* Thu Jul 13 2023 yixiangzhike <yixiangzhike007@163.com> - 4.4.36-1
- update to 4.4.36
* Sat Jan 28 2023 yixiangzhike <yixiangzhike007@163.com> - 4.4.33-1
- update to 4.4.33
* Mon Nov 14 2022 Wenlong Zhang <zhangwenlong@loongson.cn> - 4.4.26-3
- add loongarch support for libxcrypt
* Wed Oct 19 2022 yixiangzhike <yixiangzhike007@163.com> - 4.4.26-2
- use the macro make_build instead of make to support multitasking in check

Binary file not shown.

BIN
v4.4.36.tar.gz Normal file

Binary file not shown.