summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-06-26 14:49:44 +0000
committerMike Frysinger <vapier@gentoo.org>2012-06-26 14:49:44 +0000
commit2ee5e85b91a5b22c571846e7e0807da2344f62e4 (patch)
treee4ed86e71afeb6466cbb8dea0663f89c41a1dd80 /dev-libs/crypto++
parenthttp://my.opera.com/desktopteam/blog/2012/06/26/html5-dnd-fixes-for-12-01 (diff)
downloadhistorical-2ee5e85b91a5b22c571846e7e0807da2344f62e4.tar.gz
historical-2ee5e85b91a5b22c571846e7e0807da2344f62e4.tar.bz2
historical-2ee5e85b91a5b22c571846e7e0807da2344f62e4.zip
Add fix from upstream tracker for building with gcc-4.7 #403197 by Kacper Kowalik.
Package-Manager: portage-2.2.0_alpha112/cvs/Linux x86_64
Diffstat (limited to 'dev-libs/crypto++')
-rw-r--r--dev-libs/crypto++/ChangeLog8
-rw-r--r--dev-libs/crypto++/Manifest35
-rw-r--r--dev-libs/crypto++/crypto++-5.6.1-r3.ebuild8
-rw-r--r--dev-libs/crypto++/files/crypto++-5.6.1-gcc-4.7.patch120
4 files changed, 149 insertions, 22 deletions
diff --git a/dev-libs/crypto++/ChangeLog b/dev-libs/crypto++/ChangeLog
index da07578d548e..c9fd3c1e1035 100644
--- a/dev-libs/crypto++/ChangeLog
+++ b/dev-libs/crypto++/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-libs/crypto++
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.74 2012/01/30 16:06:14 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/ChangeLog,v 1.75 2012/06/26 14:49:44 vapier Exp $
+
+ 26 Jun 2012; Mike Frysinger <vapier@gentoo.org>
+ +files/crypto++-5.6.1-gcc-4.7.patch, crypto++-5.6.1-r3.ebuild:
+ Add fix from upstream tracker for building with gcc-4.7 #403197 by Kacper
+ Kowalik.
*crypto++-5.6.1-r3 (30 Jan 2012)
@@ -307,4 +312,3 @@
24 Nov 2003; Ryan Phillips <rphillips@gentoo.org> crypto++-5.1.ebuild:
Initial Import. Thanks to Marc Bevand. Fixes #33685
-
diff --git a/dev-libs/crypto++/Manifest b/dev-libs/crypto++/Manifest
index b02c91c57546..1564e21cad7a 100644
--- a/dev-libs/crypto++/Manifest
+++ b/dev-libs/crypto++/Manifest
@@ -1,29 +1,30 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
AUX crypto++-5.6.1-fix_build_system.patch 5008 RMD160 df6813be73acddba7aac0e70abd2c9ff75c5a4de SHA1 c514f778c97cb739f9e3a02f2c44ef86dcafa992 SHA256 cc2c823046f38c154f7cc6899ff2cb94bb378bfbbb534662246d378e751f0480
+AUX crypto++-5.6.1-gcc-4.7.patch 4442 RMD160 f215875aa2f08dde75ab1c1f9eb580a7039f392e SHA1 483f13f330de76048207864ab8e72e0ce91d7761 SHA256 e4b13387ad5f0a2089565709b5fbf95790f50c2e710af153b94faa15dc351ff1
AUX crypto++-5.6.1-r3-fix_build_system.patch 5684 RMD160 7465de1abd6ec4556249ca53f228df4ba7b3f089 SHA1 5f88b3f351ebc95ad76c226f6eaf4a0dbc2bbf03 SHA256 b66efd9b50efc66afa06e19601646fd6e4f93f1bc8424192efee3d6e5c8cf514
AUX crypto++-5.6.1-rijndael.patch 578 RMD160 3d90b5e917be68ce44180377b8965708cfdb9d9c SHA1 76357ba0afd2c5688d0b23b4924c039a5601c732 SHA256 8d5c406987a1a98c3e2aa5c1046d86bc3ff2c7af6c487b70b8b0fa9cb938ca0c
AUX crypto++-5.6.1-sunos.patch 546 RMD160 69e22a1db8f5fefae1660cf1adbb2cca6600b2d9 SHA1 c21120d904eab8ec3531ebbab68a9663355ac098 SHA256 fb0bc4e48dc55100dd0a454b86a98c949faa79d77967840a9afa0e0ac1ac531c
DIST cryptopp561.zip 1069703 RMD160 a8a5b80c995c5d4ddafba228caf8866425212fbf SHA1 31dbb456c21f50865218c57b7eaf4c955a222ba1 SHA256 98e74d8cb17a38033354519ac8ba9c5d98a6dc00bf5d1ec3c533c2e8ec86f268
EBUILD crypto++-5.6.1-r1.ebuild 1380 RMD160 611f381055e27cbbdb9a4593cd50b4118cb25f90 SHA1 fbbc76fcf90df6855b0b1ff2b0dcc3fa5ff56969 SHA256 613af20fe8e05295e207688948f16451f72e26250cb6474257610dfab269995c
-EBUILD crypto++-5.6.1-r3.ebuild 1389 RMD160 cb0c9f628faf8da51d1a944ccc4033292b88b733 SHA1 53ce56b7f027931163118c343ea2385628024557 SHA256 5240b7cfe4390625ae9f417b58cb62f345bbcc22e9b0016fd1f2dc4c993e9738
-MISC ChangeLog 11262 RMD160 28760c99e77a4cb962ca0ea1368a57b01f55ec28 SHA1 e69b0f02804d87ea43ed64787396d5f69ece35c1 SHA256 7e3decbc1dfdfa8372dea0a53d1b6cfa2d6be786e02a30dd9548177076ab4c40
+EBUILD crypto++-5.6.1-r3.ebuild 1430 RMD160 8ecfb6763334fba2d564d2b60f61bebd6eff5886 SHA1 47f5cc43deddae12ebd217cd8b7d016758f94436 SHA256 b394ed85e3f03551019e016345e0dec4258b723351d5b97e483d53f656594260
+MISC ChangeLog 11464 RMD160 3c3bdb91d13bff9c8adde0f658e83f596f28ebb6 SHA1 b6fc17d35aa389d5344552192b76dcc195c411a0 SHA256 344a240e00e1b38edd86e62bda65e043f8890424df305e62df807b2c47c2d381
MISC metadata.xml 160 RMD160 61ea9f9370afee3db802f40f7c6b2edd2f5347cf SHA1 51cf29a3589cff823294704e225b0de18f65e6dd SHA256 7419f4e73ddd07284403525f1380824fc68280cad69e2dfae0645ad52b33ef10
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJPJr/hAAoJEDhV2qHwDPIGHmwP/iySYP6PZ4qdnLVxQu3JV8Ey
-eWVUS4hUx6A9yjCUtVgH1ZXZf3k6i+OQLCAKkAEBvUE1Kx+a7xjahUCVKnCZd0GD
-8F7t9zG/qnK0ZRYR0N0qUm22BWndNxzPnl/OHts5g89Pm48oMWSQX2Ofc9yQ+ine
-bbR1eblL0RHz68MsHe9/S28xGszJyMdGWRnfgMu3arSVbhk1qSJh7eBJi3166AQm
-dKJvmYxNeCc939I2vajQ0iig7fOuFDSPTXNKUqfMDu/9QpnnXF3ppXsw/YLaKn9r
-aOhk2nEWW9R6biU93JW7xnVcf1bDLdnfm4sYwkXsnaCXGucLXpE+oIRTflg1Oqga
-JIEFAFBxlJN16/4E9K8xyjpkxqyM3Sc3TWBcuT9OrZeInZ/ZP9NBEsWo778L104G
-mto9z0/W4eABUWdrAYAmAAES9wIeIOdCu+1/reRbIsUBxqFTcWrEyOX4OX0mYw+I
-9fcPPw+tNVRT0pOsEE8D4cwdTTtxfW2oXZtPQLAgzJ4bisz05AVYtd2nQVCD3Xw4
-OSUdFFP+mgCFANQhQ1ZLw4AmVIrz0K4f0WE4yecQxIsqdqLS9sym8+1s93koD4ez
-NBGqVFs1/CPh58CtaOPbsZ5Ku0LfCX/NIUi+5s8+omcc22/EhMdJMM7ramTLMIvt
-XmCaAopDbvukbO4FN5gm
-=wBYL
+iQIcBAEBAgAGBQJP6cwRAAoJELEHsLL7fEFWa8wP/RnkLwNeIngjCVkliWJFHUb5
+7c53wtSg99InnZ8r/KysTPDXZqPB+Tcb9fS59Ni3heMQkBZBUnJCkfAqdI+bOCIW
+h5FgciWbrQt3YBf5zxcXNF3UnkAqDi8FakLHqmyrN72wfOcrwJJiLMwpwQ/sirx6
+Fz8/ljfC2CMA6mtoXGUBu3jcobLJps+L7F3rZV5e02PngfOHX0dJhITB/vcvS7pL
+AAoasckkcpUvlQz0qZ1S3LrQhii85qkXHc3mt2aQQr/WufnHIfONE7V1KidZVSN1
+d9lZMGF/NPEQHMve1Up7L2CV5Jnm/kk7KdeRNl8NLQ6lPhDW9CxXOFvc3ONliuNc
+WtgfAodMuHn9rgDvGC59JEm+4+bqYq8Ve4doMhIa5gUc9c9g2UiTw3u0uICr20Q+
+j4p5c6TkbPaEryDSVeyh5JazDaRqMZq/a5HtgCgobEy+DeCt+/pU5/xQ7eA+RuEG
+gBle6grRtCMXB3xrcvyBSpiyoYMXTKfaiol5PomJB9Acj942p0YWnOUaQCme6SS0
+PlsN2yBRNkBfRYimSo8ZJoSx8UnRBFEY1/X9o36k5LIwTjpr14j1h50dgUMIghxE
+5N6RBCrwUS3ezK1wVdEr5Qa5RaoORgW/S9qwntRBXmVmzLQP/FnrCsb50fsNifGJ
+vBw2aOPdzakwW+xzVkCi
+=uh7T
-----END PGP SIGNATURE-----
diff --git a/dev-libs/crypto++/crypto++-5.6.1-r3.ebuild b/dev-libs/crypto++/crypto++-5.6.1-r3.ebuild
index 5583bfd88b3e..38f93ef571d6 100644
--- a/dev-libs/crypto++/crypto++-5.6.1-r3.ebuild
+++ b/dev-libs/crypto++/crypto++-5.6.1-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.1-r3.ebuild,v 1.1 2012/01/30 16:06:14 c1pher Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/crypto++/crypto++-5.6.1-r3.ebuild,v 1.2 2012/06/26 14:49:44 vapier Exp $
EAPI="3"
@@ -21,8 +21,10 @@ RDEPEND=""
S="${WORKDIR}"
src_prepare() {
- epatch "${FILESDIR}/${PF}-fix_build_system.patch" \
- "${FILESDIR}/${P}-rijndael.patch"
+ epatch \
+ "${FILESDIR}"/${PF}-fix_build_system.patch \
+ "${FILESDIR}"/${P}-rijndael.patch \
+ "${FILESDIR}"/${P}-gcc-4.7.patch
}
src_compile() {
diff --git a/dev-libs/crypto++/files/crypto++-5.6.1-gcc-4.7.patch b/dev-libs/crypto++/files/crypto++-5.6.1-gcc-4.7.patch
new file mode 100644
index 000000000000..cd6147aebf20
--- /dev/null
+++ b/dev-libs/crypto++/files/crypto++-5.6.1-gcc-4.7.patch
@@ -0,0 +1,120 @@
+https://bugs.gentoo.org/403197
+http://sourceforge.net/apps/trac/cryptopp/ticket/14
+http://sourceforge.net/apps/trac/cryptopp/attachment/ticket/14/gcc4.7.diff
+
+diff --git a/algebra.cpp b/algebra.cpp
+index 78c3947..d4bfc57 100644
+--- a/algebra.cpp
++++ b/algebra.cpp
+@@ -58,7 +58,7 @@ template <class T> const T& AbstractEuclideanDomain<T>::Gcd(const Element &a, co
+ Element g[3]={b, a};
+ unsigned int i0=0, i1=1, i2=2;
+
+- while (!Equal(g[i1], this->Identity()))
++ while (!this->Equal(g[i1], this->Identity()))
+ {
+ g[i2] = Mod(g[i0], g[i1]);
+ unsigned int t = i0; i0 = i1; i1 = i2; i2 = t;
+@@ -74,7 +74,7 @@ template <class T> const typename QuotientRing<T>::Element& QuotientRing<T>::Mul
+ Element y;
+ unsigned int i0=0, i1=1, i2=2;
+
+- while (!Equal(g[i1], Identity()))
++ while (!this->Equal(g[i1], Identity()))
+ {
+ // y = g[i0] / g[i1];
+ // g[i2] = g[i0] % g[i1];
+diff --git a/eccrypto.cpp b/eccrypto.cpp
+index fd8462f..922104c 100644
+--- a/eccrypto.cpp
++++ b/eccrypto.cpp
+@@ -435,7 +435,7 @@ template <class EC> void DL_GroupParameters_EC<EC>::Initialize(const OID &oid)
+ StringSource ssG(param.g, true, new HexDecoder);
+ Element G;
+ bool result = GetCurve().DecodePoint(G, ssG, (size_t)ssG.MaxRetrievable());
+- SetSubgroupGenerator(G);
++ this->SetSubgroupGenerator(G);
+ assert(result);
+
+ StringSource ssN(param.n, true, new HexDecoder);
+@@ -591,7 +591,7 @@ bool DL_GroupParameters_EC<EC>::ValidateElement(unsigned int level, const Elemen
+ if (level >= 2 && pass)
+ {
+ const Integer &q = GetSubgroupOrder();
+- Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : ExponentiateElement(g, q);
++ Element gq = gpc ? gpc->Exponentiate(this->GetGroupPrecomputation(), q) : this->ExponentiateElement(g, q);
+ pass = pass && IsIdentity(gq);
+ }
+ return pass;
+@@ -629,7 +629,7 @@ void DL_PublicKey_EC<EC>::BERDecodePublicKey(BufferedTransformation &bt, bool pa
+ typename EC::Point P;
+ if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
+ BERDecodeError();
+- SetPublicElement(P);
++ this->SetPublicElement(P);
+ }
+
+ template <class EC>
+diff --git a/eccrypto.h b/eccrypto.h
+index b359e03..3530455 100644
+--- a/eccrypto.h
++++ b/eccrypto.h
+@@ -43,7 +43,7 @@ public:
+ void Initialize(const EllipticCurve &ec, const Point &G, const Integer &n, const Integer &k = Integer::Zero())
+ {
+ this->m_groupPrecomputation.SetCurve(ec);
+- SetSubgroupGenerator(G);
++ this->SetSubgroupGenerator(G);
+ m_n = n;
+ m_k = k;
+ }
+@@ -145,9 +145,9 @@ public:
+ typedef typename EC::Point Element;
+
+ void Initialize(const DL_GroupParameters_EC<EC> &params, const Element &Q)
+- {this->AccessGroupParameters() = params; SetPublicElement(Q);}
++ {this->AccessGroupParameters() = params; this->SetPublicElement(Q);}
+ void Initialize(const EC &ec, const Element &G, const Integer &n, const Element &Q)
+- {this->AccessGroupParameters().Initialize(ec, G, n); SetPublicElement(Q);}
++ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPublicElement(Q);}
+
+ // X509PublicKey
+ void BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
+@@ -166,9 +166,9 @@ public:
+ void Initialize(const EC &ec, const Element &G, const Integer &n, const Integer &x)
+ {this->AccessGroupParameters().Initialize(ec, G, n); this->SetPrivateExponent(x);}
+ void Initialize(RandomNumberGenerator &rng, const DL_GroupParameters_EC<EC> &params)
+- {GenerateRandom(rng, params);}
++ {this->GenerateRandom(rng, params);}
+ void Initialize(RandomNumberGenerator &rng, const EC &ec, const Element &G, const Integer &n)
+- {GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
++ {this->GenerateRandom(rng, DL_GroupParameters_EC<EC>(ec, G, n));}
+
+ // PKCS8PrivateKey
+ void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size);
+diff --git a/panama.cpp b/panama.cpp
+index 09b1708..a1a37d6 100644
+--- a/panama.cpp
++++ b/panama.cpp
+@@ -422,7 +422,7 @@ void PanamaHash<B>::TruncatedFinal(byte *hash, size_t size)
+ {
+ this->ThrowIfInvalidTruncatedSize(size);
+
+- PadLastBlock(this->BLOCKSIZE, 0x01);
++ this->PadLastBlock(this->BLOCKSIZE, 0x01);
+
+ HashEndianCorrectedBlock(this->m_data);
+
+diff --git a/secblock.h b/secblock.h
+index 24b9fc0..40cce33 100644
+--- a/secblock.h
++++ b/secblock.h
+@@ -88,7 +88,7 @@ public:
+
+ pointer allocate(size_type n, const void * = NULL)
+ {
+- CheckSize(n);
++ this->CheckSize(n);
+ if (n == 0)
+ return NULL;
+