From dbd1d8c1f815ce2ea98eea34d3b95e3277f966e3 Mon Sep 17 00:00:00 2001
From: Rafael Kitover <rkitover@gmail.com>
Date: Fri, 8 Mar 2019 16:56:46 -0800
Subject: [PATCH] attempt to re-enable travis mingw slaves

The mxe pkg server seems to be back online with some changes, and an
invalid SSL certificate.

Also thanks to @denisfa's work on 7373da15 we can re-enable the `--help`
check on travis.

Let's see if this works.

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
---
 .travis.yml | 60 ++++++++++++++++++++++++++---------------------------
 installdeps | 15 ++++++++++++--
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a55a356f..7df77f27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,38 +15,38 @@ matrix:
               - cd build
               - cmake ..
               - make -j2
-#              - ./visualboyadvance-m --help
+              - ./visualboyadvance-m --help
+          cache:
+              directories:
+                  - "$HOME/.ccache"
+        - env: BUILD_ENV=mingw-w64
+          language: cpp
+          os: linux
+          dist: trusty
+          before_script:
+              - ./installdeps MinGW-w64-x86_64
+          script:
+              - mkdir build
+              - cd build
+              - /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake ..
+              - make -j2
+          cache:
+              directories:
+                  - "$HOME/.ccache"
+        - env: BUILD_ENV=mingw-w32
+          language: cpp
+          os: linux
+          dist: trusty
+          before_script:
+              - ./installdeps MinGW-w64-i686
+          script:
+              - mkdir build
+              - cd build
+              - /usr/lib/mxe/usr/bin/i686-w64-mingw32.static-cmake ..
+              - make -j2
           cache:
               directories:
                   - "$HOME/.ccache"
-#        - env: BUILD_ENV=mingw-w64
-#          language: cpp
-#          os: linux
-#          dist: trusty
-#          before_script:
-#              - ./installdeps MinGW-w64-x86_64
-#          script:
-#              - mkdir build
-#              - cd build
-#              - /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake ..
-#              - make -j2
-#          cache:
-#              directories:
-#                  - "$HOME/.ccache"
-#        - env: BUILD_ENV=mingw-w32
-#          language: cpp
-#          os: linux
-#          dist: trusty
-#          before_script:
-#              - ./installdeps MinGW-w64-i686
-#          script:
-#              - mkdir build
-#              - cd build
-#              - /usr/lib/mxe/usr/bin/i686-w64-mingw32.static-cmake ..
-#              - make -j2
-#          cache:
-#              directories:
-#                  - "$HOME/.ccache"
         - env: BUILD_ENV=libretro
           language: cpp
           os: linux
@@ -70,7 +70,7 @@ matrix:
               - cd build
               - cmake ..
               - make -j2
-#              - ./visualboyadvance-m.app/Contents/MacOS/visualboyadvance-m --help
+              - ./visualboyadvance-m.app/Contents/MacOS/visualboyadvance-m --help
           cache:
               directories:
                   - "$HOME/.ccache"
diff --git a/installdeps b/installdeps
index 68ca78b5..7d659d40 100755
--- a/installdeps
+++ b/installdeps
@@ -302,12 +302,23 @@ debian_installdeps() {
                 ;;
         esac
 
-        mxe_apt_sources='/etc/apt/sources.list.d/mxeapt.list'
+        debian_rel=stretch
+
+        apt_ssl_exceptions=/etc/apt/apt.conf.d/80ssl-exceptions
+
+        if ! grep -q 'pkg\.mxe\.cc' $apt_ssl_exceptions; then
+            sudo sh -c "cat >> $apt_ssl_exceptions" <<EOF
+Acquire::https::${debian_rel}.mxe.cc::Verify-Peer "false";
+Acquire::https::${debian_rel}.mxe.cc::Verify-Host "false";
+EOF
+        fi
+
+        mxe_apt_sources=/etc/apt/sources.list.d/mxeapt.list
 
         sudo apt-get -qq update
         if [ -z "$(apt-cache search '^mxe-source$')" ]; then
             if [ ! -f "$mxe_apt_sources" ]; then
-                echo "deb http://pkg.mxe.cc/repos/apt/debian wheezy main" | sudo -- sh -c "cat > $mxe_apt_sources"
+                echo "deb http://pkg.mxe.cc/repos/apt/dists $debian_rel main" | sudo -- sh -c "cat > $mxe_apt_sources"
                 check sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB
             else
                 error "$mxe_apt_sources exists but mxe packages are not found in apt, either delete it or fix it"