From: classabbyamp <classabbyamp@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] zlib: update to 1.2.13.
Date: Fri, 14 Oct 2022 06:42:57 +0200 [thread overview]
Message-ID: <20221014044257.giJ3eCcpLYgo9MduGlsjtqrzg77eUgjrn4HsODEfqUg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39943@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages update/zlib-1.2.13
https://github.com/void-linux/void-packages/pull/39943
zlib: update to 1.2.13.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
A patch file from https://github.com/void-linux/void-packages/pull/39943.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update/zlib-1.2.13-39943.patch --]
[-- Type: text/x-diff, Size: 8791 bytes --]
From b61281b314396ffecf893b4c3c64d7e56b652dae Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Thu, 13 Oct 2022 23:46:58 -0400
Subject: [PATCH] zlib: update to 1.2.13.
---
srcpkgs/zlib/patches/1-CVE-2022-37434.patch | 32 ------------
srcpkgs/zlib/patches/2-CVE-2022-37434.patch | 29 -----------
srcpkgs/zlib/patches/cc.patch | 24 ---------
srcpkgs/zlib/patches/crc32.patch | 51 -------------------
.../zlib/patches/makefile_ranlib_syntax.patch | 4 +-
srcpkgs/zlib/template | 11 ++--
6 files changed, 8 insertions(+), 143 deletions(-)
delete mode 100644 srcpkgs/zlib/patches/1-CVE-2022-37434.patch
delete mode 100644 srcpkgs/zlib/patches/2-CVE-2022-37434.patch
delete mode 100644 srcpkgs/zlib/patches/cc.patch
delete mode 100644 srcpkgs/zlib/patches/crc32.patch
diff --git a/srcpkgs/zlib/patches/1-CVE-2022-37434.patch b/srcpkgs/zlib/patches/1-CVE-2022-37434.patch
deleted file mode 100644
index dc84d3a1d385..000000000000
--- a/srcpkgs/zlib/patches/1-CVE-2022-37434.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001
-From: Mark Adler <fork@madler.net>
-Date: Sat, 30 Jul 2022 15:51:11 -0700
-Subject: [PATCH] Fix a bug when getting a gzip header extra field with
- inflate().
-
-If the extra field was larger than the space the user provided with
-inflateGetHeader(), and if multiple calls of inflate() delivered
-the extra header data, then there could be a buffer overflow of the
-provided space. This commit assures that provided space is not
-exceeded.
----
- inflate.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/inflate.c b/inflate.c
-index 7be8c6366..7a7289749 100644
---- a/inflate.c
-+++ b/inflate.c
-@@ -763,9 +763,10 @@ int flush;
- copy = state->length;
- if (copy > have) copy = have;
- if (copy) {
-+ len = state->head->extra_len - state->length;
- if (state->head != Z_NULL &&
-- state->head->extra != Z_NULL) {
-- len = state->head->extra_len - state->length;
-+ state->head->extra != Z_NULL &&
-+ len < state->head->extra_max) {
- zmemcpy(state->head->extra + len, next,
- len + copy > state->head->extra_max ?
- state->head->extra_max - len : copy);
diff --git a/srcpkgs/zlib/patches/2-CVE-2022-37434.patch b/srcpkgs/zlib/patches/2-CVE-2022-37434.patch
deleted file mode 100644
index c5c95a92b28a..000000000000
--- a/srcpkgs/zlib/patches/2-CVE-2022-37434.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
-From: Mark Adler <fork@madler.net>
-Date: Mon, 8 Aug 2022 10:50:09 -0700
-Subject: [PATCH] Fix extra field processing bug that dereferences NULL
- state->head.
-
-The recent commit to fix a gzip header extra field processing bug
-introduced the new bug fixed here.
----
- inflate.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/inflate.c b/inflate.c
-index 7a7289749..2a3c4fe98 100644
---- a/inflate.c
-+++ b/inflate.c
-@@ -763,10 +763,10 @@ int flush;
- copy = state->length;
- if (copy > have) copy = have;
- if (copy) {
-- len = state->head->extra_len - state->length;
- if (state->head != Z_NULL &&
- state->head->extra != Z_NULL &&
-- len < state->head->extra_max) {
-+ (len = state->head->extra_len - state->length) <
-+ state->head->extra_max) {
- zmemcpy(state->head->extra + len, next,
- len + copy > state->head->extra_max ?
- state->head->extra_max - len : copy);
diff --git a/srcpkgs/zlib/patches/cc.patch b/srcpkgs/zlib/patches/cc.patch
deleted file mode 100644
index 0136071eabe7..000000000000
--- a/srcpkgs/zlib/patches/cc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 05796d3d8d5546cf1b4dfe2cd72ab746afae505d Mon Sep 17 00:00:00 2001
-From: Mark Adler <madler@alumni.caltech.edu>
-Date: Mon, 28 Mar 2022 18:34:10 -0700
-Subject: [PATCH] Fix configure issue that discarded provided CC definition.
-
----
- configure | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/configure b/configure
-index 52ff4a04e..3fa3e8618 100755
---- a/configure
-+++ b/configure
-@@ -174,7 +174,10 @@ if test -z "$CC"; then
- else
- cc=${CROSS_PREFIX}cc
- fi
-+else
-+ cc=${CC}
- fi
-+
- cflags=${CFLAGS-"-O3"}
- # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
- case "$cc" in
diff --git a/srcpkgs/zlib/patches/crc32.patch b/srcpkgs/zlib/patches/crc32.patch
deleted file mode 100644
index 85a6a7e3ab41..000000000000
--- a/srcpkgs/zlib/patches/crc32.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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/srcpkgs/zlib/patches/makefile_ranlib_syntax.patch b/srcpkgs/zlib/patches/makefile_ranlib_syntax.patch
index a6e7ace0aa51..8a3d3f32de38 100644
--- a/srcpkgs/zlib/patches/makefile_ranlib_syntax.patch
+++ b/srcpkgs/zlib/patches/makefile_ranlib_syntax.patch
@@ -1,6 +1,6 @@
--- a/Makefile.in 2012-01-28 23:48:50.000000000 +0100
+++ b/Makefile.in 2012-02-01 00:28:04.898440495 +0100
-@@ -190,7 +190,7 @@ install-libs: $(LIBS)
+@@ -307,7 +307,7 @@ install-libs: $(LIBS)
-@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
cp $(STATICLIB) $(DESTDIR)$(libdir)
chmod 644 $(DESTDIR)$(libdir)/$(STATICLIB)
@@ -9,7 +9,7 @@
-@if test -n "$(SHAREDLIBV)"; then \
cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir); \
echo "cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)"; \
-@@ -199,7 +199,6 @@ install-libs: $(LIBS)
+@@ -318,7 +318,6 @@ install-libs: $(LIBS)
rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template
index 17cf7ccaf9f4..58050ddeb26d 100644
--- a/srcpkgs/zlib/template
+++ b/srcpkgs/zlib/template
@@ -1,16 +1,17 @@
# Template file for 'zlib'
pkgname=zlib
-version=1.2.12
-revision=4
+version=1.2.13
+revision=1
bootstrap=yes
build_style=configure
configure_args="--prefix=/usr --shared"
short_desc="Compression/decompression Library"
maintainer="Orphaned <orphan@voidlinux.org>"
license="Zlib"
-homepage="http://www.zlib.net"
-distfiles="$homepage/$pkgname-$version.tar.gz"
-checksum=91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
+homepage="https://www.zlib.net"
+changelog="https://www.zlib.net/ChangeLog.txt"
+distfiles="https://www.zlib.net/fossils/zlib-$version.tar.gz"
+checksum=b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
zlib-devel_package() {
depends="zlib>=${version}_${revision}"
next prev parent reply other threads:[~2022-10-14 4:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-14 3:47 [PR PATCH] " classabbyamp
2022-10-14 3:49 ` [PR PATCH] [Updated] " classabbyamp
2022-10-14 4:05 ` classabbyamp
2022-10-14 4:41 ` [PR REVIEW] " sgn
2022-10-14 4:42 ` classabbyamp [this message]
2022-10-15 7:27 ` [PR PATCH] [Updated] " classabbyamp
2022-10-17 22:25 ` [PR PATCH] [Merged]: " leahneukirchen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221014044257.giJ3eCcpLYgo9MduGlsjtqrzg77eUgjrn4HsODEfqUg@z \
--to=classabbyamp@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).