|
@@ -11,7 +11,7 @@
|
|
|
# $ sudo docker cp $id:/aria2/src/aria2c.exe <dest>
|
|
|
# $ sudo docker rm -v $id
|
|
|
|
|
|
-FROM ubuntu:19.04
|
|
|
+FROM ubuntu:20.04
|
|
|
|
|
|
MAINTAINER Tatsuhiro Tsujikawa
|
|
|
|
|
@@ -23,20 +23,23 @@ ENV HOST i686-w64-mingw32
|
|
|
# RUN sed -ie 's/archive\.ubuntu/jp.archive.ubuntu/g' /etc/apt/sources.list
|
|
|
|
|
|
RUN apt-get update && \
|
|
|
- apt-get install -y \
|
|
|
+ DEBIAN_FRONTEND="noninteractive" \
|
|
|
+ apt-get install -y --no-install-recommends \
|
|
|
make binutils autoconf automake autotools-dev libtool \
|
|
|
+ patch ca-certificates \
|
|
|
pkg-config git curl dpkg-dev gcc-mingw-w64 g++-mingw-w64 \
|
|
|
- autopoint libcppunit-dev libxml2-dev libgcrypt11-dev lzip
|
|
|
+ autopoint libcppunit-dev libxml2-dev libgcrypt20-dev lzip
|
|
|
|
|
|
-RUN curl -L -O https://gmplib.org/download/gmp/gmp-6.1.2.tar.lz && \
|
|
|
- curl -L -O https://github.com/libexpat/libexpat/releases/download/R_2_2_7/expat-2.2.7.tar.bz2 && \
|
|
|
- curl -L -O https://www.sqlite.org/2019/sqlite-autoconf-3290000.tar.gz && \
|
|
|
+RUN curl -L -O https://gmplib.org/download/gmp/gmp-6.2.1.tar.lz && \
|
|
|
+ curl -L -O https://github.com/libexpat/libexpat/releases/download/R_2_4_1/expat-2.4.1.tar.bz2 && \
|
|
|
+ curl -L -O https://www.sqlite.org/2021/sqlite-autoconf-3360000.tar.gz && \
|
|
|
curl -L -O http://zlib.net/zlib-1.2.11.tar.gz && \
|
|
|
- curl -L -O https://c-ares.haxx.se/download/c-ares-1.15.0.tar.gz && \
|
|
|
- curl -L -O https://www.libssh2.org/download/libssh2-1.9.0.tar.gz
|
|
|
+ curl -L -O https://c-ares.haxx.se/download/c-ares-1.17.2.tar.gz && \
|
|
|
+ curl -L -O https://www.libssh2.org/download/libssh2-1.9.0.tar.gz && \
|
|
|
+ curl -L -O https://github.com/libssh2/libssh2/commit/ba149e804ef653cc05ed9803dfc94519ce9328f7.patch
|
|
|
|
|
|
-RUN tar xf gmp-6.1.2.tar.lz && \
|
|
|
- cd gmp-6.1.2 && \
|
|
|
+RUN tar xf gmp-6.2.1.tar.lz && \
|
|
|
+ cd gmp-6.2.1 && \
|
|
|
./configure \
|
|
|
--disable-shared \
|
|
|
--enable-static \
|
|
@@ -47,8 +50,8 @@ RUN tar xf gmp-6.1.2.tar.lz && \
|
|
|
CFLAGS="-mtune=generic -O2 -g0" && \
|
|
|
make install
|
|
|
|
|
|
-RUN tar xf expat-2.2.7.tar.bz2 && \
|
|
|
- cd expat-2.2.7 && \
|
|
|
+RUN tar xf expat-2.4.1.tar.bz2 && \
|
|
|
+ cd expat-2.4.1 && \
|
|
|
./configure \
|
|
|
--disable-shared \
|
|
|
--enable-static \
|
|
@@ -57,8 +60,8 @@ RUN tar xf expat-2.2.7.tar.bz2 && \
|
|
|
--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` && \
|
|
|
make install
|
|
|
|
|
|
-RUN tar xf sqlite-autoconf-3290000.tar.gz && \
|
|
|
- cd sqlite-autoconf-3290000 && \
|
|
|
+RUN tar xf sqlite-autoconf-3360000.tar.gz && \
|
|
|
+ cd sqlite-autoconf-3360000 && \
|
|
|
./configure \
|
|
|
--disable-shared \
|
|
|
--enable-static \
|
|
@@ -81,8 +84,8 @@ RUN tar xf zlib-1.2.11.tar.gz && \
|
|
|
--static && \
|
|
|
make install
|
|
|
|
|
|
-RUN tar xf c-ares-1.15.0.tar.gz && \
|
|
|
- cd c-ares-1.15.0 && \
|
|
|
+RUN tar xf c-ares-1.17.2.tar.gz && \
|
|
|
+ cd c-ares-1.17.2 && \
|
|
|
./configure \
|
|
|
--disable-shared \
|
|
|
--enable-static \
|
|
@@ -95,6 +98,7 @@ RUN tar xf c-ares-1.15.0.tar.gz && \
|
|
|
|
|
|
RUN tar xf libssh2-1.9.0.tar.gz && \
|
|
|
cd libssh2-1.9.0 && \
|
|
|
+ patch -p1 < ../ba149e804ef653cc05ed9803dfc94519ce9328f7.patch && \
|
|
|
./configure \
|
|
|
--disable-shared \
|
|
|
--enable-static \
|