From 9a782420f43f75d60003df53b0c12bfc37ad1b91 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Feb 20 2018 10:27:41 +0000 Subject: Update to 6.0.0 --- diff --git a/cryptopp.spec b/cryptopp.spec index de704a9..32b303e 100644 --- a/cryptopp.spec +++ b/cryptopp.spec @@ -1,13 +1,12 @@ Name: cryptopp -Version: 5.6.5 +Version: 6.0.0 Release: 1%{?dist} Summary: C++ class library of cryptographic schemes License: Boost URL: http://www.cryptopp.com/ -Source0: http://www.cryptopp.com/cryptopp565.zip +Source0: http://www.cryptopp.com/cryptopp600.zip Source1: cryptopp.pc # Upstream doesn't use a common scheme for ABI compatibility -# 5.6.x serie is compatible and uses a .5.6 so number # ... but we previously forged a SONAME using .6 so keep it that way. Patch0: cryptopp-soversion.patch @@ -58,11 +57,27 @@ This package contains programs for manipulating %{name} routines. %autosetup -c -p1 perl -pi -e 's/\r$//g' License.txt Readme.txt +# Prevent an error at aria-simd.cpp compile: +# type_traits:347:39: error: '__float128' was not declared in this scope +%ifarch ppc64le +sed -i -e 's/-mcpu=power4//' GNUmakefile +%endif + %build %ifarch i686 x86_64 ./rdrand-nasm.sh %endif -%make_build -f GNUmakefile CXXFLAGS="-DNDEBUG %{optflags} -fPIC -DPIC" LDFLAGS="%{?__global_ldflags}" shared cryptest.exe + +# Upstream WAR for test failure on ppc64le with gcc8 +# https://github.com/weidai11/cryptopp/issues/588#issuecomment-366921520 +%make_build -f GNUmakefile \ + CXXFLAGS="-DNDEBUG %{optflags} -fPIC -DPIC" \ + LDFLAGS="%{?__global_ldflags}" \ +%ifarch ppc64le + AES_FLAG="-O3 -maltivec" \ +%endif + shared cryptest.exe + doxygen %install @@ -92,7 +107,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/cryptest.exe \ %files %{_libdir}/libcryptopp.so.6* -%{_libdir}/libcryptopp.so.5.6* %doc License.txt Readme.txt %files devel @@ -109,6 +123,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/cryptest.exe \ %{_datadir}/%{name} %changelog +* Mon Feb 19 2018 Nicolas Chauvet - 6.0.0-1 +- Update to 6.0.0 + * Mon Feb 19 2018 Nicolas Chauvet - 5.6.5-1 - Update to 5.6.5 (vanilla) diff --git a/sources b/sources index 3b09c58..5fc065c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cryptopp565.zip) = f13718d02ca69b0129aaf9e767c9d2e0333aa7538355f9c63d9eaf1ff369062084a18dc01489439ebf37797b3ea81b01beb072057d47ec962bfb824ddc72abc7 +SHA512 (cryptopp600.zip) = 7a60c28be1fc9418adeabe8c66d868b46e65fb3d77d308b9431b16905cde7faa670180619150e849ae44d70f44aa8501a0a0c4354ec84f194fd8138d14aca9bf