packages/clamav
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!78 修复clamav包下执行clambc 命令失败

Browse Source 
From: @lyn1001 
Reviewed-by: @small_leek 
Signed-off-by: @small_leek
This commit is contained in:
openeuler-ci-bot 2022-05-26 06:51:52 +00:00 committed by Gitee
commit f9b2290566
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clamav.spec
View File

@ -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/
@ -29,6 +29,7 @@ Patch0006: clamav-freshclam.service.patch
Patch0007: clamav-type-conversion.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,9 @@ test -e %_var/log/clamav-milter.log || {
%changelog
* Thu May 26 2022 liyanan <liyanan32@h-partners.com> - 0.103.6-3
- Fix the failure to execute the clambc command under the clamav package
* Wed May 25 2022 houyingchao <houyingchao@h-partners.com> - 0.103.6-2
- Fix start clamav-clamonacc-service

12
fix-the-failure-to-execute-the-clambc-command-under-the-clamav-package.patch Normal file
View File

@ -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;