# HG changeset patch # User Samuel Trassare # Date 1354039049 28800 # Node ID ee6d13c8379c778fca59be9369c19e2638f6e5fb # Parent 57dede92d7fe22d32e6cff0868faffa5f378fad4 cryptopp: up 5.6.1 diff -r 57dede92d7fe -r ee6d13c8379c cryptopp/receipt --- a/cryptopp/receipt Mon Nov 26 20:16:31 2012 +0000 +++ b/cryptopp/receipt Tue Nov 27 09:57:29 2012 -0800 @@ -1,19 +1,21 @@ # SliTaz package receipt. PACKAGE="cryptopp" -VERSION="5.6.0" +VERSION="5.6.1" CATEGORY="security" SHORT_DESC="C++ class library of cryptographic schemes." MAINTAINER="pankso@slitaz.org" -TARBALL="$PACKAGE-$VERSION.tar.bz2" -WEB_SITE="http://www.cryptopp.com/" -WGET_URL="http://mirror.slitaz.org/sources/packages/c/$TARBALL" +TARBALL="${PACKAGE}561.zip" +WEB_SITE="http://www.cryptopp.com" +WGET_URL="$WEB_SITE/$TARBALL" # Rules to configure and make the package. compile_rules() { cd $src - make && + patch -Np1 < $stuff/$PACKAGE-$VERSION-gcc-4.7.0.patch + make + make libcryptopp.so make PREFIX=$PWD/_pkg/usr install } @@ -21,8 +23,8 @@ genpkg_rules() { mkdir -p $fs/usr/share/doc/$PACKAGE - cp -a $_pkg/usr/lib $fs/usr - cp -a $_pkg/usr/include $fs/usr + cp -a $INSTALL/usr/lib $fs/usr + cp -a $INSTALL/usr/include $fs/usr cp $src/License.txt $fs/usr/share/doc/$PACKAGE cp $src/Readme.txt $fs/usr/share/doc/$PACKAGE } diff -r 57dede92d7fe -r ee6d13c8379c cryptopp/stuff/cryptopp-5.6.1-gcc-4.7.0.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/cryptopp/stuff/cryptopp-5.6.1-gcc-4.7.0.patch Tue Nov 27 09:57:29 2012 -0800 @@ -0,0 +1,97 @@ +--- cryptopp/algebra.cpp 2010-08-06 18:44:32.000000000 +0300 ++++ cryptopp/algebra.cpp 2012-01-05 03:32:21.337004210 +0200 +@@ -58,7 +58,7 @@ + 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; +--- cryptopp/eccrypto.cpp 2010-08-06 18:44:28.000000000 +0300 ++++ cryptopp/eccrypto.cpp 2012-01-05 04:04:08.055499801 +0200 +@@ -435,7 +435,7 @@ + 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 @@ + 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 @@ + typename EC::Point P; + if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size)) + BERDecodeError(); +- SetPublicElement(P); ++ this->SetPublicElement(P); + } + + template +--- cryptopp/eccrypto.h 2010-08-06 18:46:24.000000000 +0300 ++++ cryptopp/eccrypto.h 2012-01-05 04:04:54.672022639 +0200 +@@ -43,7 +43,7 @@ + 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 @@ + typedef typename EC::Point Element; + + void Initialize(const DL_GroupParameters_EC ¶ms, 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 @@ + 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 ¶ms) +- {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, G, n));} ++ {this->GenerateRandom(rng, DL_GroupParameters_EC(ec, G, n));} + + // PKCS8PrivateKey + void BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size); +--- cryptopp/panama.cpp 2010-08-09 14:22:42.000000000 +0300 ++++ cryptopp/panama.cpp 2012-01-05 04:10:36.356525599 +0200 +@@ -422,7 +422,7 @@ + { + this->ThrowIfInvalidTruncatedSize(size); + +- PadLastBlock(this->BLOCKSIZE, 0x01); ++ this->PadLastBlock(this->BLOCKSIZE, 0x01); + + HashEndianCorrectedBlock(this->m_data); + +--- cryptopp/secblock.h 2012-01-03 23:15:48.287022036 +0200 ++++ cryptopp/secblock.h 2012-01-05 03:22:06.097299323 +0200 +@@ -89,7 +89,7 @@ + + pointer allocate(size_type n, const void * = NULL) + { +- CheckSize(n); ++ this->CheckSize(n); + if (n == 0) + return NULL; +