From 214b97a505a200464f1553557e4841d5b5d50a00 Mon Sep 17 00:00:00 2001 From: Peter Pentchev Date: Fri, 15 Apr 2022 09:08:30 +0300 Subject: [PATCH] Update the Debian packaging for zchunk-1.2.0. --- debian/changelog | 8 ++++- debian/libzck1.symbols | 7 ++++ debian/patches/cppcheck.patch | 45 ------------------------- debian/patches/series | 1 - debian/patches/test-checksums.patch | 51 ++++------------------------- 5 files changed, 21 insertions(+), 91 deletions(-) delete mode 100644 debian/patches/cppcheck.patch diff --git a/debian/changelog b/debian/changelog index b8e018c..28e9813 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,14 @@ -zchunk (1.1.16+ds1-2) UNRELEASED; urgency=medium +zchunk (1.2.0+ds1-1) UNRELEASED; urgency=medium * Add the test-checksums patch to fix the test suite with versions 1.4.10 and 1.5.0 of libzstd. * Add the year 2022 to my debian/* copyright notice. + * New upstream release: + - drop the cppcheck patch, integrated upstream + - drop most of the chunks in the test-checksums patch (they were taken + from the 1.2.x source), only leaving the one handling the difference + between libzstd-1.4.10 and libzstd-1.5.0 + - update the symbols file -- Peter Pentchev Wed, 13 Apr 2022 11:37:47 +0300 diff --git a/debian/libzck1.symbols b/debian/libzck1.symbols index 0e77a42..df47bd9 100644 --- a/debian/libzck1.symbols +++ b/debian/libzck1.symbols @@ -21,8 +21,10 @@ libzck.so.1 libzck1 #MINVER# zck_dl_set_zck@Base 1.1.6 zck_end_chunk@Base 1.1.6 zck_failed_chunks@Base 1.1.6 + zck_find_matching_chunks@Base 1.2.0+ds1 zck_find_valid_chunks@Base 1.1.6 zck_free@Base 1.1.6 + zck_generate_hashdb@Base 1.2.0+ds1 zck_get_chunk@Base 1.1.6 zck_get_chunk_comp_data@Base 1.1.6 zck_get_chunk_comp_size@Base 1.1.6 @@ -30,6 +32,7 @@ libzck.so.1 libzck1 #MINVER# zck_get_chunk_data@Base 1.1.6 zck_get_chunk_digest@Base 1.1.6 zck_get_chunk_digest_size@Base 1.1.6 + zck_get_chunk_digest_uncompressed@Base 1.2.0+ds1 zck_get_chunk_hash_type@Base 1.1.6 zck_get_chunk_number@Base 1.1.6 zck_get_chunk_size@Base 1.1.6 @@ -40,6 +43,7 @@ libzck.so.1 libzck1 #MINVER# zck_get_error@Base 1.1.6 zck_get_fd@Base 1.1.6 zck_get_first_chunk@Base 1.1.6 + zck_get_flags@Base 1.2.0+ds1 zck_get_full_digest_size@Base 1.1.6 zck_get_full_hash_type@Base 1.1.6 zck_get_header_digest@Base 1.1.6 @@ -52,11 +56,13 @@ libzck.so.1 libzck1 #MINVER# zck_get_range@Base 1.1.6 zck_get_range_char@Base 1.1.6 zck_get_range_count@Base 1.1.6 + zck_get_src_chunk@Base 1.2.0+ds1 zck_hash_name_from_type@Base 1.1.6 zck_header_cb@Base 1.1.6 zck_init_adv_read@Base 1.1.6 zck_init_read@Base 1.1.6 zck_init_write@Base 1.1.6 + zck_is_detached_header@Base 1.2.0+ds1 zck_is_error@Base 1.1.6 zck_missing_chunks@Base 1.1.6 zck_range_free@Base 1.1.6 @@ -66,6 +72,7 @@ libzck.so.1 libzck1 #MINVER# zck_reset_failed_chunks@Base 1.1.6 zck_set_fd@Base 1.1.6 zck_set_ioption@Base 1.1.6 + zck_set_log_callback@Base 1.2.0+ds1 zck_set_log_fd@Base 1.1.6 zck_set_log_level@Base 1.1.6 zck_set_soption@Base 1.1.6 diff --git a/debian/patches/cppcheck.patch b/debian/patches/cppcheck.patch deleted file mode 100644 index 67581f7..0000000 --- a/debian/patches/cppcheck.patch +++ /dev/null @@ -1,45 +0,0 @@ -Description: Fix some nits reported by cppcheck. -Forwarded: https://github.com/zchunk/zchunk/pull/46 -Author: Peter Pentchev -Last-Update: 2021-08-22 - ---- a/test/read_single_chunk.c -+++ b/test/read_single_chunk.c -@@ -69,7 +69,7 @@ - exit(1); - } - zckChunk *chunk1 = zck_get_chunk(zck, 1); -- if(chunk == NULL) { -+ if(chunk1 == NULL) { - printf("%s", zck_get_error(zck)); - zck_free(&zck); - exit(1); ---- a/src/lib/comp/zstd/zstd.c -+++ b/src/lib/comp/zstd/zstd.c -@@ -37,7 +37,9 @@ - VALIDATE_BOOL(zck); - ALLOCD_BOOL(zck, comp); - -+#ifndef OLD_ZSTD - size_t retval = 0; -+#endif - - comp->cctx = ZSTD_createCCtx(); - #ifndef OLD_ZSTD ---- a/src/lib/io.c -+++ b/src/lib/io.c -@@ -115,11 +115,13 @@ - char *data = zmalloc(BUF_SIZE); - - while((read_count = read(zck->temp_fd, data, BUF_SIZE)) > 0) { -- if(read_count == -1 || !write_data(zck, zck->fd, data, read_count)) { -+ if(!write_data(zck, zck->fd, data, read_count)) { - free(data); - return false; - } - } - free(data); -+ if(read_count == -1) -+ return false; - return true; - } diff --git a/debian/patches/series b/debian/patches/series index 80be891..c7d7dd6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -cppcheck.patch typos.patch test-checksums.patch diff --git a/debian/patches/test-checksums.patch b/debian/patches/test-checksums.patch index 8b96a43..da99399 100644 --- a/debian/patches/test-checksums.patch +++ b/debian/patches/test-checksums.patch @@ -1,53 +1,16 @@ -Description: Fix the test suite checksums for libzstd 1.4.10 and 1.5.0. -Last-Update: 2022-04-11 +Description: Fix the test suite checksums for libzstd 1.4.10. +Author: Peter Pentchev +Last-Update: 2022-04-13 --- a/test/meson.build +++ b/test/meson.build -@@ -214,7 +214,10 @@ - ) - - if build_machine.endian() != 'big' -- check_sha = '4f07f865bb15624cf854aa369e14a3538ad9e9bf98e233036d37d2568e60b7cc' -+ check_sha = 'ac9d431f1f568d8921257fa17929c320f0cdcbff450d9f3c38c78c4f410ee788' +@@ -250,6 +250,9 @@ + if zstd_dep.found() and zstd_dep.version().version_compare('<=1.5.0') + check_sha = '4f07f865bb15624cf854aa369e14a3538ad9e9bf98e233036d37d2568e60b7cc' + endif + 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 -- 2.30.2