From 1c0511dcecde8c5fca58baa0ec8f3e88c47ef165 Mon Sep 17 00:00:00 2001 From: Peter Pentchev Date: Fri, 12 Aug 2022 16:47:59 +0300 Subject: [PATCH] Update the Debian packaging for zchunk-1.2.2. --- debian/changelog | 5 ++++- debian/patches/cppcheck.patch | 6 +++--- debian/patches/series | 1 - debian/patches/test-checksums.patch | 18 ------------------ 4 files changed, 7 insertions(+), 23 deletions(-) delete mode 100644 debian/patches/test-checksums.patch diff --git a/debian/changelog b/debian/changelog index e5d063f..f7c0d50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -zchunk (1.2.1+ds1-2) UNRELEASED; urgency=medium +zchunk (1.2.2+ds1-1) UNRELEASED; urgency=medium * Declare compliance with Policy 4.6.1 with no changes. * Add the cppcheck patch to fix some minor issues. @@ -8,6 +8,9 @@ zchunk (1.2.1+ds1-2) UNRELEASED; urgency=medium - move some checkers' options to pyproject.toml and setup.cfg - push the source down into a debian/tests/python/ subdirectory * Add an EditorConfig definitions file for debian/*. + * New upstream version: + - drop the test-checksums patch, integrated upstream + - refresh the line numbers in the cppcheck patch -- Peter Pentchev Fri, 12 Aug 2022 13:14:48 +0300 diff --git a/debian/patches/cppcheck.patch b/debian/patches/cppcheck.patch index 5debaf9..db69d1c 100644 --- a/debian/patches/cppcheck.patch +++ b/debian/patches/cppcheck.patch @@ -27,7 +27,7 @@ Last-Update: 2022-08-12 } --- a/src/lib/hash/hash.c +++ b/src/lib/hash/hash.c -@@ -313,7 +313,7 @@ +@@ -316,7 +316,7 @@ unsigned char *digest = zmalloc(SHA1_DIGEST_LENGTH); if (!digest) { zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__); @@ -36,7 +36,7 @@ Last-Update: 2022-08-12 } SHA1_Final((sha1_byte*)digest, (SHA_CTX *)hash->ctx); hash_close(hash); -@@ -322,7 +322,7 @@ +@@ -325,7 +325,7 @@ unsigned char *digest = zmalloc(SHA256_DIGEST_SIZE); if (!digest) { zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__); @@ -45,7 +45,7 @@ Last-Update: 2022-08-12 } SHA256_Final(digest, (SHA256_CTX *)hash->ctx); hash_close(hash); -@@ -332,7 +332,7 @@ +@@ -335,7 +335,7 @@ unsigned char *digest = zmalloc(SHA512_DIGEST_SIZE); if (!digest) { zck_log(ZCK_LOG_ERROR, "OOM in %s", __func__); diff --git a/debian/patches/series b/debian/patches/series index a18cf92..398da5b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ typos.patch -test-checksums.patch cppcheck.patch diff --git a/debian/patches/test-checksums.patch b/debian/patches/test-checksums.patch deleted file mode 100644 index 6d9250f..0000000 --- a/debian/patches/test-checksums.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Fix the test suite checksums for libzstd 1.4.10. -Bug-Debian: https://bugs.debian.org/1009427 -Forwarded: https://github.com/zchunk/zchunk/pull/73 -Author: Peter Pentchev -Last-Update: 2022-04-13 - ---- a/test/meson.build -+++ b/test/meson.build -@@ -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 -- 2.30.2