python: Build a working crypt module (closes #230)

diff --git a/packages/python/build.sh b/packages/python/build.sh
index 8276d9f4e8f57a5e236f4aafcacf459164eafc11..583fbebd47b4bda265ef0081eb2425c4ddb105b0 100644 (file)
--- a/packages/python/build.sh
+++ b/packages/python/build.sh
@@ -4,12 +4,12 @@ TERMUX_PKG_DESCRIPTION="Python 3 programming language intended to enable clear p
 # openssl for ensurepip.
 # libbz2 for the bz2 module.
 # ncurses-ui-libs for the curses.panel module.
 # openssl for ensurepip.
 # libbz2 for the bz2 module.
 # ncurses-ui-libs for the curses.panel module.

-TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, liblzma, libsqlite, gdbm, ncurses-ui-libs"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, liblzma, libsqlite, gdbm, ncurses-ui-libs, libcrypt"

 TERMUX_PKG_HOSTBUILD=true
 
 _MAJOR_VERSION=3.5
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
 TERMUX_PKG_HOSTBUILD=true
 
 _MAJOR_VERSION=3.5
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1

-TERMUX_PKG_BUILD_REVISION=3
+TERMUX_PKG_BUILD_REVISION=4

 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
 
 # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.
 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
 
 # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.

diff --git a/packages/python/cryptmodule.c.patch b/packages/python/cryptmodule.c.patch
new file mode 100644 (file)
index 0000000..6d60188
--- /dev/null
+++ b/packages/python/cryptmodule.c.patch
@@ -0,0 +1,11 @@
+diff -u -r ../Python-3.5.1/Modules/_cryptmodule.c ./Modules/_cryptmodule.c
+--- ../Python-3.5.1/Modules/_cryptmodule.c     2015-12-06 20:39:10.000000000 -0500
++++ ./Modules/_cryptmodule.c   2016-04-23 08:11:35.832616854 -0400
+@@ -4,6 +4,7 @@
+ #include "Python.h"
+ 
+ #include <sys/types.h>
++#include <crypt.h>
+ 
+ /* Module crypt */
+ 

diff --git a/packages/python2/build.sh b/packages/python2/build.sh
index 9609ff71f796a5487ff49f899c3a508e0472ac2a..655ca186dc45da65c30c481331fb6cf99af14874 100644 (file)
--- a/packages/python2/build.sh
+++ b/packages/python2/build.sh
@@ -4,12 +4,12 @@ TERMUX_PKG_DESCRIPTION="Python 2 programming language intended to enable clear p
 # openssl for ensurepip.
 # libbz2 for the bz2 module.
 # ncurses-ui-libs for the curses.panel module.
 # openssl for ensurepip.
 # libbz2 for the bz2 module.
 # ncurses-ui-libs for the curses.panel module.

-TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs"
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt"

 TERMUX_PKG_HOSTBUILD=true
 
 _MAJOR_VERSION=2.7
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.11
 TERMUX_PKG_HOSTBUILD=true
 
 _MAJOR_VERSION=2.7
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.11

-TERMUX_PKG_BUILD_REVISION=2
+TERMUX_PKG_BUILD_REVISION=3

 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
 
 # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.
 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
 
 # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.

diff --git a/packages/python2/cryptmodule.c.patch b/packages/python2/cryptmodule.c.patch
new file mode 100644 (file)
index 0000000..dc3e502
--- /dev/null
+++ b/packages/python2/cryptmodule.c.patch
@@ -0,0 +1,11 @@
+diff -u -r ../Python-2.7.11/Modules/cryptmodule.c ./Modules/cryptmodule.c
+--- ../Python-2.7.11/Modules/cryptmodule.c     2015-12-05 14:47:14.000000000 -0500
++++ ./Modules/cryptmodule.c    2016-04-23 08:16:39.850613791 -0400
+@@ -4,6 +4,7 @@
+ #include "Python.h"
+ 
+ #include <sys/types.h>
++#include <crypt.h>
+ 
+ #ifdef __VMS
+ #include <openssl/des.h>