From da20271b70178af3de439cb2f793c3a1f5b5f8ab Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Tue, 10 Sep 2024 16:17:28 -0300 Subject: [PATCH 1/2] Apply a patch that fixes rhbz#2307237 Resolves: rhbz#2307237 --- 1773.patch | 26 ++++++++++++++++++++++++++ zlib-ng.spec | 8 +++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 1773.patch diff --git a/1773.patch b/1773.patch new file mode 100644 index 0000000..b422be7 --- /dev/null +++ b/1773.patch @@ -0,0 +1,26 @@ +From af013cf65867e3589f6da714eefc69d9f986bb91 Mon Sep 17 00:00:00 2001 +From: Nathan Moinvaziri +Date: Mon, 9 Sep 2024 13:32:33 -0700 +Subject: [PATCH] Don't use chunkunroll for inflateBack + +If the output buffer and the window buffer are the same +memory allocation, we cannot make the assumptions that chunkunroll +does, that it is okay to overwrite the output buffer. +--- + inffast_tpl.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/inffast_tpl.h b/inffast_tpl.h +index 9ddd187d84..c8f4786754 100644 +--- a/inffast_tpl.h ++++ b/inffast_tpl.h +@@ -249,7 +249,8 @@ void Z_INTERNAL INFLATE_FAST(PREFIX3(stream) *strm, uint32_t start) { + if (op < len) { /* still need some from output */ + len -= op; + out = chunkcopy_safe(out, from, op, safe); +- out = CHUNKUNROLL(out, &dist, &len); ++ if (!extra_safe) ++ out = CHUNKUNROLL(out, &dist, &len); + out = chunkcopy_safe(out, out - dist, len, safe); + } else { + out = chunkcopy_safe(out, from, len, safe); diff --git a/zlib-ng.spec b/zlib-ng.spec index bf9022a..1b341e4 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -19,13 +19,16 @@ Name: zlib-ng Version: 2.1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zlib replacement with optimizations License: Zlib Url: https://github.com/zlib-ng/zlib-ng Source0: https://github.com/zlib-ng/zlib-ng/archive/%{version}/%{name}-%{version}.tar.gz Patch: far.diff +# Backport from https://github.com/zlib-ng/zlib-ng/pull/1773 +# Fixes https://bugzilla.redhat.com/show_bug.cgi?id=2307237 +Patch: 1773.patch BuildRequires: cmake >= 3.1 BuildRequires: gcc-c++ @@ -215,6 +218,9 @@ CHOST=%{target_cpu}-%{cpu_vendor}-linux-gnu sh test/abicheck.sh --zlib-compat %changelog +* Tue Sep 10 2024 Tulio Magno Quites Machado Filho - 2.1.7-2 +- Fixes rhbz#2307237 + * Wed Jun 19 2024 Tulio Magno Quites Machado Filho - 2.1.7-1 - Update to zlib-ng 2.1.7 - Fix rhbz#2293101 From 7f8f0a66a7d3ffa5f8db30f5282391507c87baf7 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Thu, 27 Feb 2025 11:23:47 -0300 Subject: [PATCH 2/2] Remove rpmdeplint from gating This test is only enabled on Rawhide and does not run on branched targets causing errors in our Bodhi updates. There is no way to require rpmdeplint only on Rawhide because Bodhi does not understand the concept of Rawhide. More information: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/QTAGRWMHZBQOXWI5S3O2JSYCDRU6IT4D/ --- gating.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/gating.yaml b/gating.yaml index 2fb97b2..93e252b 100644 --- a/gating.yaml +++ b/gating.yaml @@ -8,6 +8,5 @@ decision_contexts: subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpmdeplint.functional} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.rpminspect.static-analysis} - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.installability.functional}