tags 668700 + patch
thanks

diff -Nru libcrypto++-5.6.1/debian/changelog libcrypto++-5.6.1/debian/changelog
--- libcrypto++-5.6.1/debian/changelog  2011-06-05 16:02:54.000000000 +0000
+++ libcrypto++-5.6.1/debian/changelog  2012-04-14 17:17:12.000000000 +0000
@@ -1,3 +1,9 @@
+libcrypto++ (5.6.1-5.1) unstable; urgency=low
+
+  * Fix build failure with gcc-4.7. Closes: #668700.
+
+ -- Matthias Klose <[email protected]>  Sat, 14 Apr 2012 19:16:28 +0200
+
 libcrypto++ (5.6.1-5) unstable; urgency=low
 
   * New maintainer (closes: #628935).
diff -Nru libcrypto++-5.6.1/debian/patches/gcc-4.7-ftbfs.diff 
libcrypto++-5.6.1/debian/patches/gcc-4.7-ftbfs.diff
--- libcrypto++-5.6.1/debian/patches/gcc-4.7-ftbfs.diff 1970-01-01 
00:00:00.000000000 +0000
+++ libcrypto++-5.6.1/debian/patches/gcc-4.7-ftbfs.diff 2012-04-14 
17:17:33.000000000 +0000
@@ -0,0 +1,123 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ libcrypto++ (5.6.1-5.1) unstable; urgency=low
+ .
+   * Fix build failure with gcc-4.7. Closes: #668700.
+Author: Matthias Klose <[email protected]>
+Bug-Debian: http://bugs.debian.org/668700
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- libcrypto++-5.6.1.orig/algebra.cpp
++++ libcrypto++-5.6.1/algebra.cpp
+@@ -58,7 +58,7 @@ template <class T> const T& AbstractEucl
+       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;
+--- libcrypto++-5.6.1.orig/panama.cpp
++++ libcrypto++-5.6.1/panama.cpp
+@@ -421,7 +421,7 @@ void PanamaHash<B>::TruncatedFinal(byte
+ {
+       this->ThrowIfInvalidTruncatedSize(size);
+ 
+-      PadLastBlock(this->BLOCKSIZE, 0x01);
++      this->PadLastBlock(this->BLOCKSIZE, 0x01);
+       
+       HashEndianCorrectedBlock(this->m_data);
+ 
+--- libcrypto++-5.6.1.orig/eccrypto.cpp
++++ libcrypto++-5.6.1/eccrypto.cpp
+@@ -435,7 +435,7 @@ template <class EC> void DL_GroupParamet
+       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>::Validate
+       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>::BERDecodePubli
+       typename EC::Point P;
+       if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size))
+               BERDecodeError();
+-      SetPublicElement(P);
++      this->SetPublicElement(P);
+ }
+ 
+ template <class EC>
+--- libcrypto++-5.6.1.orig/secblock.h
++++ libcrypto++-5.6.1/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;
+ 
+--- libcrypto++-5.6.1.orig/eccrypto.h
++++ libcrypto++-5.6.1/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 -Nru libcrypto++-5.6.1/debian/patches/series 
libcrypto++-5.6.1/debian/patches/series
--- libcrypto++-5.6.1/debian/patches/series     2011-06-05 16:41:27.000000000 
+0000
+++ libcrypto++-5.6.1/debian/patches/series     2012-04-14 17:18:09.000000000 
+0000
@@ -5,4 +5,4 @@
 debian-config.diff
 panama-armel.diff
 salsa.patch
-
+gcc-4.7-ftbfs.diff

Reply via email to