diff options
author | Pavel Vinogradov | 2022-10-14 18:46:34 -0400 |
---|---|---|
committer | Pavel Vinogradov | 2022-10-14 18:47:18 -0400 |
commit | c7ed90cf7ed6c55df0f81a28d54fb63d0db0895c (patch) | |
tree | 24129b22f418864e16d9960eb88eab8c2948be01 /archive-libs | |
parent | 880e89c83f0b3125ea7de41f6cb2383f40c059dc (diff) |
archive-libs/zlib: version 1.2.13
Diffstat (limited to 'archive-libs')
-rw-r--r-- | archive-libs/zlib/0002-fix-crc32.patch | 53 | ||||
-rwxr-xr-x | archive-libs/zlib/DETAILS | 5 | ||||
-rw-r--r-- | archive-libs/zlib/HISTORY | 4 | ||||
-rwxr-xr-x | archive-libs/zlib/PRE_BUILD | 2 |
4 files changed, 6 insertions, 58 deletions
diff --git a/archive-libs/zlib/0002-fix-crc32.patch b/archive-libs/zlib/0002-fix-crc32.patch deleted file mode 100644 index 9546308cc0..0000000000 --- a/archive-libs/zlib/0002-fix-crc32.patch +++ /dev/null @@ -1,53 +0,0 @@ -# From https://github.com/madler/zlib/commit/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch -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); - } - diff --git a/archive-libs/zlib/DETAILS b/archive-libs/zlib/DETAILS index a86839333d..f2b08e30ec 100755 --- a/archive-libs/zlib/DETAILS +++ b/archive-libs/zlib/DETAILS @@ -1,12 +1,11 @@ SPELL=zlib - VERSION=1.2.12 - SOURCE_HASH=sha512:cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14 + VERSION=1.2.13 + SOURCE_HASH=sha512:99f0e843f52290e6950cc328820c0f322a4d934a504f66c7caa76bd0cc17ece4bf0546424fc95135de85a2656fed5115abb835fd8d8a390d60ffaf946c8887ad SECURITY_PATCH=1 SOURCE=$SPELL-$VERSION.tar.gz SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" SOURCE_URL[0]=http://www.zlib.net/$SOURCE SOURCE_URL[1]=http://prdownloads.sourceforge.net/libpng/${SOURCE} - PATCHLEVEL=1 WEB_SITE=http://www.zlib.net/ ENTERED=20010922 LICENSE[0]=ZLIB diff --git a/archive-libs/zlib/HISTORY b/archive-libs/zlib/HISTORY index d64f8e091a..59a6b6fc44 100644 --- a/archive-libs/zlib/HISTORY +++ b/archive-libs/zlib/HISTORY @@ -1,3 +1,7 @@ +2022-10-14 Pavel Vinogradov <public@sourcemage.org> + * DETAILS: version 1.2.13 + * PRE_BUILD, 0002-fix-crc32.patch: dropped, merged in upstream + 2022-06-13 Eric Sandall <sandalle@sourcemage.org> * DETAILS: PATCHLEVEL++ * PRE_BUILD: Apply 0002-fix-crc32.patch diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD index 534bad3441..3756c5f364 100755 --- a/archive-libs/zlib/PRE_BUILD +++ b/archive-libs/zlib/PRE_BUILD @@ -2,8 +2,6 @@ default_pre_build && cd "$SOURCE_DIRECTORY" && patch -p1 < "$SPELL_DIRECTORY/0001-fix-zlib.pc-install-path.patch" && -message "${MESSAGE_COLOR}Fix CRC32 'bug'...${DEFAULT_COLOR}" && -patch -p1 < "${SPELL_DIRECTORY}"/0002-fix-crc32.patch && mk_source_dir "$SOURCE_DIRECTORY.static" && cp -a $SOURCE_DIRECTORY/* $SOURCE_DIRECTORY.static |