From 5bf6ffc86a838246b73d4f49ef91e018bd661bbd Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Wed, 1 Aug 2018 18:24:36 +0100 Subject: [PATCH 1/3] Add upstream patch to fix tests for epel7 Signed-off-by: Jonathan Dieter --- ...y-work-with-zstd-1.3.4-as-well-as-1..patch | 91 +++++++++++++++++++ zchunk.spec | 8 +- 2 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 0001-Fix-tests-so-they-work-with-zstd-1.3.4-as-well-as-1..patch diff --git a/0001-Fix-tests-so-they-work-with-zstd-1.3.4-as-well-as-1..patch b/0001-Fix-tests-so-they-work-with-zstd-1.3.4-as-well-as-1..patch new file mode 100644 index 0000000..3a5e4e8 --- /dev/null +++ b/0001-Fix-tests-so-they-work-with-zstd-1.3.4-as-well-as-1..patch @@ -0,0 +1,91 @@ +From a1a67927f566a7c6b8e44f23a6ab76ceb19dd490 Mon Sep 17 00:00:00 2001 +From: Jonathan Dieter +Date: Wed, 1 Aug 2018 18:19:36 +0100 +Subject: [PATCH] Fix tests so they work with zstd <= 1.3.4 as well as 1.3.5+ + +Signed-off-by: Jonathan Dieter +--- + test/meson.build | 28 ++++++++++++++++++++++++---- + 1 file changed, 24 insertions(+), 4 deletions(-) + +diff --git a/test/meson.build b/test/meson.build +index 2c9af81..c052cfb 100644 +--- a/test/meson.build ++++ b/test/meson.build +@@ -140,49 +140,69 @@ test( + join_paths(file_path, 'LICENSE.manual.dict.fodt.zck') + ] + ) ++ ++check_sha = '0418aaca75b6b64c3ac9bc50fc0974e48c76691869977907fad25eea834f3c85' ++if zstd_dep.version().version_compare('<=1.3.4') ++ check_sha = '08c9ce94470ad4ab7f8a64e67872e138964eb562d13686d9c941baa3a09d2835' ++endif + test( + 'compress auto-chunked file - no dict', + shacheck, + args: [ + zck, + 'LICENSE.nodict.fodt.zck', +- '0418aaca75b6b64c3ac9bc50fc0974e48c76691869977907fad25eea834f3c85', ++ check_sha, + '-o', 'LICENSE.nodict.fodt.zck', + join_paths(file_path, 'LICENSE.fodt') + ] + ) ++ ++check_sha = 'fedf75caa19cc03383b2a2abac75a490360f9bab6419c9f9241bae584fe64f04' ++if zstd_dep.version().version_compare('<=1.3.4') ++ check_sha = '0512327cc771a73c23377dd3804fffcaa557dd03cfd980dae22100f7b2193255' ++endif + test( + 'compress auto-chunked file - dict', + shacheck, + args: [ + zck, + 'LICENSE.dict.fodt.zck', +- 'fedf75caa19cc03383b2a2abac75a490360f9bab6419c9f9241bae584fe64f04', ++ check_sha, + '-D', join_paths(file_path, 'LICENSE.dict'), + '-o', 'LICENSE.dict.fodt.zck', + join_paths(file_path, 'LICENSE.fodt') + ] + ) ++ ++check_sha = 'cba69c5fc88fda4352470f3eb0fe5df04e9f1f08c88e0af5a96e53ed3f84526c' ++if zstd_dep.version().version_compare('<=1.3.4') ++ check_sha = '53205d490819bbb681224e21acf0b85ec44c62c5c1f46e59bd084ac471ed534c' ++endif + test( + 'compress manual file - no dict', + shacheck, + args: [ + zck, + 'LICENSE.manual.nodict.fodt.zck', +- 'cba69c5fc88fda4352470f3eb0fe5df04e9f1f08c88e0af5a96e53ed3f84526c', ++ check_sha, + '-m', + '-s', ' - 0.9.5-1 +* Wed Aug 01 2018 Jonathan Dieter - 0.9.5-1.1 - Update to 0.9.4 - Fix failing tests on ppc64, ppc64le, arm7, and s390x - Fix intermittent parallel test failures +- Add upstream patch to fix tests against zstd-1.3.4 * Tue Jul 31 2018 Jonathan Dieter - 0.9.3-1 - Update to 0.9.3 From c19fe03f0576b2d12e794b59347f7568460d5dce Mon Sep 17 00:00:00 2001 From: Jonathan Dieter Date: Fri, 10 Aug 2018 14:21:01 +0200 Subject: [PATCH 2/3] Remove unneeded patch Signed-off-by: Jonathan Dieter --- ...y-work-with-zstd-1.3.4-as-well-as-1..patch | 91 ------------------- 1 file changed, 91 deletions(-) delete mode 100644 0001-Fix-tests-so-they-work-with-zstd-1.3.4-as-well-as-1..patch diff --git a/0001-Fix-tests-so-they-work-with-zstd-1.3.4-as-well-as-1..patch b/0001-Fix-tests-so-they-work-with-zstd-1.3.4-as-well-as-1..patch deleted file mode 100644 index 3a5e4e8..0000000 --- a/0001-Fix-tests-so-they-work-with-zstd-1.3.4-as-well-as-1..patch +++ /dev/null @@ -1,91 +0,0 @@ -From a1a67927f566a7c6b8e44f23a6ab76ceb19dd490 Mon Sep 17 00:00:00 2001 -From: Jonathan Dieter -Date: Wed, 1 Aug 2018 18:19:36 +0100 -Subject: [PATCH] Fix tests so they work with zstd <= 1.3.4 as well as 1.3.5+ - -Signed-off-by: Jonathan Dieter ---- - test/meson.build | 28 ++++++++++++++++++++++++---- - 1 file changed, 24 insertions(+), 4 deletions(-) - -diff --git a/test/meson.build b/test/meson.build -index 2c9af81..c052cfb 100644 ---- a/test/meson.build -+++ b/test/meson.build -@@ -140,49 +140,69 @@ test( - join_paths(file_path, 'LICENSE.manual.dict.fodt.zck') - ] - ) -+ -+check_sha = '0418aaca75b6b64c3ac9bc50fc0974e48c76691869977907fad25eea834f3c85' -+if zstd_dep.version().version_compare('<=1.3.4') -+ check_sha = '08c9ce94470ad4ab7f8a64e67872e138964eb562d13686d9c941baa3a09d2835' -+endif - test( - 'compress auto-chunked file - no dict', - shacheck, - args: [ - zck, - 'LICENSE.nodict.fodt.zck', -- '0418aaca75b6b64c3ac9bc50fc0974e48c76691869977907fad25eea834f3c85', -+ check_sha, - '-o', 'LICENSE.nodict.fodt.zck', - join_paths(file_path, 'LICENSE.fodt') - ] - ) -+ -+check_sha = 'fedf75caa19cc03383b2a2abac75a490360f9bab6419c9f9241bae584fe64f04' -+if zstd_dep.version().version_compare('<=1.3.4') -+ check_sha = '0512327cc771a73c23377dd3804fffcaa557dd03cfd980dae22100f7b2193255' -+endif - test( - 'compress auto-chunked file - dict', - shacheck, - args: [ - zck, - 'LICENSE.dict.fodt.zck', -- 'fedf75caa19cc03383b2a2abac75a490360f9bab6419c9f9241bae584fe64f04', -+ check_sha, - '-D', join_paths(file_path, 'LICENSE.dict'), - '-o', 'LICENSE.dict.fodt.zck', - join_paths(file_path, 'LICENSE.fodt') - ] - ) -+ -+check_sha = 'cba69c5fc88fda4352470f3eb0fe5df04e9f1f08c88e0af5a96e53ed3f84526c' -+if zstd_dep.version().version_compare('<=1.3.4') -+ check_sha = '53205d490819bbb681224e21acf0b85ec44c62c5c1f46e59bd084ac471ed534c' -+endif - test( - 'compress manual file - no dict', - shacheck, - args: [ - zck, - 'LICENSE.manual.nodict.fodt.zck', -- 'cba69c5fc88fda4352470f3eb0fe5df04e9f1f08c88e0af5a96e53ed3f84526c', -+ check_sha, - '-m', - '-s', ' Date: Thu, 20 May 2021 20:53:27 +0100 Subject: [PATCH 3/3] Update to 1.1.13 Signed-off-by: Jonathan Dieter --- zchunk.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zchunk.spec b/zchunk.spec index fdc7a42..5d7b117 100644 --- a/zchunk.spec +++ b/zchunk.spec @@ -1,5 +1,5 @@ Name: zchunk -Version: 1.1.11 +Version: 1.1.13 Release: 1%{?dist} Summary: Compressed file format that allows easy deltas License: BSD and MIT @@ -84,6 +84,9 @@ install contrib/gen_xml_dictionary %{buildroot}%{_libexecdir}/zck_gen_xml_dictio %{_includedir}/zck.h %changelog +* Thu May 20 2021 Jonathan Dieter - 1.1.13-1 +- Fix tests on all arches when built against zstd-1.5.0 + * Sat May 1 2021 Jonathan Dieter - 1.1.11-1 - Fix multipart download failures on rare web servers