Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #4581 - Update android openssl version due to security advisory https://www.openssl.org/news/secadv_20150108.txt (from glennw:openssl-update); r=larsbergstrom

Browse Source 
Source-Repo: https://github.com/servo/servo
Source-Revision: 78798026ac245187f92d7d3f88f7fe012c63ff9d
This commit is contained in:
Glenn Watson 2015-01-08 17:15:50 -07:00
parent 5656809101
commit d1caa006bf
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servo/python/servo/build_commands.py
View File

@ -83,7 +83,7 @@ class MachCommands(CommandBase):
status = subprocess.call(
["make", "-j4", "-f", "openssl.makefile"],
env=self.build_env())
env['OPENSSL_PATH'] = path.join(self.android_support_dir(), "openssl-1.0.1j")
env['OPENSSL_PATH'] = path.join(self.android_support_dir(), "openssl-1.0.1k")
status = subprocess.call(
["cargo", "build"] + opts,

4
servo/support/android/.gitignore vendored
View File

@ -1,3 +1,3 @@
openssl-1.0.1j/
openssl-1.0.1j.tar.gz
openssl-1.0.1k/
openssl-1.0.1k.tar.gz

10
servo/support/android/openssl.makefile
View File

@ -3,11 +3,11 @@ all: openssl
# From http://wiki.openssl.org/index.php/Android
.PHONY: openssl
openssl: openssl-1.0.1j/libssl.so
openssl: openssl-1.0.1k/libssl.so
openssl-1.0.1j/libssl.so: openssl-1.0.1j/Configure
openssl-1.0.1k/libssl.so: openssl-1.0.1k/Configure
./openssl.sh ${ANDROID_NDK}
openssl-1.0.1j/Configure:
wget https://www.openssl.org/source/openssl-1.0.1j.tar.gz
tar -zxf openssl-1.0.1j.tar.gz
openssl-1.0.1k/Configure:
wget https://www.openssl.org/source/openssl-1.0.1k.tar.gz
tar -zxf openssl-1.0.1k.tar.gz

2
servo/support/android/openssl.sh
View File

@ -181,7 +181,7 @@ if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" != "0" ]; then
echo "ANDROID_DEV: $ANDROID_DEV"
fi
cd openssl-1.0.1j
cd openssl-1.0.1k
perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org
./config shared -no-ssl2 -no-ssl3 -no-comp -no-hw -no-engine --openssldir=/usr/local/ssl/$ANDROID_API
make depend