!3 Upgrade to 8.7.0
From: @li-long315 Reviewed-by: @zhujianwei001 Signed-off-by: @zhujianwei001
This commit is contained in:
commit
78361d1d62
23
94aba0105efa.patch
Normal file
23
94aba0105efa.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
From 94aba0105efa92fcb3c8ba1a125e17af72a1894d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jeffrey Walton <noloader@gmail.com>
|
||||||
|
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")
|
||||||
|
{
|
||||||
@ -1,16 +1,17 @@
|
|||||||
%define _lto_cflags %{nil}
|
%define _lto_cflags %{nil}
|
||||||
|
|
||||||
Name: cryptopp
|
Name: cryptopp
|
||||||
Version: 8.6.0
|
Version: 8.7.0
|
||||||
Release: 1
|
Release: 1
|
||||||
Summary: C++ class library of cryptographic schemes
|
Summary: C++ class library of cryptographic schemes
|
||||||
License: Boost
|
License: Boost
|
||||||
URL: http://www.cryptopp.com/
|
URL: http://www.cryptopp.com/
|
||||||
Source0: http://www.cryptopp.com/cryptopp860.zip
|
Source0: http://www.cryptopp.com/cryptopp870.zip
|
||||||
Source1: cryptopp.pc
|
Source1: cryptopp.pc
|
||||||
|
Patch0: https://github.com/weidai11/cryptopp/commit/94aba0105efa.patch
|
||||||
|
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: clang
|
||||||
# %ifarch i686 x86_64
|
# %ifarch i686 x86_64
|
||||||
# BuildRequires: nasm
|
# BuildRequires: nasm
|
||||||
# %endif
|
# %endif
|
||||||
@ -63,10 +64,6 @@ perl -pi -e 's/\r$//g' License.txt Readme.txt
|
|||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# %ifarch i686 x86_64
|
|
||||||
# ./rdrand-nasm.sh
|
|
||||||
# %endif
|
|
||||||
|
|
||||||
%{set_build_flags}
|
%{set_build_flags}
|
||||||
%make_build -f GNUmakefile \
|
%make_build -f GNUmakefile \
|
||||||
ZOPT='' \
|
ZOPT='' \
|
||||||
@ -120,6 +117,9 @@ rm %{buildroot}%{_libdir}/libcryptopp.a
|
|||||||
%{_datadir}/%{name}
|
%{_datadir}/%{name}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Feb 28 2023 lilong <lilong@kylinos.cn> - 8.7.0-1
|
||||||
|
- Upgrade to 8.7.0
|
||||||
|
|
||||||
* Fri Jul 29 2022 liweiganga <liweiganga@uniontech.com> - 8.6.0-1
|
* Fri Jul 29 2022 liweiganga <liweiganga@uniontech.com> - 8.6.0-1
|
||||||
- update to 8.6.0
|
- update to 8.6.0
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user