Add the upstream-zstd-1.5.4 patch to fix the FTBFS

Closes: #1031485

diff --git a/debian/changelog b/debian/changelog
index 9e87b9482f3de1626c41ee0d0a4e9acfe8e20704..0ff8509ebbf6a076324d5b0e9d1178aa3b4be744 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+zchunk (1.2.3+ds1-2) UNRELEASED; urgency=medium
+
+  * Add the upstream-zstd-1.5.4 patch to make the test suite pass
+    against libzstd-1.5.4. Closes: #1031485
+
+ -- Peter Pentchev <roam@debian.org>  Wed, 22 Feb 2023 11:03:47 +0200
+
 zchunk (1.2.3+ds1-1) unstable; urgency=medium
 
   * Declare compliance with Policy 4.6.2 with no changes.

diff --git a/debian/patches/series b/debian/patches/series
index 398da5b99b25333dd15225913bd0d823c184035e..924ba3a6ee7f4f8cafe376fe5308936132ff948d 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 typos.patch
 cppcheck.patch
+upstream-zstd-1.5.4.patch

diff --git a/debian/patches/upstream-zstd-1.5.4.patch b/debian/patches/upstream-zstd-1.5.4.patch
new file mode 100644 (file)
index 0000000..1087df6
--- /dev/null
+++ b/debian/patches/upstream-zstd-1.5.4.patch
@@ -0,0 +1,56 @@
+Description: Update tests to handle zstd 1.5.4
+Bug-Debian: https://bugs.debian.org/1031485
+Origin: upstream, https://github.com/zchunk/zchunk/commit/7b84aabb0ff0365e57ae35178eeeb610fc3c0888
+Author: Jonathan Dieter <jdieter@gmail.com>
+Last-Update: 2023-02-22
+
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -251,7 +251,10 @@
+ )
+ 
+ if build_machine.endian() != 'big'
+-    check_sha = 'ac9d431f1f568d8921257fa17929c320f0cdcbff450d9f3c38c78c4f410ee788'
++    check_sha = '7412757c744bcb17a112fedcbec6914d307bc4d2ab5936a2b6908a64a5c8c0ec'
++    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.3')
++        check_sha = 'ac9d431f1f568d8921257fa17929c320f0cdcbff450d9f3c38c78c4f410ee788'
++    endif
+     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0')
+         check_sha = '4f07f865bb15624cf854aa369e14a3538ad9e9bf98e233036d37d2568e60b7cc'
+     endif
+@@ -294,7 +297,10 @@
+     )
+ 
+ 
+-    check_sha = '35549b28b01c0a43d7389d4c40d5b750c73fb6c0c6701355ef709ef4a37df389'
++    check_sha = '25669f40abd98cc6a010173ad9891960ef56f12fad2ba95acb642ca11a98e96f'
++    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.3')
++        check_sha = '35549b28b01c0a43d7389d4c40d5b750c73fb6c0c6701355ef709ef4a37df389'
++    endif
+     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0')
+         check_sha = '11d08d01c7877d51b84a0f97ebf651ca3304de10cdf207223df2dbc3295fa532'
+     endif
+@@ -331,7 +337,10 @@
+         is_parallel: false
+     )
+ 
+-    check_sha = '2580f66412adce1ed8d92abc09b0f64eb155155f61e21a8269a2c4a338857e51'
++    check_sha = 'f9057c70daf878ec93b86156ccabb4ce4549d409fe0446b4f88a0f88f916956b'
++    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.3')
++        check_sha = '2580f66412adce1ed8d92abc09b0f64eb155155f61e21a8269a2c4a338857e51'
++    endif
+     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0')
+         check_sha = 'db42e903a2cf3b859835298272ff45bff6d2435d32fe7fda2bfe2815ab161994'
+     endif
+@@ -380,7 +389,10 @@
+         is_parallel: false
+     )
+ 
+-    check_sha = '863dc2bda721a32c26485eeb2223d5dabcf9ac517ecba8c7991fa0120d04c937'
++    check_sha = 'ec068277d5277b2c7c3c45e25f5b23a0e7ef56fd4c0463db28255642850379ab'
++    if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.3')
++        check_sha = '863dc2bda721a32c26485eeb2223d5dabcf9ac517ecba8c7991fa0120d04c937'
++    endif
+     if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0')
+         check_sha = 'ee8df850bc4797e6696b966a74a459129b0f6d23dfb720d1cc8cba6f2b209dd2'
+     endif