From 4a174f6adc5bcd621b13ec709cfb2fd8672f0dca Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx@lissyx.dyndns.org>
Date: Sat, 2 May 2020 13:09:52 +0200
Subject: [PATCH] Remove libssl 1.0.2 hack

---
 taskcluster/.shared.yml    | 12 +++++------
 taskcluster/pyenv-build.sh |  6 +-----
 taskcluster/tc-all-vars.sh |  4 ----
 taskcluster/tc-py-utils.sh | 41 --------------------------------------
 4 files changed, 7 insertions(+), 56 deletions(-)

diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
index 93679741..8b4385ac 100644
--- a/taskcluster/.shared.yml
+++ b/taskcluster/.shared.yml
@@ -111,14 +111,14 @@ system:
     namespace: 'project.deepspeech.gradle.6'
   pyenv:
     linux:
-      url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.pyenv.linux.7/artifacts/public/pyenv.tar.gz'
-      namespace: 'project.deepspeech.pyenv.linux.7'
+      url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.pyenv.linux.8/artifacts/public/pyenv.tar.gz'
+      namespace: 'project.deepspeech.pyenv.linux.8'
     osx:
-      url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.pyenv.osx.7/artifacts/public/pyenv.tar.gz'
-      namespace: 'project.deepspeech.pyenv.osx.7'
+      url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.pyenv.osx.8/artifacts/public/pyenv.tar.gz'
+      namespace: 'project.deepspeech.pyenv.osx.8'
     win:
-      url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.pyenv.win.7/artifacts/public/pyenv.tar.gz'
-      namespace: 'project.deepspeech.pyenv.win.7'
+      url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.pyenv.win.8/artifacts/public/pyenv.tar.gz'
+      namespace: 'project.deepspeech.pyenv.win.8'
   swig:
     repo: "https://github.com/lissyx/swig"
     sha1: "b5fea54d39832d1d132d7dd921b69c0c2c9d5118"
diff --git a/taskcluster/pyenv-build.sh b/taskcluster/pyenv-build.sh
index b3faf8fb..54d11c7a 100755
--- a/taskcluster/pyenv-build.sh
+++ b/taskcluster/pyenv-build.sh
@@ -18,11 +18,7 @@ for pyver_conf in ${SUPPORTED_PYTHON_VERSIONS}; do
 
   pyalias="${pyver}_${pyconf}"
 
-  maybe_ssl102_py37 ${pyver}
-
-  LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH \
-      PYTHON_CONFIGURE_OPTS="--enable-unicode=${pyconf} ${PY37_OPENSSL}" \
-      pyenv_install ${pyver} ${pyalias}
+  PYTHON_CONFIGURE_OPTS="--enable-unicode=${pyconf}" pyenv_install ${pyver} ${pyalias}
 
   setup_pyenv_virtualenv "${pyalias}" "deepspeech"
 
diff --git a/taskcluster/tc-all-vars.sh b/taskcluster/tc-all-vars.sh
index 1a38e18b..2efc1dbc 100755
--- a/taskcluster/tc-all-vars.sh
+++ b/taskcluster/tc-all-vars.sh
@@ -42,10 +42,6 @@ if [ "${OS}" = "Darwin" ]; then
     fi;
 fi;
 
-PY37_OPENSSL_DIR="${PYENV_ROOT}/ssl-xenial"
-export PY37_LDPATH="${PY37_OPENSSL_DIR}/usr/lib/"
-export LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH
-
 export TASKCLUSTER_ARTIFACTS=${TASKCLUSTER_ARTIFACTS:-/tmp/artifacts}
 export TASKCLUSTER_TMP_DIR=${TASKCLUSTER_TMP_DIR:-/tmp}
 
diff --git a/taskcluster/tc-py-utils.sh b/taskcluster/tc-py-utils.sh
index 2beee417..36f80731 100755
--- a/taskcluster/tc-py-utils.sh
+++ b/taskcluster/tc-py-utils.sh
@@ -191,47 +191,6 @@ pyenv_install()
   fi
 }
 
-# Hack to extract Ubuntu's 16.04 libssl 1.0.2 packages and use them during the
-# local build of Python.
-#
-# Avoid (risky) upgrade of base system, allowing to keep one task build that
-# builds all the python packages
-maybe_ssl102_py37()
-{
-    pyver=$1
-
-    unset PY37_OPENSSL
-
-    ARCH=$(uname -m)
-    case "${pyver}" in
-        3.7*|3.8*)
-            if [ "${OS}" = "Linux" -a "${ARCH}" = "x86_64" ]; then
-                if [ -d "${PY37_OPENSSL_DIR}" ]; then
-                  rm -rf "${PY37_OPENSSL_DIR}"
-                fi
-
-                mkdir -p ${PY37_OPENSSL_DIR}
-                ${WGET} -P ${TASKCLUSTER_TMP_DIR} \
-                        http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl-dev_1.0.2g-1ubuntu4.16_amd64.deb \
-                        http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.0.0_1.0.2g-1ubuntu4.16_amd64.deb
-
-                for deb in ${TASKCLUSTER_TMP_DIR}/libssl*.deb; do
-                    dpkg -x ${deb} ${PY37_OPENSSL_DIR}
-                done;
-
-                # Python configure expects things to be under lib/
-                mv ${PY37_OPENSSL_DIR}/usr/include/x86_64-linux-gnu/openssl/opensslconf.h ${PY37_OPENSSL_DIR}/usr/include/openssl/
-                mv ${PY37_OPENSSL_DIR}/lib/x86_64-linux-gnu/lib* ${PY37_OPENSSL_DIR}/usr/lib/
-                mv ${PY37_OPENSSL_DIR}/usr/lib/x86_64-linux-gnu/* ${PY37_OPENSSL_DIR}/usr/lib/
-                ln -sfn libcrypto.so.1.0.0 ${PY37_OPENSSL_DIR}/usr/lib/libcrypto.so
-                ln -sfn libssl.so.1.0.0 ${PY37_OPENSSL_DIR}/usr/lib/libssl.so
-
-                export PY37_OPENSSL="--with-openssl=${PY37_OPENSSL_DIR}/usr"
-            fi;
-        ;;
-    esac
-}
-
 maybe_numpy_min_version()
 {
     local pyver=$1