Source: burp Followup-For: Bug #1057880 X-Debbugs-Cc: z...@debian.org, broo...@debian.org
Dear Maintainer, Attached is a patch that includes the changes applied by Ubuntu[1] to remove the problematic unit test version check from their source package. For visibility, on cc are Shengjing Zhu (as the patch author) and Broonie (as zlib maintainer in Debian). Regards, James [1] - https://bugs.launchpad.net/ubuntu/+source/burp/+bug/2046149
diff --git a/debian/changelog b/debian/changelog index 1974a93..c18448e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +burp (3.1.4-3ubuntu1) noble; urgency=medium + + * Add patch to remove unnecessary but broken zlib version check in fzp test + (Closes: #1057880, LP: #2046149) + + -- Shengjing Zhu <shengjing....@canonical.com> Mon, 11 Dec 2023 18:59:33 +0800 + burp (3.1.4-3) unstable; urgency=medium * fix cleanup target (Closes: #1044122) diff --git a/debian/patches/remove-unnecessary-but-broken-zlib-version-check-in-fzp-t.patch b/debian/patches/remove-unnecessary-but-broken-zlib-version-check-in-fzp-t.patch new file mode 100644 index 0000000..a86d269 --- /dev/null +++ b/debian/patches/remove-unnecessary-but-broken-zlib-version-check-in-fzp-t.patch @@ -0,0 +1,23 @@ +From: Shengjing Zhu <shengjing....@canonical.com> +Date: Mon, 11 Dec 2023 18:56:13 +0800 +Subject: remove unnecessary but broken zlib version check in fzp test + +Debian-Bug: http://bugs.debian.org/1057880 +Ubuntu-Bug: https://launchpad.net/bugs/2046149 +--- + utest/test_fzp.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/utest/test_fzp.c b/utest/test_fzp.c +index 856eae1..cac280c 100644 +--- a/utest/test_fzp.c ++++ b/utest/test_fzp.c +@@ -179,8 +179,6 @@ END_TEST + + START_TEST(test_fzp_gzseek) + { +- if(version_to_long(ZLIB_VERSION) <= version_to_long("1.2.3")) +- fzp_gzopen_old_zlib_seek_hack=1; + do_seek_tests(fzp_gzopen); + } + END_TEST diff --git a/debian/patches/series b/debian/patches/series index 8e3360f..a81b657 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ CVE-2017-16516.patch CVE-2022-24795.patch CVE-2023-33460-part1.patch CVE-2023-33460-part2.patch +remove-unnecessary-but-broken-zlib-version-check-in-fzp-t.patch
