<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/02c3f262a3d0a97ef186e554cad0a249095a4039">https://github.com/macports/macports-ports/commit/02c3f262a3d0a97ef186e554cad0a249095a4039</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 02c3f262a3d zlib: update to 1.2.13
</span>02c3f262a3d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 02c3f262a3d0a97ef186e554cad0a249095a4039
</span>Author: aeiouaeiouaeiouaeiouaeiouaeiou <aeioudev@outlook.com>
AuthorDate: Tue Oct 18 13:05:21 2022 +0300
<span style='display:block; white-space:pre;color:#404040;'> zlib: update to 1.2.13
</span>---
archivers/zlib/Portfile | 14 +++----
archivers/zlib/files/patch-CVE-2022-37434.patch | 15 --------
archivers/zlib/files/patch-cc-logic.patch | 43 ---------------------
archivers/zlib/files/patch-crc-functions.patch | 51 -------------------------
4 files changed, 5 insertions(+), 118 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zlib/Portfile b/archivers/zlib/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f4ce1f51d5..fea3ae86bc3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/archivers/zlib/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup xcodeversion 1.0
name zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.2.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.2.13
</span> categories archivers
maintainers {ryandesign @ryandesign} openmaintainer
license zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,9 @@ if {${os.platform} eq "darwin" && ${os.major} < 11 && ${configure.cxx_stdlib} eq
</span> use_xz yes
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f8ab67a6b9f32f774440907309f2e4c3526e0b52 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1288864
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4805f7f51e5ff84ce3cb9699fedcc840893b5da1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1296496
</span>
minimum_xcodeversions {8 2.4.1 9 3.1}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,11 +48,7 @@ test.run yes
</span> destroot.destdir prefix=${destroot}${prefix}
if {${name} eq ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-cc-logic.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-crc-functions.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CVE-2022-37434.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
post-destroot {
platform darwin {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zlib/files/patch-CVE-2022-37434.patch b/archivers/zlib/files/patch-CVE-2022-37434.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5e448f85082..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zlib/files/patch-CVE-2022-37434.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/advisories/GHSA-cfmr-vrgj-vqwv
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- inflate.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ inflate.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -764,8 +764,9 @@ int flush;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (copy > have) copy = have;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (copy) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (state->head != Z_NULL &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- state->head->extra != Z_NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- len = state->head->extra_len - state->length;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ state->head->extra != Z_NULL &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (len = state->head->extra_len - state->length) <
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ state->head->extra_max) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- zmemcpy(state->head->extra + len, next,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- len + copy > state->head->extra_max ?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- state->head->extra_max - len : copy);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zlib/files/patch-cc-logic.patch b/archivers/zlib/files/patch-cc-logic.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 39cbe6c95f2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zlib/files/patch-cc-logic.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,43 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 80d086357a55b94a13e43756cf3e131f25eef0e4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sam James <sam@gentoo.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 28 Mar 2022 08:40:45 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix CC logic in configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-In https://github.com/madler/zlib/commit/e9a52aa129efe3834383e415580716a7c4027f8d,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the logic was changed to try check harder for GCC, but it dropped
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the default setting of cc=${CC}. It was throwing away any pre-set CC value as
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-a result.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The rest of the script then cascades down a bad path because it's convinced
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-it's not GCC or a GCC-like compiler.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This led to e.g. misdetection of inability to build shared libs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for say, multilib cases (w/ CC being one thing from the environment being used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for one test (e.g. x86_64-unknown-linux-gnu-gcc -m32 and then 'cc' used for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-shared libs (but missing "-m32"!)). Obviously just one example of how
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the old logic could break.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This restores the old default of 'CC' if nothing overrides it later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-in configure.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Bug: https://bugs.gentoo.org/836308
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Sam James <sam@gentoo.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure | 3 +++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/configure b/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 52ff4a04e..3fa3e8618 100755
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -174,7 +174,10 @@ if test -z "$CC"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cc=${CROSS_PREFIX}cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cc=${CC}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cflags=${CFLAGS-"-O3"}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "$cc" in
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/archivers/zlib/files/patch-crc-functions.patch b/archivers/zlib/files/patch-crc-functions.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 51d6a4965ac..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/archivers/zlib/files/patch-crc-functions.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From ec3df00224d4b396e2ac6586ab5d25f673caa4c2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Mark Adler <madler@alumni.caltech.edu>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 30 Mar 2022 11:14:53 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Correct incorrect inputs provided to the CRC functions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-The previous releases of zlib were not sensitive to incorrect CRC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-inputs with bits set above the low 32. This commit restores that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-behavior, so that applications with such bugs will continue to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-operate as before.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- crc32.c | 8 ++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/crc32.c b/crc32.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a1bdce5c2..451887bc7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- crc32.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ crc32.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -630,7 +630,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* DYNAMIC_CRC_TABLE */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Pre-condition the CRC */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- crc ^= 0xffffffff;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ crc = (~crc) & 0xffffffff;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Compute the CRC up to a word boundary. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (len && ((z_size_t)buf & 7) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -749,7 +749,7 @@ unsigned long ZEXPORT crc32_z(crc, buf, len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* DYNAMIC_CRC_TABLE */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Pre-condition the CRC */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- crc ^= 0xffffffff;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ crc = (~crc) & 0xffffffff;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef W
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1077,7 +1077,7 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef DYNAMIC_CRC_TABLE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- once(&made, make_crc_table);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* DYNAMIC_CRC_TABLE */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return multmodp(x2nmodp(len2, 3), crc1) ^ crc2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ========================================================================= */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1112,5 +1112,5 @@ uLong crc32_combine_op(crc1, crc2, op)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uLong crc2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uLong op;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return multmodp(op, crc1) ^ crc2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>