fix android 4.3

madeye · madeye · commit 497dc4459e43 · 2013-07-30T08:32:15.000+08:00
diff --git a/distribute.sh b/distribute.sh
@@ -159,7 +159,7 @@ function push_arm() {
 		#if [ "X${ANDROIDNDKVER:0:2}" == "Xr7" ] || [ "X$ANDROIDNDKVER" == "Xr8" ]; then
 		# assume this toolchain is the same for all the next ndk... until a new one is out.
 		export TOOLCHAIN_PREFIX=arm-linux-androideabi
-		export TOOLCHAIN_VERSION=4.4.3
+		export TOOLCHAIN_VERSION=4.6
 	fi
 
 	export PATH="$ANDROIDNDK/toolchains/$TOOLCHAIN_PREFIX-$TOOLCHAIN_VERSION/prebuilt/$PYPLATFORM-x86/bin/:$ANDROIDNDK:$ANDROIDSDK/tools:$PATH"
@@ -472,7 +472,7 @@ function run_get_packages() {
 		# download if needed
 		if [ $do_download -eq 1 ]; then
 			info "Downloading $url"
-			try $WGET $filename $url
+			try $WGET $filename $url --no-check-certificate
 		else
 			debug "Module $module already downloaded"
 		fi
diff --git a/recipes/pyopenssl/fix-dlfcn.patch b/recipes/pyopenssl/fix-dlfcn.patch
@@ -0,0 +1,22 @@
+--- pyOpenSSL-0.13.orig/OpenSSL/__init__.py	2011-09-02 17:46:13.000000000 +0200
++++ pyOpenSSL-0.13/OpenSSL/__init__.py	2013-07-29 17:20:15.750079894 +0200
+@@ -12,6 +12,11 @@
+ except AttributeError:
+     from OpenSSL import crypto
+ else:
++    # XXX android fix
++    # linux: RTLD_NOW (0x2) | RTLD_GLOBAL (0x100 / 256)
++    # android: RTLD_NOW (0x0) | RTLD_GLOBAL (0x2)
++    flags = 0x2
++    '''
+     try:
+         import DLFCN
+     except ImportError:
+@@ -31,6 +36,7 @@
+     else:
+         flags = DLFCN.RTLD_NOW | DLFCN.RTLD_GLOBAL
+         del DLFCN
++    '''
+ 
+     sys.setdlopenflags(flags)
+     from OpenSSL import crypto
diff --git a/recipes/pyopenssl/recipe.sh b/recipes/pyopenssl/recipe.sh
@@ -3,12 +3,18 @@
 VERSION_pyopenssl=0.13
 URL_pyopenssl=http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-$VERSION_pyopenssl.tar.gz
 DEPS_pyopenssl=(openssl hostpython python)
-MD5_pyopenssl= 767bca18a71178ca353dff9e10941929
+MD5_pyopenssl=767bca18a71178ca353dff9e10941929
 BUILD_pyopenssl=$BUILD_PATH/pyopenssl/$(get_directory $URL_pyopenssl)
 RECIPE_pyopenssl=$RECIPES_PATH/pyopenssl
 
 function prebuild_pyopenssl() {
-	true
+    cd $BUILD_pyopenssl
+    if [ -f .patched ]; then
+        return
+    fi
+
+    try patch -p1 < $RECIPE_pyopenssl/fix-dlfcn.patch
+    touch .patched
 }
 
 function build_pyopenssl() {
