Fix the test suite with recent versions of zstd.

Closes: #978320
Reported by: Lucas Nussbaum <lucas@debian.org>

diff --git a/debian/changelog b/debian/changelog
index 5956cadd17bcb23db244500badcb5e8c1341661f..95ddf842e41b01cb3af0aa5faff3466e7618a62c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zchunk (1.1.7+ds1-2) UNRELEASED; urgency=medium
+
+  * Add the test-checksums upstream fix for test data checksums varying
+    with recent versions of zstd. Closes: #978320
+
+ -- Peter Pentchev <roam@debian.org>  Sat, 02 Jan 2021 18:45:28 +0200
+
 zchunk (1.1.7+ds1-1) unstable; urgency=medium
 
   * Reformat the source of the autopkgtest using black 20.

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..7ba8619
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+test-checksums.patch

diff --git a/debian/patches/test-checksums.patch b/debian/patches/test-checksums.patch
new file mode 100644 (file)
index 0000000..5ba9a9c
--- /dev/null
+++ b/debian/patches/test-checksums.patch
@@ -0,0 +1,56 @@
+Description: Handle zstd 1.4.7+
+Origin: upstream; https://github.com/zchunk/zchunk/commit/d2eae512bee09a4047cfe586de12f644d73b0736#diff-fb327c87db6b2c02c67999cd120ccf98eb09d654b487f2612366306f9d6ffd9c
+Author: Jonathan Dieter <jdieter@gmail.com>
+Bug-Debian: https://bugs.debian.org/978320
+Last-Update: 2021-01-02
+
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -214,7 +214,10 @@
+ )
+ 
+ if build_machine.endian() != 'big'
+-    check_sha = '45e48c11fea129d2c434ffcec7d8fbc1720f30f33d438654cd117616121c218e'
++    check_sha = 'eff3098803ba80f0c446d49f48188f89167d7f29cdc8a98c19f0ecfb4e2ee3c9'
++    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6')
++        check_sha = '45e48c11fea129d2c434ffcec7d8fbc1720f30f33d438654cd117616121c218e'
++    endif
+     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.5')
+         check_sha = '45e48c11fea129d2c434ffcec7d8fbc1720f30f33d438654cd117616121c218e'
+     endif
+@@ -234,7 +237,10 @@
+         ]
+     )
+ 
+-    check_sha = 'b4805798547be62421944a87db3a90de455b4772c6013e685720b49336b8b17e'
++    check_sha = 'b86795ca14eb04b382d1c7f94501aa5d1a2ddb05a5351c0235d00edb954e9b66'
++    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6')
++        check_sha = 'b4805798547be62421944a87db3a90de455b4772c6013e685720b49336b8b17e'
++    endif
+     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.4')
+         check_sha = '0fb0f2262c62714063e409117fcbd4c114b35e3abbfc90b042a41246b62ff789'
+     endif
+@@ -252,7 +258,10 @@
+     )
+ endif
+ 
+-check_sha = '9472ddc74dbd96291077bbb8d793e605824be8dba45e3e94bbc54b7de21a37a1'
++check_sha = 'c46929367cd3d05daaca3b44657726791b428fb2198f5e7e5367b5cc781307aa'
++if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6')
++    check_sha = '9472ddc74dbd96291077bbb8d793e605824be8dba45e3e94bbc54b7de21a37a1'
++endif
+ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.5')
+     check_sha = '6911b50cad5b6ed3ee89322338c559afdd0e72f614d3817b47ce370df52fd6b4'
+ endif
+@@ -276,7 +285,10 @@
+     ]
+ )
+ 
+-check_sha = '4e86b47410a3a5090c7d60040d24d8d390c31f16f96ea112c8f153888eaf8c6e'
++check_sha = '5fc2449aeb51f6a898529fa4d53b04de6df6a352826f819dc2b39b153ddaa788'
++if zstd_dep.found() and zstd_dep.version().version_compare('<=1.4.6')
++    check_sha = '4e86b47410a3a5090c7d60040d24d8d390c31f16f96ea112c8f153888eaf8c6e'
++endif
+ if zstd_dep.found() and zstd_dep.version().version_compare('<=1.3.5')
+     check_sha = '62ee66fbf41a1f18617f400383eb38905050050f0f435a6e56df4a30d1bb694d'
+ endif