From 020859f8de8eef60f2488e3f1b3f09cf7d958764 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 15 Jul 2016 22:32:44 +0900
Subject: [PATCH] Update third-party libraries for binary releases

---
 Dockerfile.mingw | 14 ++++++--------
 README.android   |  2 +-
 README.mingw     |  4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Dockerfile.mingw b/Dockerfile.mingw
index 716edc9c..5c808209 100644
--- a/Dockerfile.mingw
+++ b/Dockerfile.mingw
@@ -28,17 +28,15 @@ RUN apt-get update && \
         pkg-config git curl dpkg-dev gcc-mingw-w64 \
         autopoint libcppunit-dev libxml2-dev libgcrypt11-dev lzip
 
-RUN curl -L -O https://gmplib.org/download/gmp/gmp-6.1.0.tar.lz && \
-    curl -L -o gmp-6.1.0.patch https://gmplib.org/repo/gmp-6.1/raw-rev/67d4ee9dead1 && \
-    curl -L -O http://downloads.sourceforge.net/project/expat/expat/2.1.1/expat-2.1.1.tar.gz && \
+RUN curl -L -O https://gmplib.org/download/gmp/gmp-6.1.1.tar.lz && \
+    curl -L -O http://downloads.sourceforge.net/project/expat/expat/2.2.0/expat-2.2.0.tar.bz2 && \
     curl -L -O https://www.sqlite.org/2016/sqlite-autoconf-3130000.tar.gz && \
     curl -L -O http://zlib.net/zlib-1.2.8.tar.xz && \
     curl -L -O http://c-ares.haxx.se/download/c-ares-1.11.0.tar.gz && \
     curl -L -O http://libssh2.org/download/libssh2-1.7.0.tar.gz
 
-RUN tar xf gmp-6.1.0.tar.lz && \
-    cd gmp-6.1.0 && \
-    patch -p1 < ../gmp-6.1.0.patch && \
+RUN tar xf gmp-6.1.1.tar.lz && \
+    cd gmp-6.1.1 && \
     ./configure \
         --disable-shared \
         --enable-static \
@@ -49,8 +47,8 @@ RUN tar xf gmp-6.1.0.tar.lz && \
         CFLAGS="-mtune=generic -O2 -g0" && \
     make install
 
-RUN tar xf expat-2.1.1.tar.gz && \
-    cd expat-2.1.1 && \
+RUN tar xf expat-2.2.0.tar.bz2 && \
+    cd expat-2.2.0 && \
     ./configure \
         --disable-shared \
         --enable-static \
diff --git a/README.android b/README.android
index e8610e0f..985a1bb9 100644
--- a/README.android
+++ b/README.android
@@ -43,7 +43,7 @@ aria2c executable was generated using android-ndk-r10d.
 The following libraries were statically linked.
 
 * openssl 1.0.2h
-* expat 2.1.1
+* expat 2.2.0
 * c-ares 1.11.0
 * libssh2 1.7.0
 
diff --git a/README.mingw b/README.mingw
index a1bd77a0..4550de4b 100644
--- a/README.mingw
+++ b/README.mingw
@@ -12,8 +12,8 @@ Debian Linux.
 The executable is statically linked, so no extra DLLs are
 necessary. The linked libraries are:
 
-* gmp 6.1.0
-* expat 2.1.1
+* gmp 6.1.1
+* expat 2.2.0
 * sqlite 3.13.0
 * zlib 1.2.8
 * c-ares 1.11.0