1 |
commit: 5e708f89285f5d55f5b5dd26618df439e2943591 |
2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 22 22:17:48 2016 +0000 |
4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 23 06:52:56 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e708f89 |
7 |
|
8 |
dev-libs/crypto++ - fix minor c++11 issue |
9 |
|
10 |
Thanks: Peter Levine |
11 |
Bug: 593860 |
12 |
|
13 |
Package-Manager: portage-2.2.28 |
14 |
|
15 |
dev-libs/crypto++/crypto++-5.6.2-r3.ebuild | 3 ++- |
16 |
dev-libs/crypto++/files/crypto++-5.6.2-c++11.patch | 22 ++++++++++++++++++++++ |
17 |
2 files changed, 24 insertions(+), 1 deletion(-) |
18 |
|
19 |
diff --git a/dev-libs/crypto++/crypto++-5.6.2-r3.ebuild b/dev-libs/crypto++/crypto++-5.6.2-r3.ebuild |
20 |
index 57b4f46..1932f1a 100644 |
21 |
--- a/dev-libs/crypto++/crypto++-5.6.2-r3.ebuild |
22 |
+++ b/dev-libs/crypto++/crypto++-5.6.2-r3.ebuild |
23 |
@@ -1,4 +1,4 @@ |
24 |
-# Copyright 1999-2015 Gentoo Foundation |
25 |
+# Copyright 1999-2016 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
# $Id$ |
28 |
|
29 |
@@ -23,6 +23,7 @@ S="${WORKDIR}" |
30 |
src_prepare() { |
31 |
epatch "${FILESDIR}"/${P}-r1-make.patch |
32 |
epatch "${FILESDIR}"/${P}-cve-2015-2141.patch |
33 |
+ epatch "${FILESDIR}"/${P}-c++11.patch |
34 |
|
35 |
# Generate our own libtool script for building. |
36 |
cat <<-EOF > configure.ac |
37 |
|
38 |
diff --git a/dev-libs/crypto++/files/crypto++-5.6.2-c++11.patch b/dev-libs/crypto++/files/crypto++-5.6.2-c++11.patch |
39 |
new file mode 100644 |
40 |
index 00000000..4075036 |
41 |
--- /dev/null |
42 |
+++ b/dev-libs/crypto++/files/crypto++-5.6.2-c++11.patch |
43 |
@@ -0,0 +1,22 @@ |
44 |
+From 44015c26ba215f955b1e653f9c8f3c894a532707 Mon Sep 17 00:00:00 2001 |
45 |
+From: Jeffrey Walton <noloader@×××××.com> |
46 |
+Date: Tue, 9 Jun 2015 09:49:02 -0400 |
47 |
+Subject: [PATCH] Cleared ill-formed conversion in C++11 |
48 |
+ |
49 |
+--- |
50 |
+ wake.cpp | 2 +- |
51 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
52 |
+ |
53 |
+diff --git a/wake.cpp b/wake.cpp |
54 |
+index c34165b..e0f194e 100644 |
55 |
+--- a/wake.cpp |
56 |
++++ b/wake.cpp |
57 |
+@@ -23,7 +23,7 @@ void WAKE_Base::GenKey(word32 k0, word32 k1, word32 k2, word32 k3) |
58 |
+ signed int x, z, p; |
59 |
+ // x and z were declared as "long" in Wheeler's paper, which is a signed type. I don't know if that was intentional, but it's too late to change it now. -- Wei 7/4/2010 |
60 |
+ CRYPTOPP_COMPILE_ASSERT(sizeof(x) == 4); |
61 |
+- static int tt[10]= { |
62 |
++ static unsigned int tt[10]= { |
63 |
+ 0x726a8f3b, // table |
64 |
+ 0xe69a3b5c, |
65 |
+ 0xd3c71fe5, |