patch to fix building with system crypto++

3 files changed, 70 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4fe185c59184..c80901a03065 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Jan  9 07:56:04 UTC 2017
+# Wed Apr 25 04:57:29 UTC 2018
 pkgbase = pycryptopp
 	pkgdesc = Python wrappers for the Crypto++ library
 	pkgver = 0.7.1
@@ -11,8 +11,10 @@ pkgbase = pycryptopp
 	makedepends = python2-setuptools
 	depends = python2
 	depends = crypto++
-	source = https://pypi.python.org/packages/7c/e2/7e035d306c7516c471802d7cd7b6c1e403e582489bc5c14706854a187a24/pycryptopp-0.7.1.869544967005693312591928092448767568728501330214.tar.gz
+	source = https://files.pythonhosted.org/packages/7c/e2/7e035d306c7516c471802d7cd7b6c1e403e582489bc5c14706854a187a24/pycryptopp-0.7.1.869544967005693312591928092448767568728501330214.tar.gz
+	source = api_change.patch
 	sha256sums = 08ad57a1a39b7ed23c173692281da0b8d49d98ad3dcc09f8cca6d901e142699f
+	sha256sums = 9d9cfa52ad93b8662cb8ecfd3c7f82129394735dab41142fe1ad7f66267df3e2
 
 pkgname = pycryptopp
 
diff --git a/PKGBUILD b/PKGBUILD
index 48c444c1ce9b..3e88c4062dd7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,15 +13,20 @@ license=('GPL')
 makedepends=('python2-setuptools')
 depends=('python2' 'crypto++')
 
-source=("https://pypi.python.org/packages/7c/e2/7e035d306c7516c471802d7cd7b6c1e403e582489bc5c14706854a187a24/$pkgname-$pkgver.$_pkgtag.tar.gz")
-
 #key 242BE85F: public key "Zooko Wilcox-O'Hearn (Hacker) <zooko@zooko.com>"
 validpgpkeys=('A60B7EE17164D0C5F13738685F22F428242BE85F')
-sha256sums=('08ad57a1a39b7ed23c173692281da0b8d49d98ad3dcc09f8cca6d901e142699f')
+source=("https://files.pythonhosted.org/packages/7c/e2/7e035d306c7516c471802d7cd7b6c1e403e582489bc5c14706854a187a24/$pkgname-$pkgver.$_pkgtag.tar.gz"
+        'api_change.patch')
+sha256sums=('08ad57a1a39b7ed23c173692281da0b8d49d98ad3dcc09f8cca6d901e142699f'
+            '9d9cfa52ad93b8662cb8ecfd3c7f82129394735dab41142fe1ad7f66267df3e2')
+
+prepare() {
+    cd "$srcdir/$pkgname-$pkgver.$_pkgtag/src"
+    patch -Np1 -i "$srcdir/api_change.patch"
+}
 
 build() {
     cd "$srcdir/$pkgname-$pkgver.$_pkgtag"
-    export PYCRYPTOPP_USE_SYSTEM_CRYPTOPP_WITH_ASM=1
     export PYCRYPTOPP_DISABLE_EMBEDDED_CRYPTOPP=1
     python2 setup.py build
 }
diff --git a/api_change.patch b/api_change.patch
new file mode 100644
index 000000000000..cd5274038039
--- /dev/null
+++ b/api_change.patch
@@ -0,0 +1,57 @@
+diff -Naur src.a/pycryptopp/cipher/aesmodule.cpp src.b/pycryptopp/cipher/aesmodule.cpp
+--- src.a/pycryptopp/cipher/aesmodule.cpp	2015-07-27 14:27:37.000000000 -0400
++++ src.b/pycryptopp/cipher/aesmodule.cpp	2018-03-27 04:08:21.740514719 -0400
+@@ -20,6 +20,8 @@
+ #include <src-cryptopp/aes.h>
+ #endif
+ 
++typedef unsigned char byte;
++
+ static const char*const aes___doc__ = "_aes counter mode cipher\n\
+ You are advised to run aes.start_up_self_test() after importing this module.";
+ 
+diff -Naur src.a/pycryptopp/cipher/xsalsa20module.cpp src.b/pycryptopp/cipher/xsalsa20module.cpp
+--- src.a/pycryptopp/cipher/xsalsa20module.cpp	2015-07-27 14:27:37.000000000 -0400
++++ src.b/pycryptopp/cipher/xsalsa20module.cpp	2018-03-27 04:09:18.368553490 -0400
+@@ -16,6 +16,8 @@
+ #include <src-cryptopp/salsa.h>
+ #endif
+ 
++typedef unsigned char byte;
++
+ static const char* const xsalsa20__doc__ = "_xsalsa20 cipher";
+ 
+ static PyObject *xsalsa20_error;
+diff -Naur src.a/pycryptopp/hash/sha256module.cpp src.b/pycryptopp/hash/sha256module.cpp
+--- src.a/pycryptopp/hash/sha256module.cpp	2015-07-27 14:27:37.000000000 -0400
++++ src.b/pycryptopp/hash/sha256module.cpp	2018-03-27 04:09:12.578762162 -0400
+@@ -21,6 +21,8 @@
+ #include <src-cryptopp/filters.h>
+ #endif
+ 
++typedef unsigned char byte;
++
+ static const char*const sha256___doc__ = "_sha256 hash function";
+ 
+ static PyObject *sha256_error;
+diff -Naur src.a/pycryptopp/publickey/rsamodule.cpp src.b/pycryptopp/publickey/rsamodule.cpp
+--- src.a/pycryptopp/publickey/rsamodule.cpp	2015-07-27 14:27:37.000000000 -0400
++++ src.b/pycryptopp/publickey/rsamodule.cpp	2018-03-27 04:06:02.074993656 -0400
+@@ -87,7 +87,7 @@
+ VerifyingKey_serialize(VerifyingKey *self, PyObject *dummy) {
+     std::string outstr;
+     StringSink ss(outstr);
+-    self->k->DEREncode(ss);
++    self->k->GetMaterial().Save(ss);
+     PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
+     if (!result)
+         return NULL;
+@@ -216,7 +216,7 @@
+ SigningKey_serialize(SigningKey *self, PyObject *dummy) {
+     std::string outstr;
+     StringSink ss(outstr);
+-    self->k->DEREncode(ss);
++    self->k->GetMaterial().Save(ss);
+     PyStringObject* result = reinterpret_cast<PyStringObject*>(PyString_FromStringAndSize(outstr.c_str(), outstr.size()));
+     if (!result)
+         return NULL;