Control: tags 980592 + pending Dear maintainer,
I've prepared an NMU for clamav (versioned as 0.103.0+dfsg-3.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Cheers -- Sebastian Ramacher
diff -Nru clamav-0.103.0+dfsg/debian/changelog clamav-0.103.0+dfsg/debian/changelog
--- clamav-0.103.0+dfsg/debian/changelog 2020-11-03 22:03:19.000000000 +0100
+++ clamav-0.103.0+dfsg/debian/changelog 2021-02-21 16:00:07.000000000 +0100
@@ -1,3 +1,11 @@
+clamav (0.103.0+dfsg-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches: Apply upstream patch to fix call of ck_assert_msg (Closes:
+ #980592)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Sun, 21 Feb 2021 16:00:07 +0100
+
clamav (0.103.0+dfsg-3) unstable; urgency=medium
* Update apparmor profile for clamd. Thanks to Stefano Callegari.
diff -Nru clamav-0.103.0+dfsg/debian/patches/Fix-ck_assert_msg-call.patch clamav-0.103.0+dfsg/debian/patches/Fix-ck_assert_msg-call.patch
--- clamav-0.103.0+dfsg/debian/patches/Fix-ck_assert_msg-call.patch 1970-01-01 01:00:00.000000000 +0100
+++ clamav-0.103.0+dfsg/debian/patches/Fix-ck_assert_msg-call.patch 2021-02-21 16:00:07.000000000 +0100
@@ -0,0 +1,23 @@
+From 18306a889918187a63e80c07fd5edd2241e1906b Mon Sep 17 00:00:00 2001
+From: Orion Poplawski <or...@nwra.com>
+Date: Thu, 17 Sep 2020 22:26:04 -0600
+Subject: [PATCH] unit tests: Fix ck_assert_msg() call
+
+The first argument to ck_assert_msg() should be a logical condition.
+---
+ unit_tests/check_jsnorm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unit_tests/check_jsnorm.c b/unit_tests/check_jsnorm.c
+index 5067a21a55..64f6bf8b37 100644
+--- a/unit_tests/check_jsnorm.c
++++ b/unit_tests/check_jsnorm.c
+@@ -247,7 +247,7 @@ static void tokenizer_test(const char *in, const char *expected, int split)
+ fd = open(filename, O_RDONLY);
+ if (fd < 0) {
+ jstest_teardown();
+- ck_assert_msg("failed to open output file: %s", filename);
++ ck_assert_msg(0, "failed to open output file: %s", filename);
+ }
+
+ diff_file_mem(fd, expected, len);
diff -Nru clamav-0.103.0+dfsg/debian/patches/series clamav-0.103.0+dfsg/debian/patches/series
--- clamav-0.103.0+dfsg/debian/patches/series 2020-11-01 20:07:16.000000000 +0100
+++ clamav-0.103.0+dfsg/debian/patches/series 2021-02-21 16:00:07.000000000 +0100
@@ -5,3 +5,4 @@
Add-support-for-LLVM-3.8.patch
Add-support-for-LLVM-3.9.patch
clamd-Use-localhost-as-default-hostname-for-connecti.patch
+Fix-ck_assert_msg-call.patch
signature.asc
Description: PGP signature
