diff --git a/packages/zlib/build.sh b/packages/zlib/build.sh index 8848016c0..f6e078a7c 100644 --- a/packages/zlib/build.sh +++ b/packages/zlib/build.sh @@ -2,13 +2,19 @@ TERMUX_PKG_HOMEPAGE=https://www.zlib.net/ TERMUX_PKG_DESCRIPTION="Compression library implementing the deflate compression method found in gzip and PKZIP" TERMUX_PKG_LICENSE="ZLIB" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=1.2.11 -TERMUX_PKG_REVISION=5 +TERMUX_PKG_VERSION=1.2.12 TERMUX_PKG_SRCURL=https://www.zlib.net/zlib-$TERMUX_PKG_VERSION.tar.xz -TERMUX_PKG_SHA256=4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 +TERMUX_PKG_SHA256=7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 TERMUX_PKG_BREAKS="ndk-sysroot (<< 19b-3), zlib-dev" TERMUX_PKG_REPLACES="ndk-sysroot (<< 19b-3), zlib-dev" +termux_step_pre_configure() { + if [ "$TERMUX_ARCH" = "aarch64" ]; then + CFLAGS+=" -march=armv8-a+crc" + CXXFLAGS+=" -march=armv8-a+crc" + fi +} + termux_step_configure() { "$TERMUX_PKG_SRCDIR/configure" --prefix=$TERMUX_PREFIX sed -n '/Copyright (C) 1995-/,/madler@alumni.caltech.edu/p' "$TERMUX_PKG_SRCDIR/zlib.h" > "$TERMUX_PKG_SRCDIR/LICENSE" diff --git a/packages/zlib/zlib-1.2.12-correct-incorrect-CRC-inputs.patch b/packages/zlib/zlib-1.2.12-correct-incorrect-CRC-inputs.patch new file mode 100644 index 000000000..85a6a7e3a --- /dev/null +++ b/packages/zlib/zlib-1.2.12-correct-incorrect-CRC-inputs.patch @@ -0,0 +1,51 @@ +From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Wed, 30 Mar 2022 11:14:53 -0700 +Subject: [PATCH] Correct incorrect inputs provided to the CRC functions. + +The previous releases of zlib were not sensitive to incorrect CRC +inputs with bits set above the low 32. This commit restores that +behavior, so that applications with such bugs will continue to +operate as before. +--- + crc32.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/crc32.c b/crc32.c +index a1bdce5c2..451887bc7 100644 +--- a/crc32.c ++++ b/crc32.c +@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) + #endif /* DYNAMIC_CRC_TABLE */ + + /* Pre-condition the CRC */ +- crc ^= 0xffffffff; ++ crc = (~crc) & 0xffffffff; + + /* Compute the CRC up to a word boundary. */ + while (len && ((z_size_t)buf & 7) != 0) { +@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len) + #endif /* DYNAMIC_CRC_TABLE */ + + /* Pre-condition the CRC */ +- crc ^= 0xffffffff; ++ crc = (~crc) & 0xffffffff; + + #ifdef W + +@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2) + #ifdef DYNAMIC_CRC_TABLE + once(&made, make_crc_table); + #endif /* DYNAMIC_CRC_TABLE */ +- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2; ++ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff); + } + + /* ========================================================================= */ +@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op) + uLong crc2; + uLong op; + { +- return multmodp(op, crc1) ^ crc2; ++ return multmodp(op, crc1) ^ (crc2 & 0xffffffff); + } diff --git a/packages/zlib/zlib-1.2.12-fix-configure-CC-definition.patch b/packages/zlib/zlib-1.2.12-fix-configure-CC-definition.patch new file mode 100644 index 000000000..0136071ea --- /dev/null +++ b/packages/zlib/zlib-1.2.12-fix-configure-CC-definition.patch @@ -0,0 +1,24 @@ +From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001 +From: Mark Adler +Date: Mon, 28 Mar 2022 18:34:10 -0700 +Subject: [PATCH] Fix configure issue that discarded provided CC definition. + +--- + configure | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure b/configure +index 52ff4a04e..3fa3e8618 100755 +--- a/configure ++++ b/configure +@@ -174,7 +174,10 @@ if test -z "$CC"; then + else + cc=${CROSS_PREFIX}cc + fi ++else ++ cc=${CC} + fi ++ + cflags=${CFLAGS-"-O3"} + # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure + case "$cc" in