zlib: Fix CRC32 https://github.com/madler/zlib/issues/613

PATCHLEVEL++
Apply 0002-fix-crc32.patch
2.12 breaks CRC32 for programs like java
See https://github.com/madler/zlib/issues/613

4 files changed, 62 insertions, 0 deletions

diff --git a/archive-libs/zlib/0002-fix-crc32.patch b/archive-libs/zlib/0002-fix-crc32.patch
new file mode 100644
index 0000000000..9546308cc0
--- /dev/null
+++ b/archive-libs/zlib/0002-fix-crc32.patch
@@ -0,0 +1,53 @@
+# 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 ef9c24278a..a86839333d 100755
--- a/archive-libs/zlib/DETAILS
+++ b/archive-libs/zlib/DETAILS
@@ -6,6 +6,7 @@
 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 d8f3c5e89c..d64f8e091a 100644
--- a/archive-libs/zlib/HISTORY
+++ b/archive-libs/zlib/HISTORY
@@ -1,3 +1,9 @@
+2022-06-13 Eric Sandall <sandalle@sourcemage.org>
+	* DETAILS: PATCHLEVEL++
+	* PRE_BUILD: Apply 0002-fix-crc32.patch
+	* 0002-fix-crc32.patch: 2.12 breaks CRC32 for programs like java
+	  See https://github.com/madler/zlib/issues/613
+
 2022-03-28 Pavel Vinogradov <public@sourcemage.org>
 	* DETAILS: version 1.2.12, SECURITY_PAATCH++, (CVE-2018-25032)
 	* BUILD: modified filtering of CFLAGS to catch all possible variants of -O
diff --git a/archive-libs/zlib/PRE_BUILD b/archive-libs/zlib/PRE_BUILD
index 3756c5f364..534bad3441 100755
--- a/archive-libs/zlib/PRE_BUILD
+++ b/archive-libs/zlib/PRE_BUILD
@@ -2,6 +2,8 @@ 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