From 2352a888a19b0b4a8d666dc2a5732624b6e9a04e Mon Sep 17 00:00:00 2001
From: kennytm <kennytm@gmail.com>
Date: Fri, 22 Dec 2017 03:10:51 +0800
Subject: [PATCH 1/2] Revert "Temporarily use the old Travis image."

This reverts commit c0c26a649e7c970203f6d23ac5c9e017a42d9b0c.
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d0f1dbcfd3c9a..93c2834b7d873 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: shell
 sudo: required
 dist: trusty
-group: deprecated-2017Q4
 services:
   - docker
 

From 8d76e281bf3169e76a0f6db54a3a9b83e24a3b6f Mon Sep 17 00:00:00 2001
From: kennytm <kennytm@gmail.com>
Date: Fri, 22 Dec 2017 03:14:21 +0800
Subject: [PATCH 2/2] Enable IPv6 support in Dockers to workaround
 travis-ci/travis-ci#8891.

---
 .travis.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 93c2834b7d873..4458cd222f24e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -190,6 +190,13 @@ env:
 before_install:
   - zcat $HOME/docker/rust-ci.tar.gz | docker load || true
   - mkdir -p $HOME/rustsrc
+  # FIXME(#46924): these two commands are required to enable IPv6,
+  # they shouldn't exist, please revert once more official solutions appeared.
+  # see https://github.com/travis-ci/travis-ci/issues/8891#issuecomment-353403729
+  - if [ "$TRAVIS_OS_NAME" = linux ]; then
+      echo '{"ipv6":true,"fixed-cidr-v6":"fe80::/64"}' | sudo tee /etc/docker/daemon.json;
+      sudo service docker restart;
+    fi
 
 install:
   - case "$TRAVIS_OS_NAME" in