Control: tags 984166 + patch Control: tags 984166 + pending Dear maintainer,
I've prepared an NMU for hashdeep (versioned as 4.4-7.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru hashdeep-4.4/debian/changelog hashdeep-4.4/debian/changelog --- hashdeep-4.4/debian/changelog 2021-02-02 18:41:47.000000000 +0200 +++ hashdeep-4.4/debian/changelog 2021-11-23 20:46:29.000000000 +0200 @@ -1,3 +1,10 @@ +hashdeep (4.4-7.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream fix for FTBFS with gcc 11. (Closes: #984166) + + -- Adrian Bunk <b...@debian.org> Tue, 23 Nov 2021 20:46:29 +0200 + hashdeep (4.4-7) unstable; urgency=medium [ Debian Janitor ] diff -Nru hashdeep-4.4/debian/patches/0001-Fix-errors-found-by-clang.patch hashdeep-4.4/debian/patches/0001-Fix-errors-found-by-clang.patch --- hashdeep-4.4/debian/patches/0001-Fix-errors-found-by-clang.patch 1970-01-01 02:00:00.000000000 +0200 +++ hashdeep-4.4/debian/patches/0001-Fix-errors-found-by-clang.patch 2021-11-23 20:46:15.000000000 +0200 @@ -0,0 +1,32 @@ +From 6ef69a26126ee4e69a25392fd456b8a66c51dffd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.k...@gmail.com> +Date: Tue, 15 Nov 2016 02:46:55 +0000 +Subject: Fix errors found by clang + +Fixes errors like + +../../git/src/hash.cpp:282:19: error: ordered comparison between pointer and zero ('const unsigned char *' and 'int') + if(fdht->base>0){ + ~~~~~~~~~~^~ + +Signed-off-by: Khem Raj <raj.k...@gmail.com> +--- + src/hash.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/hash.cpp b/src/hash.cpp +index 4216157..52f419b 100644 +--- a/src/hash.cpp ++++ b/src/hash.cpp +@@ -279,7 +279,7 @@ void file_data_hasher_t::hash() + MAP_FILE| + #endif + MAP_SHARED,fd,0); +- if(fdht->base>0){ ++ if(fdht->base != (void *) -1){ + /* mmap is successful, so set the bounds. + * if it is not successful, we default to reading the fd + */ +-- +2.20.1 + diff -Nru hashdeep-4.4/debian/patches/series hashdeep-4.4/debian/patches/series --- hashdeep-4.4/debian/patches/series 2021-02-02 18:41:47.000000000 +0200 +++ hashdeep-4.4/debian/patches/series 2021-11-23 20:46:29.000000000 +0200 @@ -1,2 +1,3 @@ fix-manpages.patch fix-FTBFS-Hurd.patch +0001-Fix-errors-found-by-clang.patch