kivy · rnixx · Oct 9, 2016 · Nov 3, 2016 · Dec 8, 2016 · Dec 8, 2016
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -409,7 +409,7 @@ def make_package(args):
 
 def parse_args(args=None):
     global BLACKLIST_PATTERNS, WHITELIST_PATTERNS, PYTHON
-    default_android_api = 12
+    default_android_api = 19
     import argparse
     ap = argparse.ArgumentParser(description='''\
 Package a Python application for Android.

diff --git a/pythonforandroid/bootstraps/sdl2/build/jni/Application.mk b/pythonforandroid/bootstraps/sdl2/build/jni/Application.mk
@@ -5,3 +5,4 @@
 
 # APP_ABI := armeabi armeabi-v7a x86
 APP_ABI := $(ARCH)
+APP_PLATFORM := android-19
diff --git a/pythonforandroid/recipes/cffi/__init__.py b/pythonforandroid/recipes/cffi/__init__.py
@@ -4,7 +4,7 @@
 
 class CffiRecipe(CompiledComponentsPythonRecipe):
     name = 'cffi'
-    version = '1.4.2'
+    version = '1.11.5'
     url = 'https://pypi.python.org/packages/source/c/cffi/cffi-{version}.tar.gz'
 
     depends = [('python2', 'python3crystax'), 'setuptools', 'pycparser', 'libffi']

diff --git a/pythonforandroid/recipes/cryptography/__init__.py b/pythonforandroid/recipes/cryptography/__init__.py
@@ -3,9 +3,19 @@
 
 class CryptographyRecipe(CompiledComponentsPythonRecipe):
     name = 'cryptography'
-    version = '1.3'
+    version = '2.3.1'
     url = 'https://github.com/pyca/cryptography/archive/{version}.tar.gz'
-    depends = [('python2', 'python3crystax'), 'openssl', 'idna', 'pyasn1', 'six', 'setuptools', 'enum34', 'ipaddress', 'cffi']
+
+    # install requires
+    #   * six
+    #   * cffi
+    #   * idna
+    #   * asn1crypto
+    # py 2 additional install requires, define manually if you want to install in python 2
+    #   * enum34
+    #   * ipaddress
+    depends = [('python2', 'python3crystax'), 'openssl', 'setuptools', 'six', 'cffi', 'idna', 'asn1crypto']
+
     call_hostpython_via_targetpython = False
 
     def get_recipe_env(self, arch):
@@ -17,6 +27,7 @@ def get_recipe_env(self, arch):
         env['LDFLAGS'] += ' -L' + openssl_dir + \
                           ' -lssl' + r.version + \
                           ' -lcrypto' + r.version
+        env['CFLAGS'] += ' -I{}/include'.format(openssl_dir)
         return env
 
 

diff --git a/pythonforandroid/recipes/enum34/__init__.py b/pythonforandroid/recipes/enum34/__init__.py
@@ -2,7 +2,7 @@
 
 
 class Enum34Recipe(PythonRecipe):
-    version = '1.1.3'
+    version = '1.1.6'
     url = 'https://pypi.python.org/packages/source/e/enum34/enum34-{version}.tar.gz'
     depends = [('python2', 'python3crystax'), 'setuptools']
     site_packages_name = 'enum'

diff --git a/pythonforandroid/recipes/idna/__init__.py b/pythonforandroid/recipes/idna/__init__.py
@@ -3,7 +3,7 @@
 
 class IdnaRecipe(PythonRecipe):
     name = 'idna'
-    version = '2.6'
+    version = '2.7'
     url = 'https://github.com/kjd/idna/archive/v{version}.tar.gz'
 
     depends = [('python2', 'python3crystax'), 'setuptools']

diff --git a/pythonforandroid/recipes/ipaddress/__init__.py b/pythonforandroid/recipes/ipaddress/__init__.py
@@ -3,7 +3,7 @@
 
 class IpaddressRecipe(PythonRecipe):
     name = 'ipaddress'
-    version = '1.0.16'
+    version = '1.0.22'
     url = 'https://pypi.python.org/packages/source/i/ipaddress/ipaddress-{version}.tar.gz'
 
     depends = [('python2', 'python3crystax')]

diff --git a/pythonforandroid/recipes/openssl/__init__.py b/pythonforandroid/recipes/openssl/__init__.py
@@ -5,7 +5,7 @@
 
 
 class OpenSSLRecipe(Recipe):
-    version = '1.0.2h'
+    version = '1.0.2p'
     url = 'https://www.openssl.org/source/openssl-{version}.tar.gz'
 
     def should_build(self, arch):

diff --git a/pythonforandroid/recipes/pyasn1/__init__.py b/pythonforandroid/recipes/pyasn1/__init__.py
@@ -3,7 +3,7 @@
 
 
 class PyASN1Recipe(PythonRecipe):
-    version = '0.1.8'
+    version = '0.4.4'
     url = 'https://pypi.python.org/packages/source/p/pyasn1/pyasn1-{version}.tar.gz'
     depends = [('python2', 'python3crystax')]
 

diff --git a/pythonforandroid/recipes/pycparser/__init__.py b/pythonforandroid/recipes/pycparser/__init__.py
@@ -3,7 +3,7 @@
 
 class PycparserRecipe(PythonRecipe):
     name = 'pycparser'
-    version = '2.14'
+    version = '2.18'
     url = 'https://pypi.python.org/packages/source/p/pycparser/pycparser-{version}.tar.gz'
 
     depends = [('python2', 'python3crystax'), 'setuptools']

diff --git a/pythonforandroid/recipes/pyopenssl/__init__.py b/pythonforandroid/recipes/pyopenssl/__init__.py
@@ -3,7 +3,7 @@
 
 
 class PyOpenSSLRecipe(PythonRecipe):
-    version = '0.14'
+    version = '18.0.0'
     url = 'https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-{version}.tar.gz'
     depends = [('python2', 'python3crystax'), 'openssl', 'setuptools']
     site_packages_name = 'OpenSSL'

diff --git a/pythonforandroid/recipes/python2/__init__.py b/pythonforandroid/recipes/python2/__init__.py
@@ -30,6 +30,8 @@ class Python2Recipe(TargetPythonRecipe):
                'patches/fix-dlfcn.patch',
                'patches/parsetuple.patch',
                'patches/ctypes-find-library-updated.patch',
+               'patches/disable-ctermid.patch',
+               'patches/disable-getpwall.patch',
                ('patches/fix-configure-darwin.patch', is_darwin),
                ('patches/fix-distutils-darwin.patch', is_darwin),
                ('patches/fix-ftime-removal.patch', is_api_gt(19)),

diff --git a/pythonforandroid/recipes/python2/patches/disable-ctermid.patch b/pythonforandroid/recipes/python2/patches/disable-ctermid.patch
@@ -0,0 +1,22 @@
+--- Python-2.7.2.orig/Modules/posixmodule.c	2018-09-24 15:49:14.041368116 +0200
++++ Python-2.7.2/Modules/posixmodule.c	2018-09-24 16:15:02.537201532 +0200
+@@ -1615,17 +1615,8 @@
+ static PyObject *
+ posix_ctermid(PyObject *self, PyObject *noargs)
+ {
+-    char *ret;
+-    char buffer[L_ctermid];
+-
+-#ifdef USE_CTERMID_R
+-    ret = ctermid_r(buffer);
+-#else
+-    ret = ctermid(buffer);
+-#endif
+-    if (ret == NULL)
+-        return posix_error();
+-    return PyString_FromString(buffer);
++    PyErr_SetString(PyExc_NotImplementedError, "ctermid not implemented for this build");
++    return NULL;
+ }
+ #endif
+
diff --git a/pythonforandroid/recipes/python2/patches/disable-getpwall.patch b/pythonforandroid/recipes/python2/patches/disable-getpwall.patch
@@ -0,0 +1,32 @@
+--- Python-2.7.2.orig/Modules/pwdmodule.c	2018-09-24 15:49:14.053368267 +0200
++++ Python-2.7.2/Modules/pwdmodule.c	2018-09-24 16:28:09.083420986 +0200
+@@ -146,27 +146,8 @@
+ static PyObject *
+ pwd_getpwall(PyObject *self)
+ {
+-    PyObject *d;
+-    struct passwd *p;
+-    if ((d = PyList_New(0)) == NULL)
+-        return NULL;
+-#if defined(PYOS_OS2) && defined(PYCC_GCC)
+-    if ((p = getpwuid(0)) != NULL) {
+-#else
+-    setpwent();
+-    while ((p = getpwent()) != NULL) {
+-#endif
+-        PyObject *v = mkpwent(p);
+-        if (v == NULL || PyList_Append(d, v) != 0) {
+-            Py_XDECREF(v);
+-            Py_DECREF(d);
+-            endpwent();
+-            return NULL;
+-        }
+-        Py_DECREF(v);
+-    }
+-    endpwent();
+-    return d;
++    PyErr_SetString(PyExc_NotImplementedError, "getpwall not implemented for this build");
++    return NULL;
+ }
+ #endif
+
diff --git a/pythonforandroid/recipes/twisted/__init__.py b/pythonforandroid/recipes/twisted/__init__.py
@@ -5,6 +5,7 @@ class TwistedRecipe(CythonRecipe):
     version = '17.9.0'
     url = 'https://github.com/twisted/twisted/archive/twisted-{version}.tar.gz'
 
+    # in order to use TLS in twisted, you need to depend on service_identity
     depends = ['setuptools', 'zope_interface', 'incremental', 'constantly']
 
     call_hostpython_via_targetpython = False
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@

		# APP_ABI := armeabi armeabi-v7a x86
		APP_ABI := $(ARCH)
		APP_PLATFORM := android-19
Copy link Member inclement Sep 25, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. Setting this to a fixed value for everyone could possibly have some surprising consequences, and there is the problem that it probably also acts as a minimum supported api. It might be better to leave this change until a more robust implementation is complete. Alternatively, if targeting a very old api works (like 12) that could be okay, I'd still be wary of surprising consequences. Copy link Member Author rnixx Sep 25, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. I just taken this from your branch. Not yet in state where I tried to upload to playstore. Once it works with this changes, I'll try to upload an apk without this change. Copy link Member inclement Sep 25, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. I think you will need to do either this, or the create-dist-with-api-19-then-delete-and-rebuild-with-api-27 method suggested in the other thread. However, the problem is that hardcoding it to a single value will probably cause some problems itself - it didn't matter in my branch or for individual testing, but it's the kind of thing that causes issues when dispersed across the wide range of configurations people use. Copy link Member Author rnixx Sep 25, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. It would be great to get a working apk without hacks like delete-and-rebuild. Let's see what playstore tells me for an apk build like it's done now, and think about generalization afterwards Copy link Member Author rnixx Oct 1, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others. Learn more. this one still needs to be tested