let cryptography use versioned openssl libraries

wexi · wexi · commit f1893413bbeb · 2017-12-19T14:02:07.000-05:00
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonUtil.java b/pythonforandroid/bootstraps/sdl2/build/src/main/java/org/kivy/android/PythonUtil.java
@@ -21,7 +21,6 @@ protected static void addLibraryIfExists(ArrayList<String> libsList, String patt
         for (int i = 0; i < files.length; ++i) {
             File file = files[i];
             String name = file.getName();
-            Log.v(TAG, "Checking pattern " + pattern + " against " + name);
             if (p.matcher(name).matches()) {
                 Log.v(TAG, "Pattern " + pattern + " matched file " + name);
                 libsList.add(name.substring(3, name.length() - 3));
@@ -41,9 +40,9 @@ protected static ArrayList<String> getLibraries(File filesDir) {
         libsList.add("SDL2_image");
         libsList.add("SDL2_mixer");
         libsList.add("SDL2_ttf");
-        addLibraryIfExists(libsList, "ssl", libsDir);
-        addLibraryIfExists(libsList, "crypto", libsDir);
         addLibraryIfExists(libsList, "ffi", libsDir);
+        addLibraryIfExists(libsList, "ssl.*", libsDir);
+        addLibraryIfExists(libsList, "crypto.*", libsDir);
         libsList.add("python2.7");
         libsList.add("python3.5m");
         libsList.add("main");
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -553,17 +553,13 @@ def clean_build(self, arch=None):
         # doesn't persist in site-packages
         shutil.rmtree(self.ctx.python_installs_dir)
 
-    def install_libs(self, arch, *libs, **links):
+    def install_libs(self, arch, *libs):
         libs_dir = self.ctx.get_libs_dir(arch.arch)
-        if links:
-            for lib, link in links.iteritems():
-                shprint(sh.cp, lib, join(libs_dir, link))
-        else:
-            if not libs:
-                warning('install_libs called with no libraries to install!')
-                return
-            args = libs + (libs_dir,)
-            shprint(sh.cp, *args)
+        if not libs:
+            warning('install_libs called with no libraries to install!')
+            return
+        args = libs + (libs_dir,)
+        shprint(sh.cp, *args)
 
     def has_libs(self, arch, *libs):
         return all(map(lambda l: self.ctx.has_lib(arch.arch, l), libs))
diff --git a/pythonforandroid/recipes/cryptography/__init__.py b/pythonforandroid/recipes/cryptography/__init__.py
@@ -8,6 +8,7 @@ class CryptographyRecipe(CompiledComponentsPythonRecipe):
     depends = ['host_cffi', 'host_cython', 'host_setuptools', 'host_sh',
                'idna', 'asn1crypto', 'six', 'cffi',
                'enum34', 'ipaddress', 'openssl']
+    patches = ['version_openssl.patch']
 
     call_hostpython_via_targetpython = False
 
@@ -16,6 +17,7 @@ def get_recipe_env(self, arch):
         recipe = self.get_recipe('libffi', self.ctx)
         dirs = recipe.get_include_dirs(arch)
         recipe = self.get_recipe('openssl', self.ctx)
+        env['OPENSSL_VERSION'] = recipe.version
         dirs += recipe.get_include_dirs(arch)
         # Required: ln -s \
         # ~/Android/Sdk/ndk-bundle/sysroot/usr/include/arm-linux-androideabi/asm/unistd-common.h \
diff --git a/pythonforandroid/recipes/cryptography/version_openssl.patch b/pythonforandroid/recipes/cryptography/version_openssl.patch
@@ -0,0 +1,14 @@
+diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py
+index 7ec235ff..ba4f5c9d 100644
+--- a/src/_cffi_src/build_openssl.py
++++ b/src/_cffi_src/build_openssl.py
+@@ -33,7 +33,8 @@ def _get_openssl_libraries(platform):
+         # specified on the linker command-line is significant;
+         # libssl must come before libcrypto
+         # (http://marc.info/?l=openssl-users&m=135361825921871)
+-        return ["ssl", "crypto"]
++        version = os.environ.get("OPENSSL_VERSION", "")
++        return ["ssl" + version, "crypto" + version]
+ 
+ 
+ def _extra_compile_args(platform):
diff --git a/pythonforandroid/recipes/openssl/__init__.py b/pythonforandroid/recipes/openssl/__init__.py
@@ -62,8 +62,7 @@ def build_arch(self, arch):
                 shprint(sh.make, 'clean', _env=env)
             libn = 'libssl', 'libcrypto'
             libs = [lib + self.version + '.so' for lib in libn]
-            lnks = {lib + self.version + '.so': lib + '.so' for lib in libn}
-            self.install_libs(arch, *libs, **lnks)
+            self.install_libs(arch, *libs)
 
     def get_include_dirs(self, arch):
         return [join(self.get_build_dir(arch.arch), 'include')]
