From 9e4ee7fa03433553c91330fb09332a69ce765161 Mon Sep 17 00:00:00 2001 From: Leith Bade Date: Wed, 4 Feb 2015 16:26:09 +1100 Subject: [PATCH] Upgrade to openssl-1.0.2 --- .mason | 2 +- .travis.yml | 3 +++ configure | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.mason b/.mason index 3d9c0c829f1..03869fd11e4 160000 --- a/.mason +++ b/.mason @@ -1 +1 @@ -Subproject commit 3d9c0c829f19b3f133ea2fdbe0be8b2ba9ef465f +Subproject commit 03869fd11e4bc619d3ba7e4f8a1f00d4612c90ea diff --git a/.travis.yml b/.travis.yml index 9dccffe9e64..0503133000a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,9 @@ matrix: - os: linux env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=x86 TESTMUNK=no compiler: clang + - os: linux + env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=x86-64 TESTMUNK=no + compiler: clang - os: linux env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=mips TESTMUNK=no compiler: clang diff --git a/configure b/configure index 14982c21171..d84dbc73040 100755 --- a/configure +++ b/configure @@ -28,7 +28,7 @@ case ${MASON_PLATFORM} in SQLITE_VERSION=3.8.8.1 LIBPNG_VERSION=1.6.16 LIBJPEG_VERSION=v9a - OPENSSL_VERSION=1.0.1l + OPENSSL_VERSION=1.0.2 LIBCURL_VERSION=7.40.0 LIBUV_VERSION=0.11.29 ZLIB_VERSION=system