diff --git a/clamav.spec b/clamav.spec index 7b705ce982a7a62277c091b6f10447e927ce6d13..affb45b3454ff3f4a5c6d14e1a3696acf16c973e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,7 +1,7 @@ Name: clamav Summary: End-user tools for the Clam Antivirus scanner Version: 0.103.2 -Release: 3 +Release: 4 License: GPLv2 and Public Domain and bzip2-1.0.6 and Zlib and Apache-2.0 URL: https://www.clamav.net/ @@ -28,8 +28,8 @@ Patch0004: clamav-check.patch Patch0005: clamav-clamonacc-service.patch Patch0006: clamav-freshclam.service.patch Patch0007: clamav-type-conversion.patch -Patch0008: clamav-return-val-process.patch -Patch0009: clamav-clamonacc-version-return.patch +Patch0008: clamav-clamonacc-version-return.patch +Patch0009: fix-clamonacc-w-error.patch BuildRequires: autoconf automake gettext-devel libtool libtool-ltdl-devel BuildRequires: gcc-c++ zlib-devel bzip2-devel gmp-devel curl-devel json-c-devel @@ -414,6 +414,9 @@ test -e %_var/log/clamav-milter.log || { %changelog +* Tue Dec 07 2021 chenchen - 0.103.2-4 +- fix clamonacc -w error + * Mon Aug 9 2021 caodongxia - 0.103.2-3 - fix clamonacc --version and --writer return value diff --git a/fix-clamonacc-w-error.patch b/fix-clamonacc-w-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..b4245d5d22c5b5561ff38962de8beed41e64cf57 --- /dev/null +++ b/fix-clamonacc-w-error.patch @@ -0,0 +1,25 @@ +From e5de0bd90f856ed8c9b4e05e6e9c4f46920112a6 Mon Sep 17 00:00:00 2001 +From: chen-jan +Date: Tue, 7 Dec 2021 08:18:21 +0000 +Subject: [PATCH] fix clamonacc -w error + +--- + clamonacc/client/client.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/clamonacc/client/client.c b/clamonacc/client/client.c +index 347070f..f507eee 100644 +--- a/clamonacc/client/client.c ++++ b/clamonacc/client/client.c +@@ -205,7 +205,7 @@ int16_t onas_ping_clamd(struct onas_context **ctx) + /* ping command takes the form --ping [attempts[:interval]] */ + opt = optget((*ctx)->opts, "ping"); + +- if (opt) { ++ if (opt && opt->strarg) { + attempt_str = cli_strdup(opt->strarg); + if (attempt_str) { + if (NULL == attempt_str) { +-- +2.30.0 +