From f2064152946c65e332d1ed0fbea0f67942966b69 Mon Sep 17 00:00:00 2001 From: Chenxi Mao Date: Fri, 9 Jun 2023 15:31:44 +0800 Subject: [PATCH] Fix build error if AVX2 enabled Below build error found if AVX2 enabled: [ 17s] lib/alg-yescrypt-opt.c:517:33: error: conversion to 'long long unsigned int' from 'long long int' may change the sign of the result [-Werror=sign-conversion] [ 17s] 517 | uint32_t lo = x = EXTRACT64(X) & Smask2reg; \ Cherry pick upstream patches to fix this error. Signed-off-by: Chenxi Mao --- libxcrypt.spec | 9 ++++++--- ...am-Fix-warning-about-signed-unsigned-conversion.patch | 0 ...pstream-Fix-warning-about-truncating-conversion.patch | 0 3 files changed, 6 insertions(+), 3 deletions(-) rename 0001-Fix-warning-about-signed-unsigned-conversion.patch => upstream-Fix-warning-about-signed-unsigned-conversion.patch (100%) rename 0001-Fix-warning-about-truncating-conversion.patch => upstream-Fix-warning-about-truncating-conversion.patch (100%) diff --git a/libxcrypt.spec b/libxcrypt.spec index 44e8281..501dd27 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -5,7 +5,7 @@ %endif 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} @@ -13,8 +13,8 @@ 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: 0001-Fix-warning-about-truncating-conversion.patch -Patch9003: 0001-Fix-warning-about-signed-unsigned-conversion.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 @@ -108,6 +108,9 @@ autoreconf -fiv %changelog +* Fri Jun 9 2023 Chenxi Mao - 4.4.26-5 +- Cherry pick upstream patches to fix build errors if avx2 enabled. + * Fri Oct 21 2022 wuzx - 4.4.26-4 - add sw64 patch diff --git a/0001-Fix-warning-about-signed-unsigned-conversion.patch b/upstream-Fix-warning-about-signed-unsigned-conversion.patch similarity index 100% rename from 0001-Fix-warning-about-signed-unsigned-conversion.patch rename to upstream-Fix-warning-about-signed-unsigned-conversion.patch diff --git a/0001-Fix-warning-about-truncating-conversion.patch b/upstream-Fix-warning-about-truncating-conversion.patch similarity index 100% rename from 0001-Fix-warning-about-truncating-conversion.patch rename to upstream-Fix-warning-about-truncating-conversion.patch