Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 23:59:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update android openssl version due to security advisory https://www.openssl.org/news/secadv_20150108.txt

Browse source
This commit is contained in:
Glenn Watson 2015-01-09 07:40:17 +10:00
parent 7800d98728
commit 7818576213
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/build_commands.py
View file

@ -83,7 +83,7 @@ class MachCommands(CommandBase):
status = subprocess.call( status = subprocess.call(
["make", "-j4", "-f", "openssl.makefile"], ["make", "-j4", "-f", "openssl.makefile"],
env=self.build_env()) 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( status = subprocess.call(
["cargo", "build"] + opts, ["cargo", "build"] + opts,

4
support/android/.gitignore vendored
View file

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

10
support/android/openssl.makefile
View file

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

2
support/android/openssl.sh
View file

@ -181,7 +181,7 @@ if [ ! -z "$VERBOSE" ] && [ "$VERBOSE" != "0" ]; then
echo "ANDROID_DEV: $ANDROID_DEV" echo "ANDROID_DEV: $ANDROID_DEV"
fi 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 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 ./config shared -no-ssl2 -no-ssl3 -no-comp -no-hw -no-engine --openssldir=/usr/local/ssl/$ANDROID_API
make depend make depend