diff --git a/94aba0105efa.patch b/94aba0105efa.patch new file mode 100644 index 0000000000000000000000000000000000000000..e741c3f3a8eccadde7e2da8521bc0ab00c1f4af8 --- /dev/null +++ b/94aba0105efa.patch @@ -0,0 +1,23 @@ +From 94aba0105efa92fcb3c8ba1a125e17af72a1894d Mon Sep 17 00:00:00 2001 +From: Jeffrey Walton +Date: Mon, 8 Aug 2022 02:07:57 -0400 +Subject: [PATCH] Fix segfault with no-arg invocation of cryptest program (GH + #1141) This break was introduced at 6f3fd26ab849ac71 + +--- + test.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test.cpp b/test.cpp +index 73ab43929..842fde8e4 100644 +--- a/test.cpp ++++ b/test.cpp +@@ -426,7 +426,7 @@ int scoped_main(int argc, char *argv[]) + else if (command == "h") + { + FileSource usage(DataDir("TestData/usage.dat").c_str(), true, new FileSink(std::cout)); +- return argv[1][0] == 'h' ? 0 : 1; ++ return argc >= 2 && argv[1][0] == 'h' ? 0 : 1; + } + else if (command == "V") + { diff --git a/cryptopp.spec b/cryptopp.spec index c165575c34b6b502dca41e0e22e1102872e23166..dda4d3d0cca5d8c81b490b6f3f7b7ebc928a45d8 100755 --- a/cryptopp.spec +++ b/cryptopp.spec @@ -1,16 +1,17 @@ %define _lto_cflags %{nil} Name: cryptopp -Version: 8.6.0 +Version: 8.7.0 Release: 1 Summary: C++ class library of cryptographic schemes License: Boost URL: http://www.cryptopp.com/ -Source0: http://www.cryptopp.com/cryptopp860.zip +Source0: http://www.cryptopp.com/cryptopp870.zip Source1: cryptopp.pc +Patch0: https://github.com/weidai11/cryptopp/commit/94aba0105efa.patch BuildRequires: doxygen -BuildRequires: gcc-c++ +BuildRequires: clang # %ifarch i686 x86_64 # BuildRequires: nasm # %endif @@ -63,10 +64,6 @@ perl -pi -e 's/\r$//g' License.txt Readme.txt %build -# %ifarch i686 x86_64 -# ./rdrand-nasm.sh -# %endif - %{set_build_flags} %make_build -f GNUmakefile \ ZOPT='' \ @@ -120,6 +117,9 @@ rm %{buildroot}%{_libdir}/libcryptopp.a %{_datadir}/%{name} %changelog +* Tue Feb 28 2023 lilong - 8.7.0-1 +- Upgrade to 8.7.0 + * Fri Jul 29 2022 liweiganga - 8.6.0-1 - update to 8.6.0 diff --git a/cryptopp860.zip b/cryptopp870.zip similarity index 94% rename from cryptopp860.zip rename to cryptopp870.zip index f830d73a8982a2d00ccdffbd317f84468fe2457f..f4a69e6737ec3d44a87b015a65d85010d2eeb8c1 100644 Binary files a/cryptopp860.zip and b/cryptopp870.zip differ