commit: 4a296af6c55387f762e27516759724a053fa5a32 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Thu Jun 18 18:20:33 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Jun 18 18:33:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a296af6
dev-libs/botan: remove unused patches Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16313 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-libs/botan/files/botan-1.10.17-build.patch | 25 -------------- dev-libs/botan/files/botan-1.10.17-libressl.patch | 40 ----------------------- 2 files changed, 65 deletions(-) diff --git a/dev-libs/botan/files/botan-1.10.17-build.patch b/dev-libs/botan/files/botan-1.10.17-build.patch deleted file mode 100644 index 43877972211..00000000000 --- a/dev-libs/botan/files/botan-1.10.17-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c7963d28d03e5f65f4021a5b764dc4bff9417eda Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <[email protected]> -Date: Wed, 4 Oct 2017 01:50:33 +0300 -Subject: [PATCH] gost_3411: use correct type for build to pass - ---- - src/hash/gost_3411/gost_3411.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hash/gost_3411/gost_3411.cpp b/src/hash/gost_3411/gost_3411.cpp -index 97aa399..7ca22dc 100644 ---- a/src/hash/gost_3411/gost_3411.cpp -+++ b/src/hash/gost_3411/gost_3411.cpp -@@ -91,7 +91,7 @@ void GOST_34_11::compress_n(const byte input[], size_t blocks) - // P transformation - for(size_t k = 0; k != 4; ++k) - { -- const uint64_t UVk = U[k] ^ V[k]; -+ const u64bit UVk = U[k] ^ V[k]; - for(size_t l = 0; l != 8; ++l) - key[4*l+k] = get_byte(l, UVk); - } --- -2.13.6 - diff --git a/dev-libs/botan/files/botan-1.10.17-libressl.patch b/dev-libs/botan/files/botan-1.10.17-libressl.patch deleted file mode 100644 index 5913bfd3049..00000000000 --- a/dev-libs/botan/files/botan-1.10.17-libressl.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e61a5f56fb404db3655909be4ce23c3a816cbb60 Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev <[email protected]> -Date: Wed, 4 Oct 2017 22:16:31 +0300 -Subject: [PATCH] openssl: support libressl - -Signed-off-by: Alon Bar-Lev <[email protected]> ---- - src/engine/openssl/ossl_bc.cpp | 2 +- - src/engine/openssl/ossl_md.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/engine/openssl/ossl_bc.cpp b/src/engine/openssl/ossl_bc.cpp -index 74660c7b5..cb184c202 100644 ---- a/src/engine/openssl/ossl_bc.cpp -+++ b/src/engine/openssl/ossl_bc.cpp -@@ -8,7 +8,7 @@ - #include <botan/internal/openssl_engine.h> - #include <openssl/evp.h> - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) - #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x" - #endif - -diff --git a/src/engine/openssl/ossl_md.cpp b/src/engine/openssl/ossl_md.cpp -index 2fcb2b0e5..9c43d616e 100644 ---- a/src/engine/openssl/ossl_md.cpp -+++ b/src/engine/openssl/ossl_md.cpp -@@ -8,7 +8,7 @@ - #include <botan/internal/openssl_engine.h> - #include <openssl/evp.h> - --#if OPENSSL_VERSION_NUMBER >= 0x10100000 -+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) - #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x" - #endif - --- -2.13.6 -
