!33 修复当AVX2指令启用后，编译出现的错误（警告）

From: @chenxi-mao 
Reviewed-by: @HuaxinLuGitee 
Signed-off-by: @HuaxinLuGitee

libxcrypt-4.4.26-sw.patch

@@ -0,0 +1,23 @@
+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
+@@ -76,6 +76,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

libxcrypt.spec

@@ -1,15 +1,27 @@
+%ifarch sw_64
+%define  libdir /lib
+%else
 %define  libdir /lib64
+%endif
 Name:           libxcrypt
-Version:        4.4.17
+Version:        4.4.26
-Release:        1
+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
+
+Patch9000:      add-sm3-crypt-support.patch
+Patch9001:      libxcrypt-4.4.26-sw.patch
+Patch9002:	upstream-Fix-warning-about-truncating-conversion.patch
+Patch9003:	upstream-Fix-warning-about-signed-unsigned-conversion.patch
+
 BuildRequires:  autoconf libtool fipscheck
+BuildRequires:  perl >= 5.14.0
 Obsoletes:      %{name}-common < %{version}-%{release}
 Provides:       %{name}-common%{?_isa} = %{version}-%{release} %{name}%{?_isa} = %{version}-%{release}
 Provides:       %{name}-common = %{version}-%{release}
+Provides:       %{name}-sm3 = %{version}-%{release}
 
 %description
 libxcrypt is a modern library for one-way hashing of passwords.
@@ -69,7 +81,7 @@ autoreconf -fiv
 %{_bindir}/find %{buildroot} -name '*.la' -print -delete
 
 %check
-make check
+%make_build check
 
 %post -p /sbin/ldconfig
 
@@ -96,6 +108,21 @@ make check
 
 
 %changelog
+* Fri Jun 9 2023 Chenxi Mao<chenxi.mao@suse.com> - 4.4.26-5
+- Cherry pick upstream patches to fix build errors if avx2 enabled. 
+
+* Fri Oct 21 2022 wuzx<wuzx1226@qq.com> - 4.4.26-4
+- add sw64 patch
+
+* Wed Oct 19 2022 yixiangzhike <yixiangzhike007@163.com> - 4.4.26-3
+- use the macro make_build instead of make to support multitasking in check
+
+* Thu Dec 16 2021 houmingyong<houmingyong@huawei.com> - 4.4.26-2
+- add sm3 crypt support
+
+* Sat Dec 4 2021 yixiangzhike <yixiangzhike007@163.com> - 4.4.26-1
+- update to 4.4.26
+
 * Thu Jan 21 2021 wangchen <wangchen137@huawei.com> - 4.4.17-1
 - update to 4.4.17
 

upstream-Fix-warning-about-signed-unsigned-conversion.patch

@@ -0,0 +1,25 @@
+From 17cf4ce8af5a2a1af4c0f52260019cbae01835b8 Mon Sep 17 00:00:00 2001
+From: Moinak Bhattacharyya <moinakb001@gmail.com>
+Date: Tue, 8 Nov 2022 04:37:13 -0600
+Subject: [PATCH 1/1] Fix warning about signed->unsigned conversion
+
+---
+ lib/alg-yescrypt-opt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/alg-yescrypt-opt.c b/lib/alg-yescrypt-opt.c
+index dacc73b..a33c6e4 100644
+--- a/lib/alg-yescrypt-opt.c
++++ b/lib/alg-yescrypt-opt.c
+@@ -514,7 +514,7 @@ static volatile uint64_t Smask2var = Smask2;
+ #define PWXFORM_SIMD(X) { \
+ 	uint64_t x; \
+ 	FORCE_REGALLOC_1 \
+-	uint32_t lo = (uint32_t)(x = EXTRACT64(X) & Smask2reg); \
++	uint32_t lo = (uint32_t)(x = ((uint64_t)EXTRACT64(X)) & Smask2reg); \
+ 	FORCE_REGALLOC_2 \
+ 	uint32_t hi = x >> 32; \
+ 	X = _mm_mul_epu32(HI32(X), X); \
+-- 
+2.33.0
+

upstream-Fix-warning-about-truncating-conversion.patch

@@ -0,0 +1,25 @@
+From 239664bf18fc2bc093d8dbaa1fb0a0307651897f Mon Sep 17 00:00:00 2001
+From: Moinak Bhattacharyya <moinakb001@gmail.com>
+Date: Mon, 7 Nov 2022 03:40:23 -0600
+Subject: [PATCH 1/1] Fix warning about truncating conversion
+
+---
+ lib/alg-yescrypt-opt.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/alg-yescrypt-opt.c b/lib/alg-yescrypt-opt.c
+index 60a6ccd..dacc73b 100644
+--- a/lib/alg-yescrypt-opt.c
++++ b/lib/alg-yescrypt-opt.c
+@@ -514,7 +514,7 @@ static volatile uint64_t Smask2var = Smask2;
+ #define PWXFORM_SIMD(X) { \
+ 	uint64_t x; \
+ 	FORCE_REGALLOC_1 \
+-	uint32_t lo = x = EXTRACT64(X) & Smask2reg; \
++	uint32_t lo = (uint32_t)(x = EXTRACT64(X) & Smask2reg); \
+ 	FORCE_REGALLOC_2 \
+ 	uint32_t hi = x >> 32; \
+ 	X = _mm_mul_epu32(HI32(X), X); \
+-- 
+2.33.0
+