From 1bba44424aefd10b7fcc6175db279d39cd9603db Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Thu, 26 May 2022 12:04:05 +0800 Subject: [PATCH] Fix clamonacc -w error (cherry picked from commit 3da72a2339ed09448e7c5f54ead4cc68ab7857ec) --- clamav-return-val-process.patch | 34 ------------------- clamav.spec | 11 ++++-- fix-clamonacc-w-error.patch | 25 ++++++++++++++ ...mbc-command-under-the-clamav-package.patch | 12 +++++++ 4 files changed, 45 insertions(+), 37 deletions(-) delete mode 100644 clamav-return-val-process.patch create mode 100644 fix-clamonacc-w-error.patch create mode 100644 fix-the-failure-to-execute-the-clambc-command-under-the-clamav-package.patch diff --git a/clamav-return-val-process.patch b/clamav-return-val-process.patch deleted file mode 100644 index 7ffcf2b..0000000 --- a/clamav-return-val-process.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fe45bca164deeb1be053f5755546d71cc5dfd89b Mon Sep 17 00:00:00 2001 -From: caodongxia <315816521@qq.com> -Date: Mon, 9 Aug 2021 14:27:22 +0800 -Subject: [PATCH] fix-return-val-process - ---- - clamonacc/client/client.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/clamonacc/client/client.c b/clamonacc/client/client.c -index 347070f..71c153d 100644 ---- a/clamonacc/client/client.c -+++ b/clamonacc/client/client.c -@@ -207,12 +207,12 @@ int16_t onas_ping_clamd(struct onas_context **ctx) - - if (opt) { - attempt_str = cli_strdup(opt->strarg); -+ if (NULL == attempt_str) { -+ logg("!could not allocate memory for string\n"); -+ ret = -1; -+ goto done; -+ } - if (attempt_str) { -- if (NULL == attempt_str) { -- logg("!could not allocate memory for string\n"); -- ret = -1; -- goto done; -- } - interval_str = strchr(attempt_str, ':'); - if ((NULL != interval_str) && (interval_str[0] != '\0')) { - interval_str[0] = '\0'; --- -2.27.0 - diff --git a/clamav.spec b/clamav.spec index 2a2dbd4..051afab 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.6 -Release: 2 +Release: 3 License: GPLv2 and Public Domain and bzip2-1.0.6 and Zlib and Apache-2.0 URL: https://www.clamav.net/ @@ -27,8 +27,9 @@ Patch0003: clamav-0.99-private.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 +Patch0010: fix-the-failure-to-execute-the-clambc-command-under-the-clamav-package.patch BuildRequires: autoconf automake gettext-devel libtool libtool-ltdl-devel BuildRequires: gcc-c++ zlib-devel bzip2-devel gmp-devel curl-devel json-c-devel @@ -413,6 +414,10 @@ test -e %_var/log/clamav-milter.log || { %changelog +* Thu May 26 2022 liyanan - 0.103.6-3 +- Fix the failure to execute the clambc command under the clamav package +- Fix clamonacc -w error + * Wed May 25 2022 houyingchao - 0.103.6-2 - Fix start clamav-clamonacc-service diff --git a/fix-clamonacc-w-error.patch b/fix-clamonacc-w-error.patch new file mode 100644 index 0000000..b4245d5 --- /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 + diff --git a/fix-the-failure-to-execute-the-clambc-command-under-the-clamav-package.patch b/fix-the-failure-to-execute-the-clambc-command-under-the-clamav-package.patch new file mode 100644 index 0000000..572855b --- /dev/null +++ b/fix-the-failure-to-execute-the-clambc-command-under-the-clamav-package.patch @@ -0,0 +1,12 @@ +diff -Nur clamav-0.103.6/clambc/bcrun.c clamav-0.103.6_bak/clambc/bcrun.c +--- clamav-0.103.6/clambc/bcrun.c 2022-05-02 12:46:41.000000000 +0800 ++++ clamav-0.103.6_bak/clambc/bcrun.c 2022-05-26 10:02:06.307956926 +0800 +@@ -406,7 +406,7 @@ + // ctx was memset, so recursion_level starts at 0. + cctx.recursion_stack[cctx.recursion_level].fmap = map; + cctx.recursion_stack[cctx.recursion_level].type = CL_TYPE_ANY; /* ANY for the top level, because we don't yet know the type. */ +- cctx.recursion_stack[cctx.recursion_level].size = map->len; ++ //cctx.recursion_stack[cctx.recursion_level].size = map->len; + + cctx.fmap = cctx.recursion_stack[cctx.recursion_level].fmap; + -- Gitee