Control: tags 1074989 + patch upstream fixed-upstream Dear getdns packaging team,
I have written a patch to fix this FTBFS error raised against getdns when built with gcc-14. According to <https://udd.debian.org/cgi-bin/autoremovals.cgi>, if I have interpreted the list correctly, getdns is "flagged for removal in 44 hours", so this might be urgent! On Wed, Jul 03, 2024 at 12:27:31PM +0000, Matthias Klose wrote: > [This bug is targeted to the upcoming trixie release] [...] > The package fails to build in a test rebuild on at least amd64 with > gcc-14/g++-14, but succeeds to build with gcc-13/g++-13. The > severity of this report will be raised before the trixie release. This patch fixes the following critical error wherein the two values to be asserted as equal are instead presented as different arguments to the assertion test function when not expected. getdns-1.6.0/src/test/check_getdns_dict_set_bindata.h: In function ‘getdns_dict_set_bindata_4_fn’: getdns-1.6.0/src/test/check_getdns_dict_set_bindata.h:115:60: error: passing argument 4 of ‘_ck_assert_failed’ makes pointer from integer without a cast [-Wint-conversion] 115 | ck_assert_msg(retrieved_bindata->size, second_bindata.size, | ~~~~~~~~~~~~~~^~~~~ | | | size_t {aka long unsigned int} /usr/include/check.h:506:75: note: expected ‘const char *’ but argument is of type ‘size_t’ {aka ‘long unsigned int’} 506 | const char *expr, const char *msg, My patch is available as a merge request at <https://salsa.debian.org/dns-team/getdns/-/merge_requests/4> and I would be grateful if you would consider merging it. I also attach the patch to this message. The fix for this bug is also included upstream and available in versions 1.7.0 onwards, therefore importing the latest upstream version would also fix this bug. Debian bug #1025781 requests that upstream version 1.7.2 be imported. Note that the salsa repository has not been updated to include the contents of the crucial NMU for the t64 transition (1.6.0-3.1), bug #1062103. I hope this helps! Thanks, Andrew
From 5159e4aeb312143e685ac47fed03e67f0ea316f0 Mon Sep 17 00:00:00 2001 From: Andrew Bower <and...@bower.uk> Date: Tue, 10 Dec 2024 19:17:12 +0000 Subject: [PATCH] Patch error in getdns tests to fix FTBFS with gcc-14. (Closes: #1074989) --- .../0006-Fix-incorrect-assertion.patch | 23 +++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 24 insertions(+) create mode 100644 debian/patches/0006-Fix-incorrect-assertion.patch diff --git a/debian/patches/0006-Fix-incorrect-assertion.patch b/debian/patches/0006-Fix-incorrect-assertion.patch new file mode 100644 index 00000000..10f32521 --- /dev/null +++ b/debian/patches/0006-Fix-incorrect-assertion.patch @@ -0,0 +1,23 @@ +Description: Fix incorrectly-written assertion breaking builds with gcc-14. + An assertion in test code was written incorrectly in a way that would always + succeed. This patch was independently developed to fix the Debian build but + the bug is also fixed as part of a larger patch fixing compiler warnings + upstream and is present in v1.7.0~rc.1 onwards. Importing the latest + upstream release will obviate the need for this patch. +Author: Andrew Bower <and...@bower.uk> +Bug-Debian: https://bugs.debian.org/1074989 +Forwarded: not-needed +Applied-Upstream: https://github.com/getdnsapi/getdns/commit/df2997d9b762d705d5f7add338e460686c9bd88f +Last-Update: 2024-12-10 + +--- getdns-1.6.0.orig/src/test/check_getdns_dict_set_bindata.h ++++ getdns-1.6.0/src/test/check_getdns_dict_set_bindata.h +@@ -112,7 +112,7 @@ + ASSERT_RC(getdns_dict_get_bindata(this_dict, "bindata", &retrieved_bindata), + GETDNS_RETURN_GOOD, "Return code from getdns_dict_get_bindata()"); + +- ck_assert_msg(retrieved_bindata->size, second_bindata.size, ++ ck_assert_msg(retrieved_bindata->size == second_bindata.size, + "Expected retrieved bindata size == %d, got: %d", + second_bindata.size, retrieved_bindata->size); + diff --git a/debian/patches/series b/debian/patches/series index 68cf200a..fa69b47f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0003-Fix-install-path-for-cmake-build-since-we-use-GNUIns.patch 0004-Fix-stubby.yml-install-path-for-debian.patch 0005-Fix-FindLibidn2-cmake.patch +0006-Fix-incorrect-assertion.patch -- 2.45.2
signature.asc
Description: PGP signature
