Fix the build with libzstd 1.4.10 and 1.5.0.

diff --git a/debian/changelog b/debian/changelog
index a15953b9ab84312f3bf2ab9c8179dde2019eb6ad..1ef4dc75195e5456d2338107a9f1f22c22e934ed 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zchunk (1.1.16+ds1-2) UNRELEASED; urgency=medium
+
+  * Add the test-checksums patch to fix the test suite with versions
+    1.4.10 and 1.5.0 of libzstd.
+
+ -- Peter Pentchev <roam@debian.org>  Mon, 11 Apr 2022 17:07:33 +0300
+
 zchunk (1.1.16+ds1-1) unstable; urgency=medium
 
   * Declare compliance with Policy 4.6.0 with no changes.

diff --git a/debian/patches/series b/debian/patches/series
index 1134958d66dc9c1196d7bb86e2860e494f2f8bd5..80be8916a8b54cd1eb3993496568af5522d1dd1f 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 cppcheck.patch
 typos.patch
+test-checksums.patch

diff --git a/debian/patches/test-checksums.patch b/debian/patches/test-checksums.patch
new file mode 100644 (file)
index 0000000..8b96a43
--- /dev/null
+++ b/debian/patches/test-checksums.patch
@@ -0,0 +1,53 @@
+Description: Fix the test suite checksums for libzstd 1.4.10 and 1.5.0.
+Last-Update: 2022-04-11
+
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -214,7 +214,10 @@
+ )
+ 
+ if build_machine.endian() != 'big'
+-    check_sha = '4f07f865bb15624cf854aa369e14a3538ad9e9bf98e233036d37d2568e60b7cc'
++    check_sha = 'ac9d431f1f568d8921257fa17929c320f0cdcbff450d9f3c38c78c4f410ee788'
++    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.10')
++        check_sha = 'c8c14ae369c341753e634b94fe1d071d3551f2b69469c2196e6dc657d613b975'
++    endif
+     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.9')
+         check_sha = 'eff3098803ba80f0c446d49f48188f89167d7f29cdc8a98c19f0ecfb4e2ee3c9'
+     endif
+@@ -251,7 +254,10 @@
+     )
+ 
+ 
+-    check_sha = '11d08d01c7877d51b84a0f97ebf651ca3304de10cdf207223df2dbc3295fa532'
++    check_sha = '35549b28b01c0a43d7389d4c40d5b750c73fb6c0c6701355ef709ef4a37df389'
++    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.10')
++        check_sha = '11d08d01c7877d51b84a0f97ebf651ca3304de10cdf207223df2dbc3295fa532'
++    endif
+     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.9')
+         check_sha = 'b86795ca14eb04b382d1c7f94501aa5d1a2ddb05a5351c0235d00edb954e9b66'
+     endif
+@@ -285,7 +291,10 @@
+         is_parallel: false
+     )
+ 
+-    check_sha = 'db42e903a2cf3b859835298272ff45bff6d2435d32fe7fda2bfe2815ab161994'
++    check_sha = '2580f66412adce1ed8d92abc09b0f64eb155155f61e21a8269a2c4a338857e51'
++    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.10')
++        check_sha = 'db42e903a2cf3b859835298272ff45bff6d2435d32fe7fda2bfe2815ab161994'
++    endif
+     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.9')
+         check_sha = 'c46929367cd3d05daaca3b44657726791b428fb2198f5e7e5367b5cc781307aa'
+     endif
+@@ -326,7 +335,10 @@
+         is_parallel: false
+     )
+ 
+-    check_sha = 'ee8df850bc4797e6696b966a74a459129b0f6d23dfb720d1cc8cba6f2b209dd2'
++    check_sha = '863dc2bda721a32c26485eeb2223d5dabcf9ac517ecba8c7991fa0120d04c937'
++    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0')
++        check_sha = 'ee8df850bc4797e6696b966a74a459129b0f6d23dfb720d1cc8cba6f2b209dd2'
++    endif
+     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.9')
+         check_sha = '5fc2449aeb51f6a898529fa4d53b04de6df6a352826f819dc2b39b153ddaa788'
+     endif