From 4a9267d1a4610f58f71c6ee77bceecd6caca62b0 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Mon, 1 Jul 2024 19:15:07 -0300 Subject: [PATCH 01/19] [rpminspect] Update the list of files skipped in annocheck/lto 1. Insert the relative path of the files as this is a new requirement. 2. Re-sort the list. 3. Add the new file arch/x86/chunkset_avx2.c . --- rpminspect.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpminspect.yaml b/rpminspect.yaml index 8dcf67c..984517d 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -3,4 +3,4 @@ annocheck: extra_opts: - - hardened: --skip-lto=slide_hash_avx2.c --skip-lto=crc32_acle.c --skip-lto=adler32_power8.c + - hardened: --skip-lto=arch/arm/crc32_acle.c --skip-lto=arch/power/adler32_power8.c --skip-lto=arch/x86/chunkset_avx2.c --skip-lto=arch/x86/slide_hash_avx2.c From d059a6fd32491fe8c08c9ecee11a14bc4eda7576 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:55:16 +0000 Subject: [PATCH 02/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zlib-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ng.spec b/zlib-ng.spec index bf9022a..c893bd7 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -19,7 +19,7 @@ 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 @@ -215,6 +215,9 @@ CHOST=%{target_cpu}-%{cpu_vendor}-linux-gnu sh test/abicheck.sh --zlib-compat %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 19 2024 Tulio Magno Quites Machado Filho - 2.1.7-1 - Update to zlib-ng 2.1.7 - Fix rhbz#2293101 From 8a46722e3706f950363ce226993456c0289de2e4 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Tue, 10 Sep 2024 15:26:39 -0300 Subject: [PATCH 03/19] 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 c893bd7..31beb39 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -19,13 +19,16 @@ Name: zlib-ng Version: 2.1.7 -Release: 2%{?dist} +Release: 3%{?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-3 +- Fixes rhbz#2307237 + * Sat Jul 20 2024 Fedora Release Engineering - 2.1.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From cbac09d31ab0fb83f04594ba2444d63b006b13d4 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Wed, 25 Sep 2024 09:33:54 +0000 Subject: [PATCH 04/19] Rebase to new major version 2.2.2 Fedora Change proposal: https://fedoraproject.org/wiki/Changes/ZlibNG-2.2 --- sources | 2 +- zlib-ng.spec | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 3e1f055..a283b00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-ng-2.1.7.tar.gz) = 03e6d22ecb39c9425fa2977e5db608f765387a06b9ef93b162e403bb155aa3b59bbaedb41e827e7e159d6635325d804dcd4314a25adcb35b83e6e0cf1153aabe +SHA512 (zlib-ng-2.2.2.tar.gz) = 3cb3e97ee1d20e1f3cdf0efcdf55aee0e3a192f9a2ae781cd209b1d37620c48f2ada345fb1f4357315b1cb5e09b7ea5fcdfa2fd54f7b4ac5dcb6e73860000aad diff --git a/zlib-ng.spec b/zlib-ng.spec index 31beb39..0a3da3c 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -18,17 +18,14 @@ %global supported_abi_test aarch64 ppc64le x86_64 Name: zlib-ng -Version: 2.1.7 -Release: 3%{?dist} +Version: 2.2.2 +Release: 1%{?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++ @@ -218,6 +215,9 @@ CHOST=%{target_cpu}-%{cpu_vendor}-linux-gnu sh test/abicheck.sh --zlib-compat %changelog +* Wed Sep 25 2024 Lukas Javorsky - 2.2.2-1 +- Rebase to new major version 2.2.2 + * Tue Sep 10 2024 Tulio Magno Quites Machado Filho - 2.1.7-3 - Fixes rhbz#2307237 From 92e84a48ac6ba879e6322c44d9cb761fd31999b8 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Thu, 12 Sep 2024 13:53:00 -0300 Subject: [PATCH 05/19] Add a script that regenerates rpminspect.yaml Every new release we notice that annocheck finds a new file that can't be built with LTO. These files may change between releases as new optimizations are implemented or removed. A script that can generate the configuration will make our lives easier when the source code is updated. --- regenerate-rpminspect | 33 +++++++++++++++++++++++++++++++++ rpminspect.yaml | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 2 deletions(-) create mode 100755 regenerate-rpminspect diff --git a/regenerate-rpminspect b/regenerate-rpminspect new file mode 100755 index 0000000..8ce3723 --- /dev/null +++ b/regenerate-rpminspect @@ -0,0 +1,33 @@ +#!/usr/bin/bash +# +# Regenerated rpminspect.yaml. +# The contents in rpminspect.yaml depends on the usage of NOLTOFLAG in +# zlib-ng's build system. + +OUTPUT=$(pwd)/rpminspect.yaml + +cat - < $OUTPUT +# This file has been generated automatically by regenerate-rpminspect. +# Ignore LTO test on CPU-optimized files which cannot use the LTO. +# More described in upstream: https://github.com/zlib-ng/zlib-ng/pull/938 + +annocheck: + extra_opts: + - hardened: +EOF + +tmpdir=$(mktemp -p $(pwd) -d) + +fedpkg prep --builddir $tmpdir > /dev/null + +rootdir=$(dirname $(find $tmpdir -name arch)) +for makefile in $(find $tmpdir -name Makefile.in); do + dir=$(dirname $makefile) + for f in $(gawk \ + 'match($0, /\$\(NOLTOFLAG\).*\/([^\/]+\.c)/, ret) {print ret[1]}' \ + $makefile | sort -u); do + echo "--skip-lto=$(realpath --relative-to=$rootdir $dir)/$f" >> $OUTPUT + done +done + +rm -rf $tmpdir diff --git a/rpminspect.yaml b/rpminspect.yaml index 984517d..27feaa2 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -1,6 +1,37 @@ -# Ignore LTO test on CPU-optimized files which cannot use the LTO +# This file has been generated automatically by regenerate-rpminspect. +# Ignore LTO test on CPU-optimized files which cannot use the LTO. # More described in upstream: https://github.com/zlib-ng/zlib-ng/pull/938 annocheck: extra_opts: - - hardened: --skip-lto=arch/arm/crc32_acle.c --skip-lto=arch/power/adler32_power8.c --skip-lto=arch/x86/chunkset_avx2.c --skip-lto=arch/x86/slide_hash_avx2.c + - hardened: +--skip-lto=arch/arm/adler32_neon.c +--skip-lto=arch/arm/chunkset_neon.c +--skip-lto=arch/arm/compare256_neon.c +--skip-lto=arch/arm/crc32_acle.c +--skip-lto=arch/arm/insert_string_acle.c +--skip-lto=arch/arm/slide_hash_armv6.c +--skip-lto=arch/arm/slide_hash_neon.c +--skip-lto=arch/power/adler32_power8.c +--skip-lto=arch/power/adler32_vmx.c +--skip-lto=arch/power/chunkset_power8.c +--skip-lto=arch/power/compare256_power9.c +--skip-lto=arch/power/crc32_power8.c +--skip-lto=arch/power/slide_hash_power8.c +--skip-lto=arch/power/slide_hash_vmx.c +--skip-lto=arch/s390/crc32-vx.c +--skip-lto=arch/x86/adler32_avx2.c +--skip-lto=arch/x86/adler32_avx512.c +--skip-lto=arch/x86/adler32_avx512_vnni.c +--skip-lto=arch/x86/adler32_sse42.c +--skip-lto=arch/x86/adler32_ssse3.c +--skip-lto=arch/x86/chunkset_avx2.c +--skip-lto=arch/x86/chunkset_sse2.c +--skip-lto=arch/x86/chunkset_ssse3.c +--skip-lto=arch/x86/compare256_avx2.c +--skip-lto=arch/x86/compare256_sse2.c +--skip-lto=arch/x86/crc32_pclmulqdq.c +--skip-lto=arch/x86/crc32_vpclmulqdq.c +--skip-lto=arch/x86/insert_string_sse42.c +--skip-lto=arch/x86/slide_hash_avx2.c +--skip-lto=arch/x86/slide_hash_sse2.c From 45e28263ccc1d44feb3303bcba4a4851c633b62b Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Wed, 8 Jan 2025 13:44:39 -0300 Subject: [PATCH 06/19] Update to version 2.2.3 --- sources | 2 +- zlib-ng.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index a283b00..6858afb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-ng-2.2.2.tar.gz) = 3cb3e97ee1d20e1f3cdf0efcdf55aee0e3a192f9a2ae781cd209b1d37620c48f2ada345fb1f4357315b1cb5e09b7ea5fcdfa2fd54f7b4ac5dcb6e73860000aad +SHA512 (zlib-ng-2.2.3.tar.gz) = e71e8972ec2c4dec9eaa2c8f550185f13d0f5c411c38061d1aaf78ca8e522fa3d53f005296e574af7f152e7da3a78adf97ae4bb638b7fd277ef57bba26370b7d diff --git a/zlib-ng.spec b/zlib-ng.spec index 0a3da3c..c7ba136 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.2 +Version: 2.2.3 Release: 1%{?dist} Summary: Zlib replacement with optimizations License: Zlib @@ -215,6 +215,9 @@ CHOST=%{target_cpu}-%{cpu_vendor}-linux-gnu sh test/abicheck.sh --zlib-compat %changelog +* Wed Jan 08 2025 Tulio Magno Quites Machado Filho - 2.2.3-1 +- Update to version 2.2.3 + * Wed Sep 25 2024 Lukas Javorsky - 2.2.2-1 - Rebase to new major version 2.2.2 From 744296cca737c97726bf0d4324064ff3d53e73fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:49:59 +0000 Subject: [PATCH 07/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zlib-ng.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zlib-ng.spec b/zlib-ng.spec index c7ba136..79a16a9 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -19,7 +19,7 @@ Name: zlib-ng Version: 2.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Zlib replacement with optimizations License: Zlib Url: https://github.com/zlib-ng/zlib-ng @@ -215,6 +215,9 @@ CHOST=%{target_cpu}-%{cpu_vendor}-linux-gnu sh test/abicheck.sh --zlib-compat %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 08 2025 Tulio Magno Quites Machado Filho - 2.2.3-1 - Update to version 2.2.3 From 8d47ac10f51c20d162d005852c7573c498cc68b9 Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Wed, 22 Jan 2025 11:04:12 +0000 Subject: [PATCH 08/19] Setup Packit Bot Jobs: koji_build, bodhi_update, pull_from_upstream --- .packit.yaml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 .packit.yaml diff --git a/.packit.yaml b/.packit.yaml new file mode 100644 index 0000000..44fdd77 --- /dev/null +++ b/.packit.yaml @@ -0,0 +1,34 @@ + +# We want to use the following Packit functions in the zlib-ng package: +# koji_build, bodhi_update, pull_from_upstream + +# See the documentation for more information: +# https://packit.dev/docs/configuration/ + +specfile_path: zlib-ng.spec + +# name in upstream package repository or registry (e.g. in PyPI) +upstream_package_name: zlib-ng +upstream_project_url: https://github.com/zlib-ng/zlib-ng/ +# downstream (Fedora) RPM package name +downstream_package_name: zlib-ng + +jobs: + - job: pull_from_upstream + trigger: release + dist_git_branches: + - fedora-latest + - fedora-rawhide + + - job: koji_build + trigger: commit + allowed_pr_authors: ["ljavorsk", "tuliom", "aekoroglu", "packit"] + allowed_committers: ["ljavorsk", "tuliom", "aekoroglu", "packit"] + dist_git_branches: + - fedora-latest + - fedora-rawhide + + - job: bodhi_update + trigger: commit + dist_git_branches: + - fedora-latest # rawhide updates are created automatically From f800f2b35a36f7d0f4c50a903b027ca5fdecec3c Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Wed, 22 Jan 2025 13:42:00 +0000 Subject: [PATCH 09/19] Convert to %autorelease and %autochangelog [skip changelog] --- changelog | 109 +++++++++++++++++++++++++++++++++++++++++++++++++ zlib-ng.spec | 112 +-------------------------------------------------- 2 files changed, 111 insertions(+), 110 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..f672d98 --- /dev/null +++ b/changelog @@ -0,0 +1,109 @@ +* Sun Jan 19 2025 Fedora Release Engineering - 2.2.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Jan 08 2025 Tulio Magno Quites Machado Filho - 2.2.3-1 +- Update to version 2.2.3 + +* Wed Sep 25 2024 Lukas Javorsky - 2.2.2-1 +- Rebase to new major version 2.2.2 + +* Tue Sep 10 2024 Tulio Magno Quites Machado Filho - 2.1.7-3 +- Fixes rhbz#2307237 + +* Sat Jul 20 2024 Fedora Release Engineering - 2.1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jun 19 2024 Tulio Magno Quites Machado Filho - 2.1.7-1 +- Update to zlib-ng 2.1.7 +- Fix rhbz#2293101 +- Fix rhbz#2293437 + +* Tue Jun 04 2024 Cristian Le - 2.1.6-6 +- Avoid using reserved variable vendor. Fix #2284608 + +* Wed May 29 2024 Tulio Magno Quites Machado Filho - 2.1.6-5 +- Set ownership of cmake directories. Fix #2283789 + +* Tue May 21 2024 Tulio Magno Quites Machado Filho - 2.1.6-4 +- Update the patch that fixes rhbz#2280347 + +* Tue May 14 2024 Tulio Magno Quites Machado Filho - 2.1.6-3 +- Fix rhbz#2280347 + +* Sat Jan 27 2024 Fedora Release Engineering - 2.1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jan 11 2024 Lukas Javorsky - 2.1.6-1 +- Rebase to version 2.1.6 + +* Tue Jan 09 2024 Yaakov Selkowitz - 2.1.5-2 +- Add zlib-ng-compat-static to replace zlib-static + +* Wed Dec 20 2023 Tulio Magno Quites Machado Filho - 2.1.5-1 +- Update to zlib-ng 2.1.5 + +* Wed Oct 18 2023 Tulio Magno Quites Machado Filho - 2.1.3-7 +- Improve the patch that defines the FAR macro + +* Wed Sep 27 2023 Tulio Magno Quites Machado Filho - 2.1.3-6 +- Add a patch that defines the FAR macro + +* Wed Sep 20 2023 Tulio Magno Quites Machado Filho - 2.1.3-5 +- Fix WITH_SANITIZER + +* Tue Sep 19 2023 Tulio Magno Quites Machado Filho - 2.1.3-4 +- Disable WITH_NEW_STRATEGIES in compat mode + +* Thu Aug 24 2023 Tulio Magno Quites Machado Filho - 2.1.3-3 +- Enable zlib compat build + +* Sat Jul 22 2023 Fedora Release Engineering - 2.1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Jul 11 2023 Ali Erdinc Koroglu - 2.1.3-1 +- Update to 2.1.3 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.0.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.0.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Apr 14 2022 Ali Erdinc Koroglu - 2.0.6-1 +- New upstream release 2.0.6 + +* Sat Jan 22 2022 Fedora Release Engineering - 2.0.5-2.20210625gitc69f78bc5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Aug 07 2021 Tulio Magno Quites Machado Filho - 2.0.2-5.20210625gitc69f78bc5e +- Update to v2.0.5. + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.2-2.20210323git5fe25907e +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun Apr 18 2021 Tulio Magno Quites Machado Filho - 2.0.2-1.20210323gite5fe25907e +- Update to v2.0.2. +- Remove the manpage that got removed from upstream. + +* Thu Jan 28 2021 Fedora Release Engineering - 1.9.9-0.4.20200912gite58738845 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Sep 13 2020 Tulio Magno Quites Machado Filho - 1.9.9-0.3.20200912gite58738845 +- Update to a newer commit. + +* Wed Jul 29 2020 Fedora Release Engineering - 1.9.9-0.3.20200609gitfe69810c2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jul 09 2020 Tulio Magno Quites Machado Filho - 1.9.9-0.2.20200609gitfe69810c2 +- Replace cmake commands with new cmake macros + +* Mon Jul 06 2020 Tulio Magno Quites Machado Filho - 1.9.9-0.1.20200609gitfe69810c2 +- Improve the archive name. +- Starte release at 0.1 as required for prerelease. +- Make the devel package require an arch-dependent runtime subpackage. +- Remove %%ldconfig_scriptlets. +- Glob the man page extension. +- Move unversioned shared library to the devel subpackage + +* Wed Jul 01 2020 Tulio Magno Quites Machado Filho - 1.9.9-0.20200609gitfe69810c2 +- Initial commit diff --git a/zlib-ng.spec b/zlib-ng.spec index 79a16a9..7cee245 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -19,7 +19,7 @@ Name: zlib-ng Version: 2.2.3 -Release: 2%{?dist} +Release: %autorelease Summary: Zlib replacement with optimizations License: Zlib Url: https://github.com/zlib-ng/zlib-ng @@ -215,112 +215,4 @@ CHOST=%{target_cpu}-%{cpu_vendor}-linux-gnu sh test/abicheck.sh --zlib-compat %changelog -* Sun Jan 19 2025 Fedora Release Engineering - 2.2.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jan 08 2025 Tulio Magno Quites Machado Filho - 2.2.3-1 -- Update to version 2.2.3 - -* Wed Sep 25 2024 Lukas Javorsky - 2.2.2-1 -- Rebase to new major version 2.2.2 - -* Tue Sep 10 2024 Tulio Magno Quites Machado Filho - 2.1.7-3 -- Fixes rhbz#2307237 - -* Sat Jul 20 2024 Fedora Release Engineering - 2.1.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Jun 19 2024 Tulio Magno Quites Machado Filho - 2.1.7-1 -- Update to zlib-ng 2.1.7 -- Fix rhbz#2293101 -- Fix rhbz#2293437 - -* Tue Jun 04 2024 Cristian Le - 2.1.6-6 -- Avoid using reserved variable vendor. Fix #2284608 - -* Wed May 29 2024 Tulio Magno Quites Machado Filho - 2.1.6-5 -- Set ownership of cmake directories. Fix #2283789 - -* Tue May 21 2024 Tulio Magno Quites Machado Filho - 2.1.6-4 -- Update the patch that fixes rhbz#2280347 - -* Tue May 14 2024 Tulio Magno Quites Machado Filho - 2.1.6-3 -- Fix rhbz#2280347 - -* Sat Jan 27 2024 Fedora Release Engineering - 2.1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jan 11 2024 Lukas Javorsky - 2.1.6-1 -- Rebase to version 2.1.6 - -* Tue Jan 09 2024 Yaakov Selkowitz - 2.1.5-2 -- Add zlib-ng-compat-static to replace zlib-static - -* Wed Dec 20 2023 Tulio Magno Quites Machado Filho - 2.1.5-1 -- Update to zlib-ng 2.1.5 - -* Wed Oct 18 2023 Tulio Magno Quites Machado Filho - 2.1.3-7 -- Improve the patch that defines the FAR macro - -* Wed Sep 27 2023 Tulio Magno Quites Machado Filho - 2.1.3-6 -- Add a patch that defines the FAR macro - -* Wed Sep 20 2023 Tulio Magno Quites Machado Filho - 2.1.3-5 -- Fix WITH_SANITIZER - -* Tue Sep 19 2023 Tulio Magno Quites Machado Filho - 2.1.3-4 -- Disable WITH_NEW_STRATEGIES in compat mode - -* Thu Aug 24 2023 Tulio Magno Quites Machado Filho - 2.1.3-3 -- Enable zlib compat build - -* Sat Jul 22 2023 Fedora Release Engineering - 2.1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jul 11 2023 Ali Erdinc Koroglu - 2.1.3-1 -- Update to 2.1.3 - -* Sat Jan 21 2023 Fedora Release Engineering - 2.0.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 2.0.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Apr 14 2022 Ali Erdinc Koroglu - 2.0.6-1 -- New upstream release 2.0.6 - -* Sat Jan 22 2022 Fedora Release Engineering - 2.0.5-2.20210625gitc69f78bc5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Sat Aug 07 2021 Tulio Magno Quites Machado Filho - 2.0.2-5.20210625gitc69f78bc5e -- Update to v2.0.5. - -* Fri Jul 23 2021 Fedora Release Engineering - 2.0.2-2.20210323git5fe25907e -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sun Apr 18 2021 Tulio Magno Quites Machado Filho - 2.0.2-1.20210323gite5fe25907e -- Update to v2.0.2. -- Remove the manpage that got removed from upstream. - -* Thu Jan 28 2021 Fedora Release Engineering - 1.9.9-0.4.20200912gite58738845 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Sun Sep 13 2020 Tulio Magno Quites Machado Filho - 1.9.9-0.3.20200912gite58738845 -- Update to a newer commit. - -* Wed Jul 29 2020 Fedora Release Engineering - 1.9.9-0.3.20200609gitfe69810c2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jul 09 2020 Tulio Magno Quites Machado Filho - 1.9.9-0.2.20200609gitfe69810c2 -- Replace cmake commands with new cmake macros - -* Mon Jul 06 2020 Tulio Magno Quites Machado Filho - 1.9.9-0.1.20200609gitfe69810c2 -- Improve the archive name. -- Starte release at 0.1 as required for prerelease. -- Make the devel package require an arch-dependent runtime subpackage. -- Remove %%ldconfig_scriptlets. -- Glob the man page extension. -- Move unversioned shared library to the devel subpackage - -* Wed Jul 01 2020 Tulio Magno Quites Machado Filho - 1.9.9-0.20200609gitfe69810c2 -- Initial commit +%autochangelog From a60ec152494b08caba215acdecf01052bd9c83f2 Mon Sep 17 00:00:00 2001 From: Packit Date: Mon, 10 Feb 2025 23:09:36 +0000 Subject: [PATCH 10/19] Update to 2.2.4 upstream release - Resolves: rhbz#2344792 Upstream tag: 2.2.4 Upstream commit: 860e4cff Commit authored by Packit automation (https://packit.dev/) --- README.packit | 3 +++ sources | 2 +- zlib-ng.spec | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 README.packit diff --git a/README.packit b/README.packit new file mode 100644 index 0000000..7017e6c --- /dev/null +++ b/README.packit @@ -0,0 +1,3 @@ +This repository is maintained by packit. +https://packit.dev/ +The file was generated using packit 1.1.0.post1.dev2+gf7b527d0. diff --git a/sources b/sources index 6858afb..c4582db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-ng-2.2.3.tar.gz) = e71e8972ec2c4dec9eaa2c8f550185f13d0f5c411c38061d1aaf78ca8e522fa3d53f005296e574af7f152e7da3a78adf97ae4bb638b7fd277ef57bba26370b7d +SHA512 (zlib-ng-2.2.4.tar.gz) = f49a89497988db55a2f2375f79443e7e2c57470dbd94b35ae38a39d988eb42f8ecc295a1bd68845fc273b59ea508d0e74b142585d85b7e869dd3c01cc6923d8d diff --git a/zlib-ng.spec b/zlib-ng.spec index 7cee245..6752b6c 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.3 +Version: 2.2.4 Release: %autorelease Summary: Zlib replacement with optimizations License: Zlib From 9bd0cafffbcbccf823c9e1e2cf01bf54f3dbbc52 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Tue, 25 Feb 2025 15:47:41 -0300 Subject: [PATCH 11/19] Enable -fPIC for static compat libraries Generate static compat libraries with Position Independent Code in order to let these files to be used when linking to shared libraries. --- zlib-ng.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zlib-ng.spec b/zlib-ng.spec index 6752b6c..db61236 100644 --- a/zlib-ng.spec +++ b/zlib-ng.spec @@ -118,7 +118,7 @@ _EOF_ # defining BUILD_SHARED_LIBS disables the static library %undefine _cmake_shared_libs # Disable new strategies in order to keep compatibility with zlib. -%cmake %{cmake_param} -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF +%cmake %{cmake_param} -DZLIB_COMPAT=ON -DWITH_NEW_STRATEGIES=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON %cmake_build %endif From 5a637136c868ae9e34a685207f2b189fe9cdf515 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Thu, 27 Feb 2025 11:23:47 -0300 Subject: [PATCH 12/19] 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} From f7b3208bc30460ee18c0cf279e7656c1a066143b Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 7 Aug 2025 16:11:19 +0000 Subject: [PATCH 13/19] Update to 2.2.5 upstream release - Resolves: rhbz#2387088 Upstream tag: 2.2.5 Upstream commit: 42543906 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 7017e6c..3ad54d6 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.1.0.post1.dev2+gf7b527d0. +The file was generated using packit 1.11.0. diff --git a/sources b/sources index c4582db..9ecba75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zlib-ng-2.2.4.tar.gz) = f49a89497988db55a2f2375f79443e7e2c57470dbd94b35ae38a39d988eb42f8ecc295a1bd68845fc273b59ea508d0e74b142585d85b7e869dd3c01cc6923d8d +SHA512 (zlib-ng-2.2.5.tar.gz) = b599ea24375d08fa098ed7c3b14548e0d9731a155a024a0904b0ae4a6d3491a69f0c0574d66b6e4af1e40f10e38b6b555d4c4b1fe3589ca83a5f97fbd92f635f diff --git a/zlib-ng.spec b/zlib-ng.spec index db61236..83ce4e2 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.4 +Version: 2.2.5 Release: %autorelease Summary: Zlib replacement with optimizations License: Zlib From f27b6e0bd949278748ae527976c22f037b45f981 Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Fri, 15 Aug 2025 10:12:57 -0300 Subject: [PATCH 14/19] packit: Update the list of distros Fedora 43 got branched, which changed the definition of the alias `fedora-latest` to `fedora-43`. Explicitly list `fedora-42` in order to continue receiving updates and triggering builds and updates. The plan is to replace these entries with `fedora-all` or `fedora-branched` as soon as f41 reaches EOL. [skip changelog] --- .packit.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.packit.yaml b/.packit.yaml index 44fdd77..83d86ff 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -18,6 +18,7 @@ jobs: trigger: release dist_git_branches: - fedora-latest + - fedora-42 - fedora-rawhide - job: koji_build @@ -26,9 +27,12 @@ jobs: allowed_committers: ["ljavorsk", "tuliom", "aekoroglu", "packit"] dist_git_branches: - fedora-latest + - fedora-42 - fedora-rawhide - job: bodhi_update trigger: commit dist_git_branches: - - fedora-latest # rawhide updates are created automatically + # rawhide updates are created automatically + - fedora-latest + - fedora-42 From 39ebff57234f098f0e64af591670122a892fb91d Mon Sep 17 00:00:00 2001 From: Packit Date: Thu, 27 Nov 2025 17:24:13 +0000 Subject: [PATCH 15/19] 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 16/19] 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 17/19] 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 18/19] 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 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 19/19] 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