diff --git a/Dockerfile.mingw b/Dockerfile.mingw index 2c737e3b..5dbb3e9a 100644 --- a/Dockerfile.mingw +++ b/Dockerfile.mingw @@ -11,7 +11,7 @@ # $ sudo docker cp $id:/aria2/src/aria2c.exe # $ sudo docker rm -v $id -FROM ubuntu:20.04 +FROM ubuntu:22.04 MAINTAINER Tatsuhiro Tsujikawa @@ -30,16 +30,15 @@ RUN apt-get update && \ pkg-config git curl dpkg-dev gcc-mingw-w64 g++-mingw-w64 \ autopoint libcppunit-dev libxml2-dev libgcrypt20-dev lzip -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.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 curl -L -O https://gmplib.org/download/gmp/gmp-6.3.0.tar.xz && \ + curl -L -O https://github.com/libexpat/libexpat/releases/download/R_2_5_0/expat-2.5.0.tar.bz2 && \ + curl -L -O https://www.sqlite.org/2023/sqlite-autoconf-3430100.tar.gz && \ + curl -L -O https://www.zlib.net/zlib-1.3.tar.gz && \ + curl -L -O https://c-ares.org/download/c-ares-1.19.1.tar.gz && \ + curl -L -O https://libssh2.org/download/libssh2-1.11.0.tar.bz2 -RUN tar xf gmp-6.2.1.tar.lz && \ - cd gmp-6.2.1 && \ +RUN tar xf gmp-6.3.0.tar.xz && \ + cd gmp-6.3.0 && \ ./configure \ --disable-shared \ --enable-static \ @@ -50,8 +49,8 @@ RUN tar xf gmp-6.2.1.tar.lz && \ CFLAGS="-mtune=generic -O2 -g0" && \ make install -RUN tar xf expat-2.4.1.tar.bz2 && \ - cd expat-2.4.1 && \ +RUN tar xf expat-2.5.0.tar.bz2 && \ + cd expat-2.5.0 && \ ./configure \ --disable-shared \ --enable-static \ @@ -60,8 +59,8 @@ RUN tar xf expat-2.4.1.tar.bz2 && \ --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` && \ make install -RUN tar xf sqlite-autoconf-3360000.tar.gz && \ - cd sqlite-autoconf-3360000 && \ +RUN tar xf sqlite-autoconf-3430100.tar.gz && \ + cd sqlite-autoconf-3430100 && \ ./configure \ --disable-shared \ --enable-static \ @@ -70,8 +69,8 @@ RUN tar xf sqlite-autoconf-3360000.tar.gz && \ --build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` && \ make install -RUN tar xf zlib-1.2.11.tar.gz && \ - cd zlib-1.2.11 && \ +RUN tar xf zlib-1.3.tar.gz && \ + cd zlib-1.3 && \ CC=$HOST-gcc \ AR=$HOST-ar \ LD=$HOST-ld \ @@ -84,8 +83,8 @@ RUN tar xf zlib-1.2.11.tar.gz && \ --static && \ make install -RUN tar xf c-ares-1.17.2.tar.gz && \ - cd c-ares-1.17.2 && \ +RUN tar xf c-ares-1.19.1.tar.gz && \ + cd c-ares-1.19.1 && \ ./configure \ --disable-shared \ --enable-static \ @@ -96,9 +95,8 @@ RUN tar xf c-ares-1.17.2.tar.gz && \ LIBS="-lws2_32" && \ make install -RUN tar xf libssh2-1.9.0.tar.gz && \ - cd libssh2-1.9.0 && \ - patch -p1 < ../ba149e804ef653cc05ed9803dfc94519ce9328f7.patch && \ +RUN tar xf libssh2-1.11.0.tar.bz2 && \ + cd libssh2-1.11.0 && \ ./configure \ --disable-shared \ --enable-static \ diff --git a/README.mingw b/README.mingw index ceb4d516..df2fba2e 100644 --- a/README.mingw +++ b/README.mingw @@ -3,22 +3,17 @@ aria2 Windows build aria2 Windows build is provided in 2 flavors: 32bit version and 64bit version. The executable was compiled using mingw-w64 cross compiler on -Debian Linux. - -* gcc-mingw-w64 10.2.1-6+24.2 -* g++-mingw-w64 10.2.1-6+24.2 -* binutils-mingw-w64-i686 2.35.2-2+8.11+b3 -* binutils-mingw-w64-x86-64 2.35.2-2+8.11+b3 +Ubuntu Linux. The executable is statically linked, so no extra DLLs are necessary. The linked libraries are: -* gmp 6.2.1 -* expat 2.4.1 -* sqlite 3.36.0 -* zlib 1.2.11 -* c-ares 1.17.2 -* libssh2 1.9.0 (+ https://github.com/libssh2/libssh2/commit/ba149e804ef653cc05ed9803dfc94519ce9328f7.patch) +* gmp 6.3.0 +* expat 2.5.0 +* sqlite 3.43.1 +* zlib 1.3 +* c-ares 1.19.1 +* libssh2 1.11.0 This build has the following difference from the original release: