Browse Source

Update zlib to 1.3.1

Signed-off-by: falkTX <falktx@falktx.com>
master
falkTX 18 hours ago
parent
commit
e9bc6cdc33
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 6 additions and 77 deletions
  1. +6
    -0
      sources/libs/zlib-static/debian/changelog
  2. +0
    -24
      sources/libs/zlib-static/debian/patches/01_05796d3d8d5546cf1b4dfe2cd72ab746afae505d.patch
  3. +0
    -51
      sources/libs/zlib-static/debian/patches/02_ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch
  4. +0
    -2
      sources/libs/zlib-static/debian/patches/series

+ 6
- 0
sources/libs/zlib-static/debian/changelog View File

@@ -1,3 +1,9 @@
zlib-static (6:1.3.1-1kxstudio1) focal; urgency=medium

* Update

-- falkTX <falktx@falktx.com> Sun, 08 Jun 2025 11:07:28 +0200

zlib-static (6:1.2.12-1kxstudio1) focal; urgency=medium zlib-static (6:1.2.12-1kxstudio1) focal; urgency=medium


* Initial package * Initial package


+ 0
- 24
sources/libs/zlib-static/debian/patches/01_05796d3d8d5546cf1b4dfe2cd72ab746afae505d.patch View File

@@ -1,24 +0,0 @@
From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
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

+ 0
- 51
sources/libs/zlib-static/debian/patches/02_ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch View File

@@ -1,51 +0,0 @@
From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
From: Mark Adler <madler@alumni.caltech.edu>
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);
}

+ 0
- 2
sources/libs/zlib-static/debian/patches/series View File

@@ -1,2 +0,0 @@
01_05796d3d8d5546cf1b4dfe2cd72ab746afae505d.patch
02_ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch

Loading…
Cancel
Save