From a5f98c65b12d21d81311e9d572cccb765e44b93f Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 9 Aug 2022 19:25:22 +0000
Subject: Tue Aug  9 19:25:22 UTC 2022

a/mcelog-187-x86_64-1.txz:  Upgraded.
l/zlib-1.2.12-x86_64-2.txz:  Rebuilt.
  Applied an upstream patch to restore the handling of CRC inputs to be the
  same as in previous releases of zlib. This fixes an issue with OpenJDK.
  Thanks to alienBOB.
x/xf86-input-wacom-1.1.0-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-102.1.2-x86_64-1.txz:  Upgraded.
  This is a bugfix release.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/102.1.2/releasenotes/
---
 .../ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch | 51 ++++++++++++++++++++++
 source/l/zlib/zlib.SlackBuild                      |  4 +-
 source/x/mesa/mesa.SlackBuild                      |  2 +-
 source/x/x11/build/xf86-input-wacom                |  2 +-
 4 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 source/l/zlib/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch

(limited to 'source')

diff --git a/source/l/zlib/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch b/source/l/zlib/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch
new file mode 100644
index 00000000..85a6a7e3
--- /dev/null
+++ b/source/l/zlib/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch
@@ -0,0 +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 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/source/l/zlib/zlib.SlackBuild b/source/l/zlib/zlib.SlackBuild
index a7417d99..a3337583 100755
--- a/source/l/zlib/zlib.SlackBuild
+++ b/source/l/zlib/zlib.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=zlib
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -69,6 +69,8 @@ rm -rf zlib-$VERSION
 tar xvf $CWD/zlib-$VERSION.tar.xz || exit 1
 cd zlib-$VERSION || exit 1
 
+cat $CWD/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch | patch -p1 --verbose || exit 1
+
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild
index 9467854f..e6a98938 100755
--- a/source/x/mesa/mesa.SlackBuild
+++ b/source/x/mesa/mesa.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mesa
 VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-AMBERVERS=${DEMOVERS:-21.3.9}
+AMBERVERS=${AMBERVERS:-21.3.9}
 DEMOVERS=${DEMOVERS:-8.5.0}
 BUILD=${BUILD:-1}
 BUILD_AMBER=${BUILD_AMBER:-YES}
diff --git a/source/x/x11/build/xf86-input-wacom b/source/x/x11/build/xf86-input-wacom
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/xf86-input-wacom
+++ b/source/x/x11/build/xf86-input-wacom
@@ -1 +1 @@
-2
+1
-- 
cgit v1.2.3