Skip to content

Commit

Permalink
Merge pull request aria2#2165 from aria2/bump-zlib
Browse files Browse the repository at this point in the history
Bump zlib to 1.3.1
  • Loading branch information
tatsuhiro-t authored Jan 24, 2024
2 parents 4effc39 + bd29175 commit a8cb271
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.android
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ ENV LIBEXPAT_VERSION=2.5.0
ENV LIBEXPAT_ARCHIVE=expat-$LIBEXPAT_VERSION.tar.bz2
ENV LIBEXPAT_URI=https://github.com/libexpat/libexpat/releases/download/R_2_5_0/$LIBEXPAT_ARCHIVE

ENV ZLIB_VERSION=1.3
ENV ZLIB_VERSION=1.3.1
ENV ZLIB_ARCHIVE=zlib-$ZLIB_VERSION.tar.gz
ENV ZLIB_URI=https://zlib.net/$ZLIB_ARCHIVE
ENV ZLIB_URI=https://github.com/madler/zlib/releases/download/v1.3.1/$ZLIB_ARCHIVE

ENV CARES_VERSION=1.21.0
ENV CARES_ARCHIVE=c-ares-$CARES_VERSION.tar.gz
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN apt-get update && \
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://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.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

Expand Down Expand Up @@ -68,8 +68,8 @@ RUN tar xf sqlite-autoconf-3430100.tar.gz && \
--build=`dpkg-architecture -qDEB_BUILD_GNU_TYPE` && \
make -j$(nproc) install

RUN tar xf zlib-1.3.tar.gz && \
cd zlib-1.3 && \
RUN tar xf zlib-1.3.1.tar.gz && \
cd zlib-1.3.1 && \
CC=$HOST-gcc \
AR=$HOST-ar \
LD=$HOST-ld \
Expand Down
2 changes: 1 addition & 1 deletion README.android
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ The following libraries were statically linked.

* openssl 1.1.1k
* expat 2.4.1
* zlib 1.2.11
* zlib 1.3.1
* c-ares 1.17.2
* libssh2 1.9.0

Expand Down
2 changes: 1 addition & 1 deletion README.mingw
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ necessary. The linked libraries are:
* gmp 6.3.0
* expat 2.5.0
* sqlite 3.43.1
* zlib 1.3
* zlib 1.3.1
* c-ares 1.19.1
* libssh2 1.11.0

Expand Down

0 comments on commit a8cb271

Please sign in to comment.