Compare commits

...
Sign in to create a new pull request.

21 commits

Author SHA1 Message Date
Gwyn Ciesla
c9fc264dab Merge branch 'epel9' into epel8 2025-08-25 12:33:03 -05:00
Gwyn Ciesla
0f4d137822 Revert sysuser change. 2025-08-25 12:32:14 -05:00
Gwyn Ciesla
5a8de085f9 Merge branch 'epel9' into epel8 2025-07-30 09:03:21 -05:00
Gwyn Ciesla
6ff7f89b20 Update to 1.4.3 2025-07-23 08:07:06 -06:00
Orion Poplawski
3de49e6c23 Update to 1.4.1 2025-07-23 08:01:45 -06:00
Benjamin A. Beasley
004552a7a6 Document licenses of statically linked Rust dependencies 2025-07-23 07:58:44 -06:00
Benjamin A. Beasley
1aae2f0568 Update the image crate dependency to 0.25, the current release 2025-07-23 07:58:24 -06:00
Miroslav Suchý
4f076ff040 Migrate to SPDX license
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

If there will be no comments in two weeks, I will merge this.
2025-07-23 07:53:27 -06:00
Gwyn Ciesla
d0f339b278 Merge branch 'f41' into epel8 2025-06-18 15:31:17 -05:00
Gwyn Ciesla
19d8fb5551 1.0.9 2025-06-18 15:29:25 -05:00
Orion Poplawski
4f403fcd10 Changelog 2025-01-26 14:10:12 -07:00
Orion Poplawski
2666425138 Merge branch 'epel9' into epel8 2025-01-26 13:59:09 -07:00
Orion Poplawski
e8572d85e1 Update to 1.0.8
Update to 1.0.8
Update to 1.0.8
Update to 1.0.8
Update to 1.0.8
Update to 1.0.8
Update to 1.0.8
Update to 1.0.8
Update to 1.0.8
2025-01-26 13:16:10 -07:00
Yaakov Selkowitz
c500e7cded Update to 1.0.7
libprelude has been retired from F41.
2024-09-05 16:53:26 -06:00
Sérgio M. Basto
d58920423a Remove one Buildrequires that was add in last minute and is not needed 2024-05-29 21:48:48 +01:00
Sérgio M. Basto
a96a0d07da Update clamav to 1.0.6
Use %build_rustflags on EL8
2024-05-29 14:25:53 +01:00
Sérgio M. Basto
151bee6b91 (#1679375) fixes syntax error in /etc/logrotate.d/clamd.exim 2024-03-18 13:41:40 +00:00
Orion Poplawski
78d93c2ea4 Update to 0.103.11 2023-10-29 09:30:35 -06:00
Sérgio M. Basto
94624e2437 Update to 0.103.10 2023-08-31 12:26:23 +01:00
Orion Poplawski
81faadcf03 Update to 0.103.9 CVE-2023-20197 (bz#2232508) 2023-08-17 22:36:40 -06:00
Sérgio M. Basto
d576c80e70 Update data files with help of Cisco-Talos/cvdupdate 2023-02-24 22:00:16 +00:00
7 changed files with 194 additions and 106 deletions

View file

@ -0,0 +1,22 @@
From 24d1341e8e34aa325ac03718121e33a3b4e5b75e Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Sun, 15 Sep 2024 12:50:07 -0400
Subject: [PATCH] In libclamav_rust, use the current version of the image crate
---
libclamav_rust/Cargo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libclamav_rust/Cargo.toml b/libclamav_rust/Cargo.toml
index 526951c519..eb95ca8011 100644
--- a/libclamav_rust/Cargo.toml
+++ b/libclamav_rust/Cargo.toml
@@ -12,7 +12,7 @@ log = { version = "0.4", features = ["std"] }
sha2 = "0.10"
tempfile = "3"
thiserror = "1"
-image = "0.24"
+image = "0.25"
rustdct = "0.7"
transpose = "0.2"
num-traits = "0.2"

View file

@ -1,5 +1,6 @@
--- ./clamonacc/clamav-clamonacc.service.in.clamonacc-service 2022-05-05 22:36:27.572671129 +0100
+++ ./clamonacc/clamav-clamonacc.service.in 2022-05-05 22:43:05.204324524 +0100
diff -up clamav-1.4.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service clamav-1.4.0/clamonacc/clamav-clamonacc.service.in
--- clamav-1.4.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service 2024-08-15 20:12:56.950984705 -0600
+++ clamav-1.4.0/clamonacc/clamav-clamonacc.service.in 2024-08-15 20:14:19.088770747 -0600
@@ -4,14 +4,12 @@
[Unit]
Description=ClamAV On-Access Scanner
@ -14,6 +15,6 @@
-ExecStartPre=/bin/bash -c "while [ ! -S /run/clamav/clamd.ctl ]; do sleep 1; done"
-ExecStart=@prefix@/sbin/clamonacc -F --log=/var/log/clamav/clamonacc.log --move=/root/quarantine
+ExecStart=@prefix@/sbin/clamonacc -F --config-file=/etc/clamd.d/scan.conf
ExecStop=/bin/kill -SIGKILL $MAINPID
[Install]
WantedBy=multi-user.target

View file

@ -1,18 +0,0 @@
diff -up clamav-1.0.0/CMakeLists.txt.rpath clamav-1.0.0/CMakeLists.txt
--- clamav-1.0.0/CMakeLists.txt.rpath 2023-01-15 22:04:58.217120124 -0700
+++ clamav-1.0.0/CMakeLists.txt 2023-01-15 22:05:57.121818812 -0700
@@ -180,14 +180,6 @@ endif()
include(GNUInstallDirs)
-if (NOT DEFINED CMAKE_INSTALL_RPATH)
- if(CMAKE_INSTALL_FULL_LIBDIR)
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- else()
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
- endif()
-endif()
-
if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
set(USING_CLANG ON)
else()

View file

@ -1,4 +1,4 @@
#global prerelease -rc2
#global prerelease -rc
%global _hardened_build 1
@ -25,9 +25,9 @@
Summary: End-user tools for the Clam Antivirus scanner
Name: clamav
Version: 1.0.7
Release: 1%{?dist}
License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
Version: 1.4.3
Release: 2%{?dist}
License: %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only}
URL: https://www.clamav.net/
%if %{with unrar}
Source0: https://www.clamav.net/downloads/production/%{name}-%{version}%{?prerelease}.tar.gz
@ -50,9 +50,9 @@ Source5: clamd-README
#http://database.clamav.net/main.cvd
Source10: main-62.cvd
#http://database.clamav.net/daily.cvd
Source11: daily-27388.cvd
Source11: daily-27673.cvd
#http://database.clamav.net/bytecode.cvd
Source12: bytecode-335.cvd
Source12: bytecode-336.cvd
#for update
Source200: freshclam-sleep
Source201: freshclam.sysconfig
@ -65,21 +65,18 @@ Source330: clamav-milter.systemd
#for scanner-systemd/server-systemd
Source530: clamd@.service
# Accept RUSTFLAGS
# https://github.com/Cisco-Talos/clamav/pull/835
Patch0: clamav-rustflags.patch
# Change default config locations for Fedora
Patch1: clamav-default_confs.patch
# Fix pkg-config flags for static linking, multilib
Patch2: clamav-private.patch
# Remove rpath
Patch3: clamav-rpath.patch
# Modify clamav-clamonacc.service for Fedora compatibility
Patch5: clamav-clamonacc-service.patch
# Allow freshclam service to run if cron.d file is present
Patch6: clamav-freshclam.service.patch
# Debian patch to fix big-endian
Patch7: https://salsa.debian.org/clamav-team/clamav/-/raw/unstable/debian/patches/libclamav-pe-Use-endian-wrapper-in-more-places.patch
# Update the image crate dependency to 0.25, the current release
Patch8: https://github.com/Cisco-Talos/clamav/pull/1366/commits/24d1341e8e34aa325ac03718121e33a3b4e5b75e.patch
BuildRequires: cmake3
BuildRequires: gettext-devel
@ -122,6 +119,9 @@ BuildRequires: pcre2-devel
# Explicitly needed on EL8
BuildRequires: python3
BuildRequires: python3-pytest
%if 0%{?fedora} >= 41
BuildRequires: python3-cgi
%endif
BuildRequires: zlib-devel
#BuildRequires: %%{_includedir}/tcpd.h
BuildRequires: bc
@ -173,6 +173,61 @@ user-creation scripts required by clamav.
Summary: Dynamic libraries for the Clam Antivirus scanner
Provides: bundled(libmspack) = 0.5-0.1.alpha.modified_by_clamav
# LICENSE.dependencies contains a full license breakdown
# From the output of %%{cargo_license_summary}:
#
%if 0%{?fedora} || 0%{?rhel} >= 9
# 0BSD OR MIT OR Apache-2.0
# Apache-2.0
# Apache-2.0 OR MIT
# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
# BSD-2-Clause
# BSD-2-Clause AND ISC
# BSD-3-Clause
# MIT
# MIT OR Apache-2.0 (duplicate)
# MIT OR Apache-2.0 OR Zlib
# MIT OR Zlib OR Apache-2.0 (duplicate)
# Unlicense OR MIT
# Zlib OR Apache-2.0 OR MIT (duplicate)
License: %{shrink:
%{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} AND
(0BSD OR MIT OR Apache-2.0) AND
Apache-2.0 AND
(Apache-2.0 OR MIT) AND
(Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND
BSD-2-Clause AND
BSD-3-Clause AND
ISC AND
MIT AND
(MIT OR Zlib OR Apache-2.0) AND
(Unlicense OR MIT) AND
Zlib
}
%else
# 0BSD OR MIT OR Apache-2.0
# Apache-2.0 OR MIT
# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
# BSD-3-Clause
# MIT
# MIT OR Apache-2.0 (duplicate)
# MIT OR Zlib OR Apache-2.0
# Unlicense OR MIT
# Zlib
# Zlib OR Apache-2.0 OR MIT (duplicate)
License: %{shrink:
%{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only} AND
(0BSD OR MIT OR Apache-2.0) AND
(Apache-2.0 OR MIT) AND
(Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND
BSD-3-Clause AND
MIT AND
(MIT OR Zlib OR Apache-2.0) AND
(Unlicense OR MIT) AND
Zlib
}
%endif
%description lib
This package contains dynamic libraries shared between applications
using the Clam Antivirus scanner.
@ -275,21 +330,26 @@ This package contains files which are needed to run the clamav-milter.
# EL8 and earlier do not have the Rust cargo dependencies that are
# defined by the generate_buildrequires stage in EL9 and later, so the
# vendored packages included in the ClamAV sources suffice.
sed -i -e '/cbindgen/s/version = *"0.20"/version = "0.24"/' -e '/^bindgen *=/s/= .*/= "0.63"/' libclamav_rust/Cargo.toml
%cargo_prep
cd libclamav_rust
rm -r .cargo
sed -i -e '/^base64 *=/s/= .*/= "0.22"/' Cargo.toml
sed -i -e '/^bindgen *=/s/= .*/= "0.69"/' Cargo.toml
sed -i -e '/^cbindgen *=/s/= *".*"/= "0.26"/' Cargo.toml
sed -i -e '/^onenote_parser *=/s/= *.*/= "0.3.1"/' Cargo.toml
%cargo_prep
cd ..
%endif
%patch -P0 -p1 -b .rustflags
%patch -P1 -p1 -b .default_confs
%patch -P2 -p1 -b .private
%patch -P3 -p1 -b .rpath
%patch -P5 -p1 -b .clamonacc-service
%patch -P6 -p1 -b .freshclam-service
%patch -P7 -p1 -b .big-endian
# This patch is not made to be backwards-compatible (even though it could have
# been), and the vendored dependencies in EPEL8 include image 0.24, not 0.25.
%if 0%{?fedora} || 0%{?rhel} >= 9
%patch -P8 -p1 -b .image-0.25
%endif
install -p -m0644 %{SOURCE300} clamav-milter/
@ -322,6 +382,7 @@ export have_cv_ipv6=yes
-DCMAKE_INSTALL_DOCDIR=%{_pkgdocdir} \
-DCLAMAV_USER=%{updateuser} -DCLAMAV_GROUP=%{updateuser} \
-DDATABASE_DIRECTORY=%{homedir} \
-DDO_NOT_SET_RPATH=ON \
%{!?with_clamonacc:-DENABLE_CLAMONACC=OFF} \
%{?with_llvm:-DBYTECODE_RUNTIME=llvm -D LLVM_FIND_VERSION="3.6.0"} \
%{!?with_unrar:-DENABLE_UNRAR=OFF}
@ -330,6 +391,10 @@ export have_cv_ipv6=yes
%cmake3_build
cd libclamav_rust
%cargo_license_summary
%{cargo_license} > ../LICENSES.dependencies
%install
rm -rf _doc*
@ -420,7 +485,13 @@ rm %{buildroot}%{_unitdir}/clamav-daemon.*
%check
%ifarch s390x
# Tests fail on s390x
# https://github.com/Cisco-Talos/clamav/issues/759
%ctest3 -- -E valgrind || :
%else
%ctest3 -- -E valgrind
%endif
# valgrind tests fail https://github.com/Cisco-Talos/clamav/issues/584
%ctest3 -- -R valgrind || :
@ -445,7 +516,6 @@ do
[ -f $f -a $f -nt $cvd ] && rm -f $cvd || :
done
%pre filesystem
getent group %{updateuser} >/dev/null || groupadd -r %{updateuser}
getent passwd %{updateuser} >/dev/null || \
@ -476,7 +546,6 @@ exit 0
%postun -n clamd
%systemd_postun_with_restart clamd@scan.service
%triggerin milter -- clamav-scanner
# Add the milteruser to the scanuser group; this is required when
# milter and clamd communicate through local sockets
@ -534,16 +603,19 @@ exit 0
%files lib
%{_libdir}/libclamav.so.11*
# Licenses for statically linked Rust dependencies in libclamav
%license LICENSES.dependencies
%{_libdir}/libclamav.so.12*
%{_libdir}/libclammspack.so.0*
%if %{with unrar}
%{_libdir}/libclamunrar*.so.11*
%{_libdir}/libclamunrar*.so.12*
%endif
%files devel
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/libclamav_rust.a
%{_libdir}/pkgconfig/*
%{_bindir}/clamav-config
@ -570,9 +642,11 @@ exit 0
%files freshclam
%{_bindir}/freshclam
%{_libdir}/libfreshclam.so.2*
%{_libdir}/libfreshclam.so.3*
%{_mandir}/*/freshclam*
%{_unitdir}/clamav-freshclam.service
%{_unitdir}/clamav-freshclam-once.service
%{_unitdir}/clamav-freshclam-once.timer
%config(noreplace) %verify(not mtime) %{_sysconfdir}/freshclam.conf
%ghost %attr(0644,%{updateuser},%{updateuser}) %{homedir}/bytecode.cld
%ghost %attr(0644,%{updateuser},%{updateuser}) %{homedir}/bytecode.cvd
@ -603,12 +677,24 @@ exit 0
%changelog
* Mon Aug 25 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.4.3-2
- Revert sysuser change
* Wed Jul 23 2025 Orion Poplawski <orion@nwra.com> - 1.4.1-1
- Update to 1.4.1
* Wed Jul 23 2025 Orion Poplawski <orion@nwra.com> - 1.0.9-2
- Update the image crate dependency to 0.25, the current release
* Wed Jun 18 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.0.9-1
- Update to 1.0.9
* Sun Jan 26 2025 Orion Poplawski <orion@nwra.com> - 1.0.8-1
- Update to 1.0.8
* Thu Sep 05 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 1.0.7-1
- Update to 1.0.7
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Apr 26 2024 Orion Poplawski <orion@nwra.com> - 1.0.6-1
- Update to 1.0.6
@ -618,41 +704,56 @@ exit 0
* Thu Apr 04 2024 John Sullivan <jsullivan@nasuni.com> - 1.0.5-4
- Update EPEL 7 and 8 support for 1.0.5
* Sat Mar 16 2024 Sérgio Basto <sergio@serjux.com> - 1.0.5-3
* Sat Mar 16 2024 Sérgio Basto <sergio@serjux.com> - 1.0.5-3
- (#1679375) fixes syntax error in /etc/logrotate.d/clamd.exim
* Tue Mar 05 2024 Sérgio Basto <sergio@serjux.com> - 1.0.5-2
- set nullblog to fix post script (#2253914)
- Properly check valgrind arches
* Thu Feb 08 2024 Orion Poplawski <orion@nwra.com> - 1.0.5-1
- Update to 1.0.5
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Oct 29 2023 Orion Poplawski <orion@nwra.com> - 1.0.4-1
- Update to 1.0.4
- Remove docs again from main package (bz#2230512)
* Fri Aug 18 2023 Orion Poplawski <orion@nwra.com> - 1.0.2-1
- Update to 1.0.2 CVE-2023-20197 (bz#2232508)
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Feb 27 2023 Orion Poplawski <orion@nwra.com> - 1.0.1-4
- Mark cvd files is clamav-data as %%config(noreplace) (bz#2170876)
- Rename clamav-update to clamav-freshclam
- Make clamav-freshclam supplement clamd
- Have clamav-freshclam ghost all of the .cld and .cvd files
- Update data files with help of Cisco-Talos/cvdupdate
- Update to 1.0.1
- Make sure RUSTFLAGS are passed to rustc (bz#2167194)
- Fix multilib install
* Mon Mar 18 2024 Sérgio Basto <sergio@serjux.com> - 0.103.11-2
- (#1679375) fixes syntax error in /etc/logrotate.d/clamd.exim
* Tue Mar 05 2024 Sérgio Basto <sergio@serjux.com> - 1.0.5-2
- set nullblog to fix post script (#2253914)
- Properly check valgrind arches
* Sun Oct 29 2023 Orion Poplawski <orion@nwra.com> - 0.103.11-1
- Update to 0.103.11
* Thu Feb 08 2024 Orion Poplawski <orion@nwra.com> - 1.0.5-1
- Update to 1.0.5
* Thu Aug 31 2023 Sérgio Basto <sergio@serjux.com> - 0.103.10-1
- Update to 0.103.10
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Aug 18 2023 Orion Poplawski <orion@nwra.com> - 0.103.9-1
- Update to 0.103.9 CVE-2023-20197 (bz#2232508)
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Oct 29 2023 Orion Poplawski <orion@nwra.com> - 1.0.4-1
- Update to 1.0.4
- Remove docs again from main package (bz#2230512)
* Fri Aug 18 2023 Orion Poplawski <orion@nwra.com> - 1.0.2-1
- Update to 1.0.2 CVE-2023-20197 (bz#2232508)
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Feb 27 2023 Orion Poplawski <orion@nwra.com> - 1.0.1-4
- Mark cvd files is clamav-data as %%config(noreplace) (bz#2170876)
- Rename clamav-update to clamav-freshclam
- Make clamav-freshclam supplement clamd
- Have clamav-freshclam ghost all of the .cld and .cvd files
* Fri Feb 24 2023 Sérgio Basto <sergio@serjux.com> - 0.103.8-4
- Update data files with help of Cisco-Talos/cvdupdate
- Update to 1.0.1
- Make sure RUSTFLAGS are passed to rustc (bz#2167194)
- Fix multilib install
* Mon Feb 20 2023 Orion Poplawski <orion@nwra.com> - 0.103.8-3
- Fix daily.cvd file

View file

@ -1,25 +1,7 @@
From 5a7b1cdfadc980fb1c4fa32e6275e7c96a963110 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Date: Fri, 6 Jan 2023 21:42:30 +0100
Subject: libclamav/pe: Use endian wrapper in more places.
A few user of VirtualAddress and Size in cli_exe_info::pe_image_data_dir
don't use the endian wrapper while other places do. This leads to
testsuite failures on big endian machines.
Use the endian wrapper in all places across pe.c for the two members.
Patch-Name: libclamav-pe-Use-endian-wrapper-in-more-places.patch
Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
---
libclamav/pe.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/libclamav/pe.c b/libclamav/pe.c
index f5dcea9..19cd2d4 100644
--- a/libclamav/pe.c
+++ b/libclamav/pe.c
@@ -2422,22 +2422,22 @@ static cl_error_t hash_imptbl(cli_ctx *ctx, unsigned char **digest, uint32_t *im
diff -up clamav-1.4.0/libclamav/pe.c.big-endian clamav-1.4.0/libclamav/pe.c
--- clamav-1.4.0/libclamav/pe.c.big-endian 2024-08-13 14:24:46.000000000 -0600
+++ clamav-1.4.0/libclamav/pe.c 2024-08-15 20:16:02.017730419 -0600
@@ -2424,22 +2424,22 @@ static cl_error_t hash_imptbl(cli_ctx *c
/* If the PE doesn't have an import table then skip it. This is an
* uncommon case but can happen. */
@ -46,7 +28,7 @@ index f5dcea9..19cd2d4 100644
if (impdes == NULL) {
cli_dbgmsg("scan_pe: failed to acquire fmap buffer\n");
status = CL_EREAD;
@@ -2447,7 +2447,7 @@ static cl_error_t hash_imptbl(cli_ctx *ctx, unsigned char **digest, uint32_t *im
@@ -2449,7 +2449,7 @@ static cl_error_t hash_imptbl(cli_ctx *c
/* Safety: We can trust peinfo->dirs[1].Size only because `fmap_need_off()` (above)
* would have failed if the size exceeds the end of the fmap. */
@ -55,7 +37,7 @@ index f5dcea9..19cd2d4 100644
if (genhash[CLI_HASH_MD5]) {
hashctx[CLI_HASH_MD5] = cl_hash_init("md5");
@@ -2546,7 +2546,7 @@ static cl_error_t hash_imptbl(cli_ctx *ctx, unsigned char **digest, uint32_t *im
@@ -2556,7 +2556,7 @@ static cl_error_t hash_imptbl(cli_ctx *c
done:
if (needed_impoff) {
@ -64,16 +46,16 @@ index f5dcea9..19cd2d4 100644
}
for (type = CLI_HASH_MD5; type < CLI_HASH_AVAIL_TYPES; type++) {
@@ -3250,7 +3250,7 @@ int cli_scanpe(cli_ctx *ctx)
@@ -3241,7 +3241,7 @@ int cli_scanpe(cli_ctx *ctx)
/* Trojan.Swizzor.Gen */
if (SCAN_HEURISTICS && (DCONF & PE_CONF_SWIZZOR) && peinfo->nsections > 1 && fsize > 64 * 1024 && fsize < 4 * 1024 * 1024) {
- if (peinfo->dirs[2].Size) {
+ if (EC32(peinfo->dirs[2].Size)) {
struct swizz_stats *stats = cli_calloc(1, sizeof(*stats));
struct swizz_stats *stats = calloc(1, sizeof(*stats));
unsigned int m = 1000;
ret = CL_CLEAN;
@@ -5292,13 +5292,13 @@ cl_error_t cli_peheader(fmap_t *map, struct cli_exe_info *peinfo, uint32_t opts,
@@ -5250,13 +5250,13 @@ cl_error_t cli_peheader(fmap_t *map, str
cli_dbgmsg("EntryPoint offset: 0x%x (%d)\n", peinfo->ep, peinfo->ep);
}
@ -81,7 +63,7 @@ index f5dcea9..19cd2d4 100644
+ if (is_dll || peinfo->ndatadirs < 3 || !EC32(peinfo->dirs[2].Size))
peinfo->res_addr = 0;
else
peinfo->res_addr = EC32(peinfo->dirs[2].VirtualAddress);
peinfo->res_addr = peinfo->dirs[2].VirtualAddress;
while (opts & CLI_PEHEADER_OPT_EXTRACT_VINFO &&
- peinfo->ndatadirs >= 3 && peinfo->dirs[2].Size) {

View file

@ -1,4 +1,4 @@
SHA512 (clamav-1.0.7-norar.tar.xz) = c8563a927005cc3782e7c43e95d40324e5254501b94ce5f4a8526abd2e5455a84d060f9e7199879706b551f3bb64209e5935e6899846cfec6c271de4917bed97
SHA512 (clamav-1.4.3-norar.tar.xz) = d9e6835b88e4934a36b037d28cf01e627b7843e52ef9fc6858f59000acf26120f3534e7a6b262d3ad66a2668557f3a1d0a93fb676711c91f64c8b97fa36fe191
SHA512 (main-62.cvd) = b52e5d9ecacbd9b11c3b0cc460388746fccb353a7520522ed15ee25f645a432bed5be7e6b38512f134f085eb9be76a1e26c19de8b09491d4ec46da8c5afc318e
SHA512 (daily-27388.cvd) = ff8f3fd3386e41c288de5aec00de937807ad4e7b2d93533b7e254d2068b943b8b7310471af0dbe7e7e639668d73ff447c59038e56882bc7e1911c6dd28c1970d
SHA512 (bytecode-335.cvd) = 9177c0533658b21584de0623ff9b7c70b2ec92ce9f6fecf98a881902c98025930430415715e9914ce7c0c6fb91aad532b4c907677c3010a0da47583b7ad24d4f
SHA512 (daily-27673.cvd) = e0447f80ef2cc8981b0e1ea430a7006a1027de0b989f5a3256766804f74a50aac52f577ef929c8e1789b9353d1a4cf18d289a27b1f7e609098e11ad81bb62226
SHA512 (bytecode-336.cvd) = 62a7f8b62da2a2476d3f66851d71e84f055f84543112b18f14e86484b02370d4daff0cb3e2b9ec77acf4a179327619a8b9950122e7882003074a9a0bf4a7ebab

View file

@ -1,5 +1,5 @@
VERSION=1.0.7
REPOS="f41 f40 f39 epel9"
VERSION=1.4.3
REPOS="n"
if [ -z "$1" ]
then