* [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/files/
@ 2016-09-09 6:51 Alon Bar-Lev
0 siblings, 0 replies; 6+ messages in thread
From: Alon Bar-Lev @ 2016-09-09 6:51 UTC (permalink / raw
To: gentoo-commits
commit: 449a7bd4ddf129729b4eaf69125317b793657ed5
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Aug 18 10:25:11 2016 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Sep 9 06:50:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=449a7bd4
dev-libs/botan: remove unused patches
dev-libs/botan/files/botan-1.10-python3.patch | 24 ---------------
.../botan/files/botan-1.11.20-build-python.patch | 35 ----------------------
2 files changed, 59 deletions(-)
diff --git a/dev-libs/botan/files/botan-1.10-python3.patch b/dev-libs/botan/files/botan-1.10-python3.patch
deleted file mode 100644
index d6db23b..00000000
--- a/dev-libs/botan/files/botan-1.10-python3.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Make configure script work for Python 3.
-
-In Python 3, map returns an iterable, not a list, so for a subsequent map to
-work we have to convert that to a list explicitely. This should work for
-Python 2 just as well, so the patch can be applied unconditionally.
-
-2013-09-21 Martin von Gagern
-
-References:
-https://bugs.gentoo.org/485490
-
-Index: Botan-1.10.5/configure.py
-===================================================================
---- Botan-1.10.5.orig/configure.py
-+++ Botan-1.10.5/configure.py
-@@ -1780,7 +1780,7 @@ def main(argv = None):
- gcc_version = stdout.strip()
-
- logging.info('Detected gcc version %s' % (gcc_version))
-- return map(int, gcc_version.split('.')[0:2])
-+ return [int(c) for c in gcc_version.split('.')[0:2]]
- except OSError:
- logging.warning('Could not execute %s for version check' % (gcc_bin))
- return None
diff --git a/dev-libs/botan/files/botan-1.11.20-build-python.patch b/dev-libs/botan/files/botan-1.11.20-build-python.patch
deleted file mode 100644
index ae85885..00000000
--- a/dev-libs/botan/files/botan-1.11.20-build-python.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5bb0b47e608e083dda5e39132174b840f3b091cf Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 15 Sep 2015 00:18:19 +0300
-Subject: [PATCH] build: support multiple python versions
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/scripts/install.py | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/src/scripts/install.py b/src/scripts/install.py
-index 2c69213..d1d62b6 100755
---- a/src/scripts/install.py
-+++ b/src/scripts/install.py
-@@ -181,11 +181,12 @@ def main(args = None):
- os.path.join(pkgconfig_dir, os.path.basename(cfg['botan_pkgconfig'])))
-
- if 'ffi' in cfg['mod_list'].split('\n'):
-- py_lib_path = os.path.join(lib_dir, 'python%s' % (cfg['python_version']), 'site-packages')
-- logging.debug('Installing python module to %s' % (py_lib_path))
-- makedirs(py_lib_path)
-- for py in ['botan.py']:
-- copy_file(os.path.join(cfg['python_dir'], py), os.path.join(py_lib_path, py))
-+ for ver in cfg['python_version'].split(','):
-+ py_lib_path = os.path.join(lib_dir, 'python%s' % (ver), 'site-packages')
-+ logging.debug('Installing python module to %s' % (py_lib_path))
-+ makedirs(py_lib_path)
-+ for py in ['botan.py']:
-+ copy_file(os.path.join(cfg['python_dir'], py), os.path.join(py_lib_path, py))
-
- shutil.rmtree(target_doc_dir, True)
- shutil.copytree(cfg['doc_output_dir'], target_doc_dir)
---
-2.4.6
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/files/
@ 2017-10-12 16:46 Alon Bar-Lev
0 siblings, 0 replies; 6+ messages in thread
From: Alon Bar-Lev @ 2017-10-12 16:46 UTC (permalink / raw
To: gentoo-commits
commit: e45fa6d5a1e0b9335ee826e8cc7db851c3affa6d
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 12 16:45:53 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Thu Oct 12 16:45:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e45fa6d5
dev-libs/botan: cleanup
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=621120
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=632104
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-libs/botan/files/botan-1.10.15-c++11.patch | 36 --------------------------
1 file changed, 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 e47b56600fe..00000000000
--- 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/files/
@ 2017-10-13 16:41 Alon Bar-Lev
0 siblings, 0 replies; 6+ messages in thread
From: Alon Bar-Lev @ 2017-10-13 16:41 UTC (permalink / raw
To: gentoo-commits
commit: 429f31a639972743785eff8177f0b1407e5f7502
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 13 16:40:43 2017 +0000
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 16:41:45 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=429f31a6
dev-libs/botan: add missing limits.h
Gentoo-Bug: https://bugs.gentoo.org/634180
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-libs/botan/files/botan-2.3.0-build.patch | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
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 b4d4ca6e694..06d44cd0c49 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
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/files/
@ 2019-12-14 8:47 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-12-14 8:47 UTC (permalink / raw
To: gentoo-commits
commit: c079936375e011c8f38ed9fc079cd4eaa2fa422c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 14 08:47:05 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 14 08:47:05 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0799363
dev-libs/botan: Fix spurious +x in FILESDIR
Closes: https://bugs.gentoo.org/694634
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-libs/botan/files/botan-2.9.0-build.patch | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/dev-libs/botan/files/botan-2.9.0-build.patch b/dev-libs/botan/files/botan-2.9.0-build.patch
old mode 100755
new mode 100644
^ permalink raw reply [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/files/
@ 2020-06-18 18:33 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-06-18 18:33 UTC (permalink / raw
To: gentoo-commits
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 <alon.barlev@gmail.com>
-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 <alon.barlev@gmail.com>
-Date: Wed, 4 Oct 2017 22:16:31 +0300
-Subject: [PATCH] openssl: support libressl
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- 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
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/files/
@ 2024-12-27 13:38 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2024-12-27 13:38 UTC (permalink / raw
To: gentoo-commits
commit: 24a328ad4d5035ffc5e751fbab71631faa8c24e8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 13:23:06 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 13:23:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24a328ad
dev-libs/botan: refresh no-avx2 patch to upstream variant
It got tweaked upstream before merging.
Bug: https://bugs.gentoo.org/946821
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/botan/files/botan-3.6.1-no-avx2.patch | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/dev-libs/botan/files/botan-3.6.1-no-avx2.patch b/dev-libs/botan/files/botan-3.6.1-no-avx2.patch
index a4794738d6cd..b72e23c5d6d9 100644
--- a/dev-libs/botan/files/botan-3.6.1-no-avx2.patch
+++ b/dev-libs/botan/files/botan-3.6.1-no-avx2.patch
@@ -2,24 +2,28 @@ https://bugs.gentoo.org/946821
https://github.com/randombit/botan/issues/4493
https://github.com/randombit/botan/pull/4494
-From c7f8f6c0967faac1ba66ca3d55560b2aed12863a Mon Sep 17 00:00:00 2001
+From 07d0556e03c4a2f96c0e26073523b944b86cdfc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Meusel?= <rene.meusel@rohde-schwarz.com>
Date: Mon, 23 Dec 2024 09:29:07 +0100
Subject: [PATCH] FIX: SM4 GFNI needs AVX2
closes #4493
---
- src/lib/block/sm4/sm4_gfni/info.txt | 1 +
- 1 file changed, 1 insertion(+)
+ src/lib/block/sm4/sm4_gfni/info.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
diff --git a/src/lib/block/sm4/sm4_gfni/info.txt b/src/lib/block/sm4/sm4_gfni/info.txt
-index 4c5867f9b72..5b5c87b42e7 100644
+index 4c5867f9b72..1ec736e7cd4 100644
--- a/src/lib/block/sm4/sm4_gfni/info.txt
+++ b/src/lib/block/sm4/sm4_gfni/info.txt
-@@ -9,4 +9,5 @@ brief -> "SM4 using Intel GFNI"
+@@ -7,6 +7,10 @@ name -> "SM4 GFNI"
+ brief -> "SM4 using Intel GFNI"
+ </module_info>
++<requires>
++simd_avx2
++</requires>
++
<isa>
gfni
-+avx2
</isa>
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-12-27 13:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-13 16:41 [gentoo-commits] repo/gentoo:master commit in: dev-libs/botan/files/ Alon Bar-Lev
-- strict thread matches above, loose matches on Subject: below --
2024-12-27 13:38 Sam James
2020-06-18 18:33 Andreas Sturmlechner
2019-12-14 8:47 Michał Górny
2017-10-12 16:46 Alon Bar-Lev
2016-09-09 6:51 Alon Bar-Lev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox