Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 net/crda/DEPENDS                         |    2 -
 net/crda/HISTORY                         |    4 +++
 net/crda/PRE_BUILD                       |    3 ++
 net/crda/patches/crda-3.18-python3.patch |   41 
+++++++++++++++++++++++++++++++
 utils/spice-protocol/DETAILS             |    4 +--
 utils/spice-protocol/HISTORY             |    3 ++
 6 files changed, 54 insertions(+), 3 deletions(-)

New commits:
commit d6e3ff8489c71f2066447e73419e4a237127dbca
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    spice-protocol 0.12.14

commit 68a8448c66c2135f4b68243823891c3a5f7b0f50
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    crda: Enable building with python3

diff --git a/net/crda/DEPENDS b/net/crda/DEPENDS
index 89a048b..42b9517 100755
--- a/net/crda/DEPENDS
+++ b/net/crda/DEPENDS
@@ -1,6 +1,6 @@
 depends libgcrypt      &&
 depends libnl          &&
 depends m2crypto       &&
-depends python         &&
+depends PYTHON         &&
 depends SSL            &&
 depends wireless-regdb
diff --git a/net/crda/HISTORY b/net/crda/HISTORY
index 6500035..bb2e5cd 100644
--- a/net/crda/HISTORY
+++ b/net/crda/HISTORY
@@ -1,3 +1,7 @@
+2018-08-25 Ismael Luceno <ismael AT iodev.co.uk>
+       * DEPENDS, PRE_BUILD, patches/crda-3.18-python3.patch: enabled 
buliding
+         with python3
+
 2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DEPENDS: add dependency on libgcrypt
 
diff --git a/net/crda/PRE_BUILD b/net/crda/PRE_BUILD
index 0a365b5..0ed306d 100755
--- a/net/crda/PRE_BUILD
+++ b/net/crda/PRE_BUILD
@@ -1,6 +1,9 @@
 default_pre_build &&
 
 cd "$SOURCE_DIRECTORY" &&
+if is_depends_enabled "$SPELL" python3; then
+  patch -fp1 < "$SPELL_DIRECTORY/patches/$SPELL-3.18-python3.patch"
+fi &&
 patch -p1 < "${SPELL_DIRECTORY}"/patches/${SPELL}-3.18-no-ldconfig.patch &&
 patch -p1 < "${SPELL_DIRECTORY}"/patches/${SPELL}-3.18-no-werror.patch   &&
 patch -p1 < "${SPELL_DIRECTORY}"/patches/${SPELL}-3.18-openssl.patch     &&
diff --git a/net/crda/patches/crda-3.18-python3.patch 
b/net/crda/patches/crda-3.18-python3.patch
new file mode 100644
index 0000000..d478a8a
--- /dev/null
+++ b/net/crda/patches/crda-3.18-python3.patch
@@ -0,0 +1,41 @@
+--- a/utils/key2pub.py
++++ b/utils/key2pub.py
+@@ -1,9 +1,9 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+
+ import sys
+ try:
+        from M2Crypto import RSA
+-except ImportError, e:
++except ImportError as e:
+        sys.stderr.write('ERROR: Failed to import the "M2Crypto" module: 
%s\n' % e.message)
+        sys.stderr.write('Please install the "M2Crypto" Python module.\n')
+        sys.stderr.write('On Debian GNU/Linux the package is called 
"python-m2crypto".\n')
+@@ -80,7 +80,7 @@
+
+ static struct pubkey keys[] = {
+ ''')
+-    for n in xrange(n + 1):
++    for n in range(n + 1):
+         output.write('        KEYS(e_%d, n_%d),\n' % (n, n))
+     output.write('};\n')
+     pass
+@@ -117,7 +117,7 @@
+
+ static const struct key_params keys[] = {
+ ''')
+-    for n in xrange(n + 1):
++    for n in range(n + 1):
+         output.write('        KEYS(e_%d, n_%d),\n' % (n, n))
+     output.write('};\n')
+
+@@ -135,7 +135,7 @@
+     mode = None
+
+ if not mode in modes:
+-    print 'Usage: %s [%s] input-file... output-file' % (sys.argv[0], 
'|'.join(modes.keys()))
++    print('Usage: %s [%s] input-file... output-file' % (sys.argv[0], 
'|'.join(modes.keys())))
+     sys.exit(2)
+
+ output = open(outfile, 'w')
diff --git a/utils/spice-protocol/DETAILS b/utils/spice-protocol/DETAILS
index 512baf1..c2e3ecf 100755
--- a/utils/spice-protocol/DETAILS
+++ b/utils/spice-protocol/DETAILS
@@ -1,7 +1,7 @@
            SPELL=spice-protocol
-         VERSION=0.12.12
+         VERSION=0.12.14
           SOURCE="${SPELL}-${VERSION}.tar.bz2"
-     
SOURCE_HASH=sha512:66e7a902b3c4a5a778cb91ffd9d324b12d414184146ac834dfb3bd81b4b6b1bb56258d3e1ce240b6f8747e1960fce8f0f6b0ada3617e9f9819be7118195fce6b
+     
SOURCE_HASH=sha512:4266bcbef9f641a97a2ff72f1b01380a41e51f4b1a0dbb73fdf68baf552598a62d5cf0c526adf2997a55ee5d4fe9392927c3d7f4556827bfb2933f59bfab55bb
    SOURCE_URL[0]=http://spice-space.org/download/releases/${SOURCE}
 #     
SOURCE_HASH=sha512:6e984550392d6cb67d965e18ebc28b13ad406788da27839be94a05845f4c94e444f1737925320a9a69883c8d970ca112d2226bb1754a125f8a1c778be0c4367c
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/utils/spice-protocol/HISTORY b/utils/spice-protocol/HISTORY
index f814ece..7167946 100644
--- a/utils/spice-protocol/HISTORY
+++ b/utils/spice-protocol/HISTORY
@@ -1,3 +1,6 @@
+2018-08-29 Ismael Luceno <ismael AT sourcemage.org>
+       * DETAILS: updated spell to 0.12.14
+
 2016-09-20 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS: updated spell to 0.12.12