diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-13 21:03:07 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-13 21:03:07 +0100 |
commit | 8fbd420dce8836e6503b162092e07b6a77a89f1d (patch) | |
tree | 071c621ef44d7c1b24a430ac7671d68963b5a4cf /dev-libs/botan/files | |
parent | 12d78242dec4f785d0a0bfb1c00eee2d8996c53b (diff) |
gentoo resync : 13.10.2017
Diffstat (limited to 'dev-libs/botan/files')
-rw-r--r-- | dev-libs/botan/files/botan-1.10.15-c++11.patch | 36 | ||||
-rw-r--r-- | dev-libs/botan/files/botan-2.3.0-build.patch | 26 |
2 files changed, 26 insertions, 36 deletions
diff --git a/dev-libs/botan/files/botan-1.10.15-c++11.patch b/dev-libs/botan/files/botan-1.10.15-c++11.patch deleted file mode 100644 index e47b56600fe1..000000000000 --- a/dev-libs/botan/files/botan-1.10.15-c++11.patch +++ /dev/null @@ -1,36 +0,0 @@ -From dc2834f708a6d857b1a7f9587d5a28af271103e5 Mon Sep 17 00:00:00 2001 -From: Peter-Levine <plevine457@gmail.com> -Date: Mon, 20 Mar 2017 22:13:21 -0400 -Subject: [PATCH] Allow destructor to throw when building with >=C++11 - -After C++11, destructors default to `noexcept(true)`. Thus, any throw statements in destructors become calls to `std::terminate()`. To enable the intended throw statement, the destructor must be explicitly marked `noexcept(false)`. ---- - src/alloc/alloc_mmap/mmap_mem.cpp | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/alloc/alloc_mmap/mmap_mem.cpp b/src/alloc/alloc_mmap/mmap_mem.cpp -index 17c189e..2637533 100644 ---- a/src/alloc/alloc_mmap/mmap_mem.cpp -+++ b/src/alloc/alloc_mmap/mmap_mem.cpp -@@ -21,6 +21,12 @@ - #define MAP_FAILED -1 - #endif - -+#if __cplusplus >= 201103L -+#define NOEXCEPT noexcept(false) -+#else -+#define NOEXCEPT -+#endif -+ - namespace Botan { - - namespace { -@@ -66,7 +72,7 @@ void* MemoryMapping_Allocator::alloc_block(size_t n) - throw MemoryMapping_Failed("Could not unlink temporary file"); - } - -- ~TemporaryFile() -+ ~TemporaryFile() NOEXCEPT - { - /* - * We can safely close here, because post-mmap the file diff --git a/dev-libs/botan/files/botan-2.3.0-build.patch b/dev-libs/botan/files/botan-2.3.0-build.patch index b4d4ca6e694f..06d44cd0c491 100644 --- a/dev-libs/botan/files/botan-2.3.0-build.patch +++ b/dev-libs/botan/files/botan-2.3.0-build.patch @@ -20,3 +20,29 @@ index 9580bc9c5..fabaccb18 100644 namespace Botan { +From 8526077c273c752661786e0ef5d9f7b945c83931 Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev <alon.barlev@gmail.com> +Date: Fri, 13 Oct 2017 19:34:25 +0300 +Subject: [PATCH] Add limits.h header for INT_MAX + +Gentoo-Bug: https://bugs.gentoo.org/633468 +Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com> +--- + src/lib/prov/openssl/openssl_rsa.cpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/lib/prov/openssl/openssl_rsa.cpp b/src/lib/prov/openssl/openssl_rsa.cpp +index fae869b..ab5ac64 100644 +--- a/src/lib/prov/openssl/openssl_rsa.cpp ++++ b/src/lib/prov/openssl/openssl_rsa.cpp +@@ -22,6 +22,7 @@ + #include <openssl/x509.h> + #include <openssl/err.h> + #include <openssl/rand.h> ++#include <limits.h> + + namespace Botan { + +-- +2.13.6 + |