Explorar el Código

Merge pull request #2165 from aria2/bump-zlib

Bump zlib to 1.3.1
Tatsuhiro Tsujikawa hace 1 año
padre
commit
a8cb271b04
Se han modificado 4 ficheros con 7 adiciones y 7 borrados
  1. 2 2
      Dockerfile.android
  2. 3 3
      Dockerfile.mingw
  3. 1 1
      README.android
  4. 1 1
      README.mingw

+ 2 - 2
Dockerfile.android

@@ -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

+ 3 - 3
Dockerfile.mingw

@@ -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
 
@@ -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 \

+ 1 - 1
README.android

@@ -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
 

+ 1 - 1
README.mingw

@@ -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