mirror of
git://slackware.nl/current.git
synced 2024-12-27 09:59:16 +01:00
Tue Aug 9 19:25:22 UTC 2022
patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txz: Rebuilt. This is a bugfix update. 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.
This commit is contained in:
Patrick J Volkerding
Eric Hameleers
parent
e8686ed7fd
commit
5dd1410e22
6 changed files with 103 additions and 27 deletions
|
|
@ -11,9 +11,24 @@
|
|||
<description>Tracking Slackware development in git.</description>
|
||||
<language>en-us</language>
|
||||
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
|
||||
<pubDate>Fri, 29 Jul 2022 19:59:03 GMT</pubDate>
|
||||
<lastBuildDate>Sat, 30 Jul 2022 11:30:19 GMT</lastBuildDate>
|
||||
<pubDate>Tue, 9 Aug 2022 19:25:22 GMT</pubDate>
|
||||
<lastBuildDate>Wed, 10 Aug 2022 11:30:15 GMT</lastBuildDate>
|
||||
<generator>maintain_current_git.sh v 1.17</generator>
|
||||
<item>
|
||||
<title>Tue, 9 Aug 2022 19:25:22 GMT</title>
|
||||
<pubDate>Tue, 9 Aug 2022 19:25:22 GMT</pubDate>
|
||||
<link>https://git.slackware.nl/current/tag/?h=20220809192522</link>
|
||||
<guid isPermaLink="false">20220809192522</guid>
|
||||
<description>
|
||||
<![CDATA[<pre>
|
||||
patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txz: Rebuilt.
|
||||
This is a bugfix update.
|
||||
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.
|
||||
</pre>]]>
|
||||
</description>
|
||||
</item>
|
||||
<item>
|
||||
<title>Fri, 29 Jul 2022 19:59:03 GMT</title>
|
||||
<pubDate>Fri, 29 Jul 2022 19:59:03 GMT</pubDate>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,10 @@
|
|||
Tue Aug 9 19:25:22 UTC 2022
|
||||
patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txz: Rebuilt.
|
||||
This is a bugfix update.
|
||||
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.
|
||||
+--------------------------+
|
||||
Fri Jul 29 19:59:03 UTC 2022
|
||||
patches/packages/gnutls-3.7.7-x86_64-1_slack15.0.txz: Upgraded.
|
||||
libgnutls: Fixed double free during verification of pkcs7 signatures.
|
||||
|
|
|
|||
49
FILELIST.TXT
49
FILELIST.TXT
|
|
@ -1,20 +1,20 @@
|
|||
Fri Jul 29 20:02:06 UTC 2022
|
||||
Tue Aug 9 19:30:43 UTC 2022
|
||||
|
||||
Here is the file list for this directory. If you are using a
|
||||
mirror site and find missing or extra files in the disk
|
||||
subdirectories, please have the archive administrator refresh
|
||||
the mirror.
|
||||
|
||||
drwxr-xr-x 12 root root 4096 2022-07-29 19:59 .
|
||||
drwxr-xr-x 12 root root 4096 2022-08-09 19:25 .
|
||||
-rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0
|
||||
-rw-r--r-- 1 root root 16609 2022-03-30 19:03 ./CHANGES_AND_HINTS.TXT
|
||||
-rw-r--r-- 1 root root 1146328 2022-07-28 23:52 ./CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2022-07-28 23:52 ./CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 1146904 2022-07-29 20:02 ./CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2022-07-29 20:02 ./CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
|
||||
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
|
||||
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
|
||||
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
|
||||
-rw-r--r-- 1 root root 1914547 2022-07-29 19:59 ./ChangeLog.txt
|
||||
-rw-r--r-- 1 root root 1914867 2022-08-09 19:25 ./ChangeLog.txt
|
||||
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
|
||||
drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT
|
||||
-rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi
|
||||
|
|
@ -25,7 +25,7 @@ drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT
|
|||
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
|
||||
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
|
||||
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
|
||||
-rw-r--r-- 1 root root 1496513 2022-07-28 23:51 ./FILELIST.TXT
|
||||
-rw-r--r-- 1 root root 1497279 2022-07-29 20:02 ./FILELIST.TXT
|
||||
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
|
||||
-rw-r--r-- 1 root root 864745 2022-02-02 08:25 ./PACKAGES.TXT
|
||||
-rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT
|
||||
|
|
@ -737,13 +737,13 @@ drwxr-xr-x 2 root root 4096 2008-05-07 05:21 ./pasture/source/php/pear
|
|||
-rwxr-xr-x 1 root root 9448 2018-05-16 22:38 ./pasture/source/php/php.SlackBuild
|
||||
-rw-r--r-- 1 root root 775 2017-07-07 19:25 ./pasture/source/php/php.ini-development.diff.gz
|
||||
-rw-r--r-- 1 root root 830 2005-12-09 05:18 ./pasture/source/php/slack-desc
|
||||
drwxr-xr-x 4 root root 4096 2022-07-29 20:02 ./patches
|
||||
-rw-r--r-- 1 root root 43404 2022-07-29 20:02 ./patches/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2022-07-29 20:02 ./patches/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 58214 2022-07-29 20:02 ./patches/FILE_LIST
|
||||
-rw-r--r-- 1 root root 11188566 2022-07-29 20:02 ./patches/MANIFEST.bz2
|
||||
-rw-r--r-- 1 root root 32757 2022-07-29 20:02 ./patches/PACKAGES.TXT
|
||||
drwxr-xr-x 3 root root 16384 2022-07-29 20:01 ./patches/packages
|
||||
drwxr-xr-x 4 root root 4096 2022-08-09 19:30 ./patches
|
||||
-rw-r--r-- 1 root root 43499 2022-08-09 19:30 ./patches/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2022-08-09 19:30 ./patches/CHECKSUMS.md5.asc
|
||||
-rw-r--r-- 1 root root 58326 2022-08-09 19:30 ./patches/FILE_LIST
|
||||
-rw-r--r-- 1 root root 11191977 2022-08-09 19:30 ./patches/MANIFEST.bz2
|
||||
-rw-r--r-- 1 root root 32757 2022-08-09 19:30 ./patches/PACKAGES.TXT
|
||||
drwxr-xr-x 3 root root 16384 2022-08-09 19:30 ./patches/packages
|
||||
-rw-r--r-- 1 root root 327 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txt
|
||||
-rw-r--r-- 1 root root 10716 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz
|
||||
-rw-r--r-- 1 root root 163 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz.asc
|
||||
|
|
@ -898,10 +898,10 @@ drwxr-xr-x 2 root root 4096 2022-05-09 21:37 ./patches/packages/linux-5.15
|
|||
-rw-r--r-- 1 root root 489 2022-04-14 21:04 ./patches/packages/xz-5.2.5-x86_64-4_slack15.0.txt
|
||||
-rw-r--r-- 1 root root 322660 2022-04-14 21:04 ./patches/packages/xz-5.2.5-x86_64-4_slack15.0.txz
|
||||
-rw-r--r-- 1 root root 163 2022-04-14 21:04 ./patches/packages/xz-5.2.5-x86_64-4_slack15.0.txz.asc
|
||||
-rw-r--r-- 1 root root 388 2022-03-28 19:09 ./patches/packages/zlib-1.2.12-x86_64-1_slack15.0.txt
|
||||
-rw-r--r-- 1 root root 105204 2022-03-28 19:09 ./patches/packages/zlib-1.2.12-x86_64-1_slack15.0.txz
|
||||
-rw-r--r-- 1 root root 163 2022-03-28 19:09 ./patches/packages/zlib-1.2.12-x86_64-1_slack15.0.txz.asc
|
||||
drwxr-xr-x 44 root root 4096 2022-07-29 19:16 ./patches/source
|
||||
-rw-r--r-- 1 root root 388 2022-08-09 17:48 ./patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txt
|
||||
-rw-r--r-- 1 root root 105196 2022-08-09 17:48 ./patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txz
|
||||
-rw-r--r-- 1 root root 163 2022-08-09 17:48 ./patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txz.asc
|
||||
drwxr-xr-x 44 root root 4096 2022-08-09 19:12 ./patches/source
|
||||
drwxr-xr-x 2 root root 4096 2022-01-16 05:07 ./patches/source/aaa_base
|
||||
-rw-r--r-- 1 root root 11041 2022-02-15 04:49 ./patches/source/aaa_base/_aaa_base.tar.gz
|
||||
-rwxr-xr-x 1 root root 3894 2022-02-15 05:07 ./patches/source/aaa_base/aaa_base.SlackBuild
|
||||
|
|
@ -1359,11 +1359,12 @@ drwxr-xr-x 2 root root 4096 2022-04-14 20:33 ./patches/source/xz
|
|||
-rwxr-xr-x 1 root root 5257 2022-04-14 20:38 ./patches/source/xz/xz.SlackBuild
|
||||
-rw-r--r-- 1 root root 3488 2022-04-07 16:59 ./patches/source/xz/xzgrep-ZDI-CAN-16587.patch
|
||||
-rw-r--r-- 1 root root 566 2022-04-07 16:59 ./patches/source/xz/xzgrep-ZDI-CAN-16587.patch.sig
|
||||
drwxr-xr-x 2 root root 4096 2022-03-28 19:00 ./patches/source/zlib
|
||||
drwxr-xr-x 2 root root 4096 2022-08-09 17:45 ./patches/source/zlib
|
||||
-rw-r--r-- 1 root root 1660 2022-08-09 16:54 ./patches/source/zlib/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch
|
||||
-rw-r--r-- 1 root root 840 2018-02-27 06:12 ./patches/source/zlib/slack-desc
|
||||
-rw-r--r-- 1 root root 1288864 2022-03-27 23:39 ./patches/source/zlib/zlib-1.2.12.tar.xz
|
||||
-rw-r--r-- 1 root root 235 2022-03-27 23:39 ./patches/source/zlib/zlib-1.2.12.tar.xz.asc
|
||||
-rwxr-xr-x 1 root root 4059 2022-03-28 19:08 ./patches/source/zlib/zlib.SlackBuild
|
||||
-rwxr-xr-x 1 root root 4148 2022-08-09 17:46 ./patches/source/zlib/zlib.SlackBuild
|
||||
drwxr-xr-x 17 root root 4096 2022-02-02 08:25 ./slackware64
|
||||
-rw-r--r-- 1 root root 337498 2022-02-02 08:25 ./slackware64/CHECKSUMS.md5
|
||||
-rw-r--r-- 1 root root 163 2022-02-02 08:25 ./slackware64/CHECKSUMS.md5.asc
|
||||
|
|
@ -2737,7 +2738,7 @@ drwxr-xr-x 2 root root 69632 2022-02-01 08:29 ./slackware64/kde
|
|||
-rw-r--r-- 1 root root 163 2022-01-04 21:35 ./slackware64/kde/kinfocenter-5.23.5-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 439 2022-01-08 22:41 ./slackware64/kde/kinit-5.90.0-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 128740 2022-01-08 22:41 ./slackware64/kde/kinit-5.90.0-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2022-01-08 22:41 ./slackware64/kde/kinit-5.90.0-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 163 2022-01-08 22:41 ./slackware64/kde/kinit-5.90.0-x86_64-1.txz.asc
|
||||
-rw-r--r-- 1 root root 523 2022-01-08 22:39 ./slackware64/kde/kio-5.90.0-x86_64-1.txt
|
||||
-rw-r--r-- 1 root root 4244248 2022-01-08 22:39 ./slackware64/kde/kio-5.90.0-x86_64-1.txz
|
||||
-rw-r--r-- 1 root root 163 2022-01-08 22:39 ./slackware64/kde/kio-5.90.0-x86_64-1.txz.asc
|
||||
|
|
@ -5492,8 +5493,8 @@ drwxr-xr-x 2 root root 65536 2022-02-01 04:47 ./slackware64/x
|
|||
-rw-r--r-- 1 root root 243088 2021-02-13 13:09 ./slackware64/x/pixman-0.40.0-x86_64-3.txz
|
||||
-rw-r--r-- 1 root root 163 2021-02-13 13:09 ./slackware64/x/pixman-0.40.0-x86_64-3.txz.asc
|
||||
-rw-r--r-- 1 root root 235 2021-11-03 00:43 ./slackware64/x/pyxdg-0.27-x86_64-6.txt
|
||||
-rw-r--r-- 1 root root 77612 2021-11-03 00:43 ./slackware64/x/pyxdg-0.27-x86_64-6.txz
|
||||
-rw-r--r-- 1 root root 163 2021-11-03 00:43 ./slackware64/x/pyxdg-0.27-x86_64-6.txz.asc
|
||||
-rw-r--r-- 1 root root 77612 2021-11-03 00:43 ./slackware64/x/pyxdg-0.27-x86_64-6.txz
|
||||
-rw-r--r-- 1 root root 163 2021-11-03 00:43 ./slackware64/x/pyxdg-0.27-x86_64-6.txz.asc
|
||||
-rw-r--r-- 1 root root 298 2021-02-13 13:11 ./slackware64/x/rendercheck-1.5-x86_64-4.txt
|
||||
-rw-r--r-- 1 root root 39908 2021-02-13 13:11 ./slackware64/x/rendercheck-1.5-x86_64-4.txz
|
||||
-rw-r--r-- 1 root root 163 2021-02-13 13:11 ./slackware64/x/rendercheck-1.5-x86_64-4.txz.asc
|
||||
|
|
@ -15107,8 +15108,8 @@ drwxr-xr-x 2 root root 4096 2020-02-23 17:53 ./source/x/x11/src/xcb
|
|||
-rw-r--r-- 1 root root 251100 2015-04-26 14:14 ./source/x/x11/src/xcb/xcb-util-errors-1.0.tar.xz
|
||||
-rw-r--r-- 1 root root 271064 2014-10-15 04:11 ./source/x/x11/src/xcb/xcb-util-image-0.4.0.tar.xz
|
||||
-rw-r--r-- 1 root root 241520 2014-10-01 10:05 ./source/x/x11/src/xcb/xcb-util-keysyms-0.4.0.tar.xz
|
||||
-rw-r--r-- 1 root root 243560 2014-06-13 02:53 ./source/x/x11/src/xcb/xcb-util-renderutil-0.3.9.tar.xz
|
||||
-rw-r--r-- 1 root root 266716 2014-02-19 11:40 ./source/x/x11/src/xcb/xcb-util-wm-0.4.1.tar.xz
|
||||
-rw-r--r-- 1 root root 243560 2014-06-13 02:53 ./source/x/x11/src/xcb/xcb-util-renderutil-0.3.9.tar.xz
|
||||
-rw-r--r-- 1 root root 266716 2014-02-19 11:40 ./source/x/x11/src/xcb/xcb-util-wm-0.4.1.tar.xz
|
||||
-rw-r--r-- 1 root root 232228 2012-03-23 22:46 ./source/x/x11/src/xcb/xpyb-1.3.1.tar.xz
|
||||
-rw-r--r-- 1 root root 47 2018-03-23 18:19 ./source/x/x11/src/xf86-input-wacom.url
|
||||
drwxr-xr-x 2 root root 4096 2021-12-16 18:46 ./source/x/x11/src/xserver
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
@ -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_slack15.0}
|
||||
BUILD=${BUILD:-2_slack15.0}
|
||||
|
||||
# Automatically determine the architecture we're building on:
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
|
@ -76,6 +76,8 @@ find . \
|
|||
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
|
||||
-exec chmod 644 {} \+
|
||||
|
||||
cat $CWD/ec3df00224d4b396e2ac6586ab5d25f673caa4c2.patch | patch -p1 --verbose || exit 1
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
./configure \
|
||||
--prefix=/usr \
|
||||
|
|
|
|||
Loading…
Reference in a new issue