From 39ebff57234f098f0e64af591670122a892fb91d Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 27 Nov 2025 17:24:13 +0000 Subject: [PATCH 1/7] Update to 2.3.1 upstream release - Resolves: rhbz#2417595 Upstream tag: 2.3.1 Upstream commit: 68c83bf4 Commit authored by Packit automation (https://packit.dev/) --- README.packit | 2 +- sources | 2 +- zlib-ng.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.packit b/README.packit index 3ad54d6..a901bca 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0. +The file was generated using packit 1.12.0.post1.dev18+gc39b0e7d4. diff --git a/sources b/sources index 9ecba75..dced3e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-ng-2.2.5.tar.gz) = b599ea24375d08fa098ed7c3b14548e0d9731a155a024a0904b0ae4a6d3491a69f0c0574d66b6e4af1e40f10e38b6b555d4c4b1fe3589ca83a5f97fbd92f635f +SHA512 (zlib-ng-2.3.1.tar.gz) = 33722bfdd7d4f0b41f4ac99edcfd1a0f26aa52f86b1c16ce2e63962c26f8f8239634acef33051958f96b9593c29b7dedb29b136e710005de88fbb4cf40228a85 diff --git a/zlib-ng.spec b/zlib-ng.spec index 83ce4e2..2f5a2c7 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -18,7 +18,7 @@ %global supported_abi_test aarch64 ppc64le x86_64 Name: zlib-ng -Version: 2.2.5 +Version: 2.3.1 Release: %autorelease Summary: Zlib replacement with optimizations License: Zlib From c8c1c8f78d689a072809e8e232f50c7790015bd0 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Thu, 27 Nov 2025 16:01:07 -0300 Subject: [PATCH 2/7] Stop using riscv64 settings on other architectures While having this parameter doesn't, it does generate extra warnings to the build log. [skip changelog] --- zlib-ng.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zlib-ng.spec b/zlib-ng.spec index 2f5a2c7..cc11a09 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -98,7 +98,11 @@ cat <<_EOF_ _EOF_ # zlib-ng uses a different macro for library directory. -%global cmake_param %{?with_sanitizers:-DWITH_SANITIZER=ON} -DWITH_RVV=OFF +%global cmake_param %{?with_sanitizers:-DWITH_SANITIZER=ON} + +%ifarch riscv64 +%global cmake_param %cmake_param -DWITH_RVV=OFF +%endif # Setting __cmake_builddir is not necessary in this step, but do it anyway for symmetry. %global __cmake_builddir %{_vpath_builddir} From f8484b5212f7b36bf9511929a9e7f444efb5e3bc Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Thu, 27 Nov 2025 16:03:47 -0300 Subject: [PATCH 3/7] Do not build CRC32 Chorba optimization on RHEL10+ RHEL 10 requires x86_64-v3. Meanwhile, CRC32 Chorba is used on x86_64-v2 and older processors. [skip changelog] --- zlib-ng.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/zlib-ng.spec b/zlib-ng.spec index cc11a09..ece688d 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -104,6 +104,15 @@ _EOF_ %global cmake_param %cmake_param -DWITH_RVV=OFF %endif +%if 0%{?rhel} >= 10 +%ifarch x86_64 +# RHEL 10 has x86_64-v3 as baseline, turning the CRC32 Chorba optimization +# unnecessary. +# More info: https://github.com/zlib-ng/zlib-ng/releases/tag/2.3.1 +%global cmake_param %cmake_param -DWITH_CRC32_CHORBA=OFF +%endif +%endif + # Setting __cmake_builddir is not necessary in this step, but do it anyway for symmetry. %global __cmake_builddir %{_vpath_builddir} %cmake %{cmake_param} From d5f7e25717ad0bee8d65c4c8cdce7b195a8774e1 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 3 Dec 2025 09:00:04 +0000 Subject: [PATCH 4/7] Update to 2.3.2 upstream release - Resolves: rhbz#2418517 Upstream tag: 2.3.2 Upstream commit: 6d9f3dc0 Commit authored by Packit automation (https://packit.dev/) --- README.packit | 2 +- sources | 2 +- zlib-ng.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.packit b/README.packit index a901bca..b4b46e3 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.12.0.post1.dev18+gc39b0e7d4. +The file was generated using packit 1.12.0.post1.dev20+g7d30dac21. diff --git a/sources b/sources index dced3e5..375c0d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-ng-2.3.1.tar.gz) = 33722bfdd7d4f0b41f4ac99edcfd1a0f26aa52f86b1c16ce2e63962c26f8f8239634acef33051958f96b9593c29b7dedb29b136e710005de88fbb4cf40228a85 +SHA512 (zlib-ng-2.3.2.tar.gz) = 8781ee4bfda7cb8c8c5150c2e6a067d699580616b61af2ea4cf03cbe14c6715b31a29a20b7c3dd97254a9e487c72c5228c9cfa817ff71aa765fe7043ab136f04 diff --git a/zlib-ng.spec b/zlib-ng.spec index ece688d..6f8cde0 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -18,7 +18,7 @@ %global supported_abi_test aarch64 ppc64le x86_64 Name: zlib-ng -Version: 2.3.1 +Version: 2.3.2 Release: %autorelease Summary: Zlib replacement with optimizations License: Zlib From 9579d95ccf46ebd0cb263b8642eaec7f398efb23 Mon Sep 17 00:00:00 2001 From: Packit Date: Wed, 3 Dec 2025 09:00:15 +0000 Subject: [PATCH 5/7] Update to 2.3.2 upstream release - Resolves: rhbz#2418517 Upstream tag: 2.3.2 Upstream commit: 6d9f3dc0 Commit authored by Packit automation (https://packit.dev/) --- README.packit | 2 +- sources | 2 +- zlib-ng.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.packit b/README.packit index 3ad54d6..b4b46e3 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 1.11.0. +The file was generated using packit 1.12.0.post1.dev20+g7d30dac21. diff --git a/sources b/sources index 9ecba75..375c0d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-ng-2.2.5.tar.gz) = b599ea24375d08fa098ed7c3b14548e0d9731a155a024a0904b0ae4a6d3491a69f0c0574d66b6e4af1e40f10e38b6b555d4c4b1fe3589ca83a5f97fbd92f635f +SHA512 (zlib-ng-2.3.2.tar.gz) = 8781ee4bfda7cb8c8c5150c2e6a067d699580616b61af2ea4cf03cbe14c6715b31a29a20b7c3dd97254a9e487c72c5228c9cfa817ff71aa765fe7043ab136f04 diff --git a/zlib-ng.spec b/zlib-ng.spec index 83ce4e2..a7c332e 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -18,7 +18,7 @@ %global supported_abi_test aarch64 ppc64le x86_64 Name: zlib-ng -Version: 2.2.5 +Version: 2.3.2 Release: %autorelease Summary: Zlib replacement with optimizations License: Zlib From c93c81c63053230109a4d07792e9e82ea706af59 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Fri, 12 Dec 2025 10:36:45 -0300 Subject: [PATCH 6/7] Enable DFLTCC on s390x Ensure DFLTCC is enabled on s390x for both deflate and inflate. --- zlib-ng.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zlib-ng.spec b/zlib-ng.spec index 6f8cde0..8b9a2fc 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -104,6 +104,10 @@ _EOF_ %global cmake_param %cmake_param -DWITH_RVV=OFF %endif +%ifarch s390x +%global cmake_param %cmake_param -DWITH_DFLTCC_DEFLATE=ON -DWITH_DFLTCC_INFLATE=ON +%endif + %if 0%{?rhel} >= 10 %ifarch x86_64 # RHEL 10 has x86_64-v3 as baseline, turning the CRC32 Chorba optimization From f7db29652dbabb3d7f6067a7e7cfb63937b5811a Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Fri, 12 Dec 2025 10:36:45 -0300 Subject: [PATCH 7/7] Enable DFLTCC on s390x Ensure DFLTCC is enabled on s390x for both deflate and inflate. (cherry picked from commit c93c81c63053230109a4d07792e9e82ea706af59) --- zlib-ng.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/zlib-ng.spec b/zlib-ng.spec index a7c332e..bde025d 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -100,6 +100,10 @@ _EOF_ # zlib-ng uses a different macro for library directory. %global cmake_param %{?with_sanitizers:-DWITH_SANITIZER=ON} -DWITH_RVV=OFF +%ifarch s390x +%global cmake_param %cmake_param -DWITH_DFLTCC_DEFLATE=ON -DWITH_DFLTCC_INFLATE=ON +%endif + # Setting __cmake_builddir is not necessary in this step, but do it anyway for symmetry. %global __cmake_builddir %{_vpath_builddir} %cmake %{cmake_param}