use upstream fix for java regression; rel 3

diff --git a/java-regr-workaround.patch b/java-regr-workaround.patch
index d308a7598406f2f6424a495c1d1d9fe78cf49802..85a6a7e3ab41318d46ee66ee4d161de80dd0071a 100644 (file)
--- a/java-regr-workaround.patch
+++ b/java-regr-workaround.patch
@@ -1,25 +1,51 @@
+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 a1bdce5..748b7ba 100644
+index a1bdce5c2..451887bc7 100644
 --- a/crc32.c
 +++ b/crc32.c
-@@ -19,6 +19,7 @@
-   MAKECRCH can be #defined to write out crc32.h. A main() routine is also
-   produced, so that this one source file can be compiled to an executable.
-  */
-+#include <limits.h>
+@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
+ #endif /* DYNAMIC_CRC_TABLE */
  
- #ifdef MAKECRCH
- #  include <stdio.h>
-@@ -1065,7 +1066,12 @@ unsigned long ZEXPORT crc32(crc, buf, len)
-     const unsigned char FAR *buf;
-     uInt len;
- {
-+/* if sizeof(unsigned long) > 4 */
-+#if ULONG_MAX > 0xffffffffUL
-+    return crc32_z(crc & 0xffffffffUL, buf, len);
-+#else
-     return crc32_z(crc, buf, len);
-+#endif
+     /* 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/zlib.spec b/zlib.spec
index fbbcc2b35c77a43d55975e71b65f1f49bfbffa74..b634aba70846c0d5b8cb382061f48c1304bfa5fa 100644 (file)
--- a/zlib.spec
+++ b/zlib.spec
@@ -18,7 +18,7 @@ Summary(tr.UTF-8):    Sıkıştırma işlemleri için kitaplık
 Summary(uk.UTF-8):     Бібліотека для компресії та декомпресії
 Name:          zlib
 Version:       1.2.12
-Release:       2
+Release:       3
 License:       BSD
 Group:         Libraries
 Source0:       http://www.zlib.net/current/%{name}-%{version}.tar.gz