Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 python-pypi/pycryptopp/BUILD     |    1 
 python-pypi/pycryptopp/DEPENDS   |    6 +++-
 python-pypi/pycryptopp/DETAILS   |    1 
 python-pypi/pycryptopp/HISTORY   |    8 +++++
 python-pypi/pycryptopp/PRE_BUILD |    4 ++
 python-pypi/pycryptopp/api.patch |   53 
+++++++++++++++++++++++++++++++++++++++
 6 files changed, 72 insertions(+), 1 deletion(-)

New commits:
commit ae5bddb211f9a73d170b9e62d521437c207b797b
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    pycryptopp: build against system Crypto++ library

diff --git a/python-pypi/pycryptopp/BUILD b/python-pypi/pycryptopp/BUILD
new file mode 100755
index 0000000..c2699a7
--- /dev/null
+++ b/python-pypi/pycryptopp/BUILD
@@ -0,0 +1 @@
+default_build ${OPTS}
diff --git a/python-pypi/pycryptopp/DEPENDS b/python-pypi/pycryptopp/DEPENDS
index 49a44ee..a61004d 100755
--- a/python-pypi/pycryptopp/DEPENDS
+++ b/python-pypi/pycryptopp/DEPENDS
@@ -1,4 +1,8 @@
 depends python &&
 depends SETUPTOOLS &&
 depends -sub CXX gcc &&
-depends cryptopp
+
+optional_depends cryptopp \
+                 "--disable-embedded-cryptopp" \
+                 "" \
+                 "to build against system Crypto++ library"
diff --git a/python-pypi/pycryptopp/DETAILS b/python-pypi/pycryptopp/DETAILS
index 27c4078..250694a 100755
--- a/python-pypi/pycryptopp/DETAILS
+++ b/python-pypi/pycryptopp/DETAILS
@@ -1,5 +1,6 @@
            SPELL=pycryptopp
          VERSION=0.7.1.869544967005693312591928092448767568728501330214
+      PATCHLEVEL=1
           SOURCE="${SPELL}-${VERSION}.tar.gz"
    SOURCE_URL[0]=https://pypi.org/packages/source/p/${SPELL}/${SOURCE}
      
SOURCE_HASH=sha512:8b5996badedcd32345818f95e26487ac938c10e1790495515c74816075261a4fcedd2f80c55beddbdea54ed8899bc7c7b1a192468cb3cf434c50f9a68b65cc25
diff --git a/python-pypi/pycryptopp/HISTORY b/python-pypi/pycryptopp/HISTORY
index b075532..e4bcdd4 100644
--- a/python-pypi/pycryptopp/HISTORY
+++ b/python-pypi/pycryptopp/HISTORY
@@ -1,2 +1,10 @@
+2018-05-05 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * BUILD: added, to build against system Crypto++
+       * DEPENDS: made cryptopp optional
+       * PRE_BUILD: added, to apply patch
+       * api.patch: added, backported from Arch to fix build with newer
+         Crypto++
+
 2017-07-11 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS, DETAILS: created spell, version 
0.7.1.869544967005693312591928092448767568728501330214
diff --git a/python-pypi/pycryptopp/PRE_BUILD 
b/python-pypi/pycryptopp/PRE_BUILD
new file mode 100755
index 0000000..b85bbb7
--- /dev/null
+++ b/python-pypi/pycryptopp/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+patch -p0 < "${SPELL_DIRECTORY}/api.patch"
diff --git a/python-pypi/pycryptopp/api.patch 
b/python-pypi/pycryptopp/api.patch
new file mode 100644
index 0000000..f521633
--- /dev/null
+++ b/python-pypi/pycryptopp/api.patch
@@ -0,0 +1,53 @@
+--- src/pycryptopp/cipher/aesmodule.cpp.orig
++++ src/pycryptopp/cipher/aesmodule.cpp
+@@ -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.";
+ 
+--- src/pycryptopp/cipher/xsalsa20module.cpp.orig
++++ src/pycryptopp/cipher/xsalsa20module.cpp
+@@ -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;
+--- src/pycryptopp/hash/sha256module.cpp.orig
++++ src/pycryptopp/hash/sha256module.cpp
+@@ -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;
+--- src/pycryptopp/publickey/rsamodule.cpp.orig
++++ src/pycryptopp/publickey/rsamodule.cpp
+@@ -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;
\ No newline at end of file