From 715f9c6653644d8bec5b6231d437ddeb3f7ba12b Mon Sep 17 00:00:00 2001 From: Jan Andre Ikenmeyer Date: Wed, 15 May 2019 01:44:54 +0200 Subject: [PATCH 1/2] Taskcluster: Build and run with OpenSSL 1.1.0 --- etc/taskcluster/docker/build.dockerfile | 2 +- etc/taskcluster/docker/run.dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/taskcluster/docker/build.dockerfile b/etc/taskcluster/docker/build.dockerfile index e0c1c23e56e..bb8dc87a1ff 100644 --- a/etc/taskcluster/docker/build.dockerfile +++ b/etc/taskcluster/docker/build.dockerfile @@ -24,7 +24,7 @@ RUN \ libgstreamer-plugins-bad1.0-dev \ # # OpenSSL - libssl1.0-dev \ + libssl-dev \ # # blurz libdbus-1-dev \ diff --git a/etc/taskcluster/docker/run.dockerfile b/etc/taskcluster/docker/run.dockerfile index 67e048f8e49..6cd56e935a6 100644 --- a/etc/taskcluster/docker/run.dockerfile +++ b/etc/taskcluster/docker/run.dockerfile @@ -3,7 +3,7 @@ # Servo’s runtime dependencies RUN apt-get install -qy --no-install-recommends \ libgl1 \ - libssl1.0.0 \ + libssl1.1 \ libdbus-1-3 \ libgstreamer-plugins-bad1.0-0 \ gstreamer1.0-plugins-good From 19a1a5f44d4483197b7c9a95753bb3c2cd2b122a Mon Sep 17 00:00:00 2001 From: Jan Andre Ikenmeyer Date: Wed, 15 May 2019 09:27:14 +0200 Subject: [PATCH 2/2] Bootstrap: Use most recent version of OpenSSL --- README.md | 3 +-- python/servo/bootstrap.py | 14 +------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 2662b69f96d..d27b532e204 100644 --- a/README.md +++ b/README.md @@ -90,13 +90,12 @@ If this doesn't work, file a bug, and, run the commands below: sudo apt install git curl autoconf libx11-dev \ libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \ gperf g++ build-essential cmake virtualenv python-pip \ - libssl1.0-dev libbz2-dev liblzma-dev libosmesa6-dev libxmu6 libxmu-dev \ + libssl-dev libbz2-dev liblzma-dev libosmesa6-dev libxmu6 libxmu-dev \ libglu1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev \ libharfbuzz-dev ccache clang libunwind-dev \ libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev autoconf2.13 ``` -If you using a version prior to **Ubuntu 17.04**, **Linux Mint 19** or **Debian Sid**, replace `libssl1.0-dev` with `libssl-dev`. Additionally, you'll need a local copy of GStreamer with a version later than 12.0. You can place it in `support/linux/gstreamer/gstreamer`, or run `./mach bootstrap-gstreamer` to set it up. If you are using **Ubuntu 16.04** or **Linux Mint 18.*** run `export HARFBUZZ_SYS_NO_PKG_CONFIG=1` before building to avoid an error with harfbuzz. diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index 0b5da09501d..a38fb631eee 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -110,7 +110,7 @@ def linux(context, force=False): # Please keep these in sync with the packages in README.md pkgs_apt = ['git', 'curl', 'autoconf', 'libx11-dev', 'libfreetype6-dev', 'libgl1-mesa-dri', 'libglib2.0-dev', 'xorg-dev', 'gperf', 'g++', - 'build-essential', 'cmake', 'python-pip', + 'build-essential', 'cmake', 'python-pip', "libssl-dev", 'libbz2-dev', 'liblzma-dev', 'libosmesa6-dev', 'libxmu6', 'libxmu-dev', 'libglu1-mesa-dev', 'libgles2-mesa-dev', 'libegl1-mesa-dev', 'libdbus-1-dev', 'libharfbuzz-dev', @@ -124,13 +124,6 @@ def linux(context, force=False): 'ccache', 'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel', 'gstreamer1-plugins-base-devel', 'gstreamer1-plugins-bad-free-devel', 'autoconf213'] if context.distro == "Ubuntu": - if context.distro_version in ["17.04", "19.04"]: - pkgs_apt += ["libssl-dev"] - elif int(context.distro_version.split(".")[0]) < 17: - pkgs_apt += ["libssl-dev"] - else: - pkgs_apt += ["libssl1.0-dev"] - if context.distro_version == "14.04": pkgs_apt += ["python-virtualenv"] else: @@ -138,11 +131,6 @@ def linux(context, force=False): pkgs_apt += ['libgstreamer1.0-dev', 'libgstreamer-plugins-base1.0-dev', 'libgstreamer-plugins-bad1.0-dev'] - elif context.distro == "Debian" and context.distro_version == "Sid": - pkgs_apt += ["libssl-dev"] - else: - pkgs_apt += ["libssl1.0-dev"] - installed_something = install_linux_deps(context, pkgs_apt, pkgs_dnf, force) if not check_gstreamer_lib():