Update to 0.103.11

Update to 0.103.10
Update to 0.103.9 CVE-2023-20197 (bz#2232508)
2023-10-29 09:30:35 -06:00 · 2023-08-31 12:26:23 +01:00 · 2023-08-17 22:36:40 -06:00 · 2023-02-24 22:00:16 +00:00
15 changed files with 283 additions and 574 deletions
--- a/README.fedora.md
+++ b/README.fedora.md
@ -1,25 +1,22 @@
-## README.fedora.md (mainly clamav-milter) 
-
-
 Please note for Fedora and EPEL 7+ we use only systemd.

 A clamav-milter setup consists of the following three components:

-### The clamav-milter itself
+* the clamav-milter itself

  The main configuration is in /etc/mail/clamav-milter.conf and MUST
  be changed before first use.

  This can be enabled with: 'systemctl enable clamav-milter.service'

-### A clamav scanner daemon
+* a clamav scanner daemon

  The daemon is configured by /etc/clamd.d/scan.conf (which MUST be
  edited before first use).

  This can be enabled with: 'systemctl enable clamd@scan.service'

-### The MTA (sendmail/postfix)
+* the MTA (sendmail/postfix)

  --> you should know how to install this...

@ -31,12 +28,13 @@ A clamav-milter setup consists of the following three components:

  to your sendmail.mc.

-### Changing permissions of directory /var/lib/clamav  
-
-  - Whenever ClamAV is upgraded by dnf, the permissions for the /var/lib/clamav directory change to user clamupdate  
-  - If for some reason you need DatabaseOwner be another user, you may copy /usr/lib/systemd/system/clamav-freshclam.service to /etc/systemd/system/ and add ExecStartPre=+/usr/bin/chown youruser:yourgroup /var/lib/clamav and updates won't break your configuration ...
-  - Please add comments to https://bugzilla.redhat.com/show_bug.cgi?id=2023371 if not work for you or if you have any suggestion.
-  - Note: =+ on systemd.service (man 5 systemd.service, Special executable prefixes)  If the executable path is prefixed with "+" then the process is executed with full privileges.
+* Changing permissions of directory /var/lib/clamav
+  Whenever ClamAV is upgraded by dnf, the permissions for the /var/lib/clamav directory change to user clamupdate
+  If for some reason you need DatabaseOwner be another user, you may copy /usr/lib/systemd/system/clamav-freshclam.service to /etc/systemd/system/
+  and add ExecStartPre=+/usr/bin/chown youruser:yourgroup /var/lib/clamav and updates won't break your configuration ...
+  Please add comments to https://bugzilla.redhat.com/show_bug.cgi?id=2023371 if not work for you or if you have any suggestion.
+  Note: =+ on systemd.service (man 5 systemd.service, Special executable prefixes)
+  If the executable path is prefixed with "+" then the process is executed with full privileges.


 EXAMPLE
--- a/clamav-0.99-private.patch
+++ b/clamav-0.99-private.patch
@ -8,17 +8,8 @@
 +Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@
 Cflags: -I${includedir}
 
-diff -up clamav-1.0.0/clamav-config.in.private clamav-1.0.0/clamav-config.in
--- clamav-1.0.0/clamav-config.in.private	2023-01-22 17:40:01.711757908 -0700
-+++ clamav-1.0.0/clamav-config.in	2023-01-22 18:01:06.188743168 -0700
-@@ -4,7 +4,6 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- includedir=@includedir@
-libdir=@libdir@
- 
- usage()
- {
+--- clamav-0.99/clamav-config.in		2015-05-28 23:56:25.000000000 +0200
+++ clamav-0.99/clamav-config.in.private	2015-12-02 01:31:34.933705763 +0100
@@ -54,12 +54,8 @@
 	usage 0
 	;;
--- a/clamav-clamonacc-service.patch
+++ b/clamav-clamonacc-service.patch
@ -1,6 +1,5 @@
-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
+--- ./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
@@ -4,14 +4,12 @@
 [Unit]
 Description=ClamAV On-Access Scanner
@ -15,6 +14,6 @@ diff -up clamav-1.4.0/clamonacc/clamav-clamonacc.service.in.clamonacc-service cl
 -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
--- a/clamav-default_confs.patch
+++ b/clamav-default_confs.patch
@ -1,6 +1,6 @@
-diff -up clamav-0.104.3/clamconf/clamconf.c.default_confs clamav-0.104.3/clamconf/clamconf.c
--- clamav-0.104.3/clamconf/clamconf.c.default_confs	2022-05-02 00:24:50.000000000 -0600
-+++ clamav-0.104.3/clamconf/clamconf.c	2022-05-12 22:04:42.883348923 -0600
+diff -up clamav-0.103.0/clamconf/clamconf.c.default_confs clamav-0.103.0/clamconf/clamconf.c
+--- clamav-0.103.0/clamconf/clamconf.c.default_confs	2020-09-12 18:27:09.000000000 -0600
+++ clamav-0.103.0/clamconf/clamconf.c	2020-09-17 22:00:20.792879792 -0600
@@ -63,9 +63,9 @@ static struct _cfgfile {
     const char *name;
     int tool;
@ -13,66 +13,66 @@ diff -up clamav-0.104.3/clamconf/clamconf.c.default_confs clamav-0.104.3/clamcon
     {NULL, 0}};
 
 static void printopts(struct optstruct *opts, int nondef)
-diff -up clamav-0.104.3/docs/man/clamav-milter.8.in.default_confs clamav-0.104.3/docs/man/clamav-milter.8.in
--- clamav-0.104.3/docs/man/clamav-milter.8.in.default_confs	2022-05-12 22:04:42.885348940 -0600
-+++ clamav-0.104.3/docs/man/clamav-milter.8.in	2022-05-12 22:05:25.031719791 -0600
+diff -up clamav-0.103.0/docs/man/clamav-milter.8.in.default_confs clamav-0.103.0/docs/man/clamav-milter.8.in
+--- clamav-0.103.0/docs/man/clamav-milter.8.in.default_confs	2020-09-12 18:27:09.000000000 -0600
+++ clamav-0.103.0/docs/man/clamav-milter.8.in	2020-09-17 22:00:20.793879800 -0600
@@ -27,7 +27,7 @@ Print the version number and exit.
 Read configuration from FILE.
 .SH "FILES"
- .LP
-@CONFDIR@/clamav-milter.conf
-+@CONFDIR@/mail/clamav-milter.conf
+ .LP 
+-@CFGDIR@/clamav-milter.conf
+@CFGDIR@/mail/clamav-milter.conf
 .SH "AUTHOR"
- .LP
+ .LP 
 aCaB <acab@clamav.net>
-diff -up clamav-0.104.3/docs/man/clamav-milter.conf.5.in.default_confs clamav-0.104.3/docs/man/clamav-milter.conf.5.in
--- clamav-0.104.3/docs/man/clamav-milter.conf.5.in.default_confs	2022-05-12 22:04:42.887348958 -0600
-+++ clamav-0.104.3/docs/man/clamav-milter.conf.5.in	2022-05-12 22:05:48.834929418 -0600
+diff -up clamav-0.103.0/docs/man/clamav-milter.conf.5.in.default_confs clamav-0.103.0/docs/man/clamav-milter.conf.5.in
+--- clamav-0.103.0/docs/man/clamav-milter.conf.5.in.default_confs	2020-09-12 18:27:09.000000000 -0600
+++ clamav-0.103.0/docs/man/clamav-milter.conf.5.in	2020-09-17 22:00:20.794879808 -0600
@@ -239,7 +239,7 @@ Default: no
 All options expressing a size are limited to max 4GB. Values in excess will be reset to the maximum.
 .SH "FILES"
- .LP
-@CONFDIR@/clamav-milter.conf
-+@CONFDIR@/mail/clamav-milter.conf
+ .LP 
+-@CFGDIR@/clamav-milter.conf
+@CFGDIR@/mail/clamav-milter.conf
 .SH "AUTHOR"
- .LP
+ .LP 
 aCaB <acab@clamav.net>
-diff -up clamav-0.104.3/docs/man/clamd.8.in.default_confs clamav-0.104.3/docs/man/clamd.8.in
--- clamav-0.104.3/docs/man/clamd.8.in.default_confs	2022-05-12 22:04:42.888348967 -0600
-+++ clamav-0.104.3/docs/man/clamd.8.in	2022-05-12 22:07:01.657570942 -0600
+diff -up clamav-0.103.0/docs/man/clamd.8.in.default_confs clamav-0.103.0/docs/man/clamd.8.in
+--- clamav-0.103.0/docs/man/clamd.8.in.default_confs	2020-09-12 18:27:09.000000000 -0600
+++ clamav-0.103.0/docs/man/clamd.8.in	2020-09-17 22:00:20.794879808 -0600
@@ -7,7 +7,7 @@ clamd \- an anti\-virus daemon
 clamd [options]
 .SH "DESCRIPTION"
- .LP
-The daemon listens for incoming connections on Unix and/or TCP socket and scans files or directories on demand. It reads the configuration from @CONFDIR@/clamd.conf
-+The daemon listens for incoming connections on Unix and/or TCP socket and scans files or directories on demand. It reads the configuration from @CONFDIR@/clamd.d/scan.conf
+ .LP 
+-The daemon listens for incoming connections on Unix and/or TCP socket and scans files or directories on demand. It reads the configuration from @CFGDIR@/clamd.conf
+The daemon listens for incoming connections on Unix and/or TCP socket and scans files or directories on demand. It reads the configuration from @CFGDIR@/clamd.d/scan.conf
 .SH "COMMANDS"
- .LP
+ .LP 
 It's recommended to prefix clamd commands with the letter \fBz\fR (eg. zSCAN) to indicate that the command will be delimited by a NULL character and that clamd should continue reading command data until a NULL character is read. The null delimiter assures that the complete command and its entire argument will be processed as a single command. Alternatively commands may be prefixed with the letter \fBn\fR (e.g. nSCAN) to use a newline character as the delimiter. Clamd replies will honour the requested terminator in turn.
-@@ -133,7 +133,7 @@ Reload the signature databases.
+@@ -125,7 +125,7 @@ Reload the signature databases.
 Perform a clean exit.
 .SH "FILES"
- .LP
-@CONFDIR@/clamd.conf
-+@CONFDIR@/clamd.d/scan.conf
+ .LP 
+-@CFGDIR@/clamd.conf
+@CFGDIR@/clamd.d/scan.conf
 .SH "CREDITS"
 Please check the full documentation for credits.
 .SH "AUTHOR"
-diff -up clamav-0.104.3/docs/man/clamd.conf.5.in.default_confs clamav-0.104.3/docs/man/clamd.conf.5.in
--- clamav-0.104.3/docs/man/clamd.conf.5.in.default_confs	2022-05-12 22:04:42.889348976 -0600
-+++ clamav-0.104.3/docs/man/clamd.conf.5.in	2022-05-12 22:06:21.800219822 -0600
-@@ -765,7 +765,7 @@ Default: no
+diff -up clamav-0.103.0/docs/man/clamd.conf.5.in.default_confs clamav-0.103.0/docs/man/clamd.conf.5.in
+--- clamav-0.103.0/docs/man/clamd.conf.5.in.default_confs	2020-09-17 22:00:20.795879816 -0600
+++ clamav-0.103.0/docs/man/clamd.conf.5.in	2020-09-17 22:01:21.414353121 -0600
+@@ -759,7 +759,7 @@ Default: no
 All options expressing a size are limited to max 4GB. Values in excess will be reset to the maximum.
 .SH "FILES"
 .LP
-@CONFDIR@/clamd.conf
-+@CONFDIR@/clamd.d/scan.conf
+-@CFGDIR@/clamd.conf
+@CFGDIR@/clamd.d/scan.conf
 .SH "AUTHORS"
 .LP
 Tomasz Kojm <tkojm@clamav.net>, Kevin Lin <klin@sourcefire.com>
-diff -up clamav-0.104.3/platform.h.in.default_confs clamav-0.104.3/platform.h.in
--- clamav-0.104.3/platform.h.in.default_confs	2022-05-02 00:24:50.000000000 -0600
-+++ clamav-0.104.3/platform.h.in	2022-05-12 22:04:42.891348993 -0600
+diff -up clamav-0.103.0/platform.h.in.default_confs clamav-0.103.0/platform.h.in
+--- clamav-0.103.0/platform.h.in.default_confs	2020-09-17 22:00:20.796879824 -0600
+++ clamav-0.103.0/platform.h.in	2020-09-17 22:01:56.842629739 -0600
@@ -112,9 +112,9 @@ typedef unsigned int in_addr_t;
 #endif
 
--- a/clamav-freshclam.service.patch
+++ b/clamav-freshclam.service.patch
@ -1,12 +1,17 @@
-diff -up clamav-0.104.3/freshclam/clamav-freshclam.service.in.freshclam-service clamav-0.104.3/freshclam/clamav-freshclam.service.in
--- clamav-0.104.3/freshclam/clamav-freshclam.service.in.freshclam-service	2022-05-12 22:07:25.472780737 -0600
-+++ clamav-0.104.3/freshclam/clamav-freshclam.service.in	2022-05-12 22:08:06.280140224 -0600
-@@ -2,7 +2,7 @@
+--- ./freshclam/clamav-freshclam.service.in.orig	2021-06-14 10:36:39.029730737 +0100
+++ ./freshclam/clamav-freshclam.service.in	2021-06-14 10:37:53.621423748 +0100
+@@ -2,13 +2,12 @@
 Description=ClamAV virus database updater
 Documentation=man:freshclam(1) man:freshclam.conf(5) https://docs.clamav.net/
 # If user wants it run from cron, don't start the daemon.
 -ConditionPathExists=!/etc/cron.d/clamav-freshclam
-+# ConditionPathExists=!/etc/cron.d/clamav-freshclam
+# ConditionPathExists=!/etc/cron.d/clamav-update
 Wants=network-online.target
 After=network-online.target
 
+ [Service]
+ ExecStart=@prefix@/bin/freshclam -d --foreground=true
+-StandardOutput=syslog
+ 
+ [Install]
+ WantedBy=multi-user.target
--- a/clamav-rust-dependency-versions.patch
+++ b/clamav-rust-dependency-versions.patch
@ -1,21 +0,0 @@
-diff -Naur clamav-1.4.3-original/libclamav_rust/Cargo.toml clamav-1.4.3/libclamav_rust/Cargo.toml
--- clamav-1.4.3-original/libclamav_rust/Cargo.toml	2025-12-04 10:01:33.233889863 +0000
-+++ clamav-1.4.3/libclamav_rust/Cargo.toml	2025-12-04 10:02:29.088468217 +0000
-@@ -12,7 +12,7 @@
- sha2 = "0.10"
- tempfile = "3"
- thiserror = "1"
-image = "0.24"
-+image = ">=0.24, <0.26"
- rustdct = "0.7"
- transpose = "0.2"
- num-traits = "0.2"
-@@ -21,7 +21,7 @@
- unicode-segmentation = "1.10"
- bindgen = "0.69"
- onenote_parser = "0.3.1"
-hex-literal = "0.4"
-+hex-literal = ">=0.4, <2.0"
- inflate = "0.4"
- bzip2-rs = "0.1"
- byteorder = "1.5"
--- a/clamav-rustflags.patch
+++ b/clamav-rustflags.patch
@ -1,54 +0,0 @@
-diff -up clamav-1.0.2/cmake/FindRust.cmake.rustflags clamav-1.0.2/cmake/FindRust.cmake
--- clamav-1.0.2/cmake/FindRust.cmake.rustflags	2023-08-15 16:24:07.000000000 -0600
-+++ clamav-1.0.2/cmake/FindRust.cmake	2023-08-17 21:17:03.957070383 -0600
-@@ -236,7 +236,7 @@ function(add_rust_executable)
-     # Build the executable.
-     add_custom_command(
-         OUTPUT "${OUTPUT}"
-        COMMAND ${CMAKE_COMMAND} -E env "CARGO_TARGET_DIR=${ARGS_BINARY_DIRECTORY}" ${cargo_EXECUTABLE} ARGS ${MY_CARGO_ARGS}
-+        COMMAND ${CMAKE_COMMAND} -E env "CARGO_TARGET_DIR=${ARGS_BINARY_DIRECTORY}" ${cargo_EXECUTABLE} ${MY_CARGO_ARGS}
-         WORKING_DIRECTORY "${ARGS_SOURCE_DIRECTORY}"
-         DEPENDS ${EXE_SOURCES}
-         COMMENT "Building ${ARGS_TARGET} in ${ARGS_BINARY_DIRECTORY} with:\n\t ${cargo_EXECUTABLE} ${MY_CARGO_ARGS_STRING}")
-@@ -287,8 +287,8 @@ function(add_rust_library)
-     if("${CMAKE_OSX_ARCHITECTURES}" MATCHES "^(arm64;x86_64|x86_64;arm64)$")
-         add_custom_command(
-             OUTPUT "${OUTPUT}"
-            COMMAND ${CMAKE_COMMAND} -E env "CARGO_CMD=build" "CARGO_TARGET_DIR=${ARGS_BINARY_DIRECTORY}" "MAINTAINER_MODE=${MAINTAINER_MODE}" "RUSTFLAGS=\"${RUSTFLAGS}\"" ${cargo_EXECUTABLE} ARGS ${MY_CARGO_ARGS} --target=x86_64-apple-darwin
-            COMMAND ${CMAKE_COMMAND} -E env "CARGO_CMD=build" "CARGO_TARGET_DIR=${ARGS_BINARY_DIRECTORY}" "MAINTAINER_MODE=${MAINTAINER_MODE}" "RUSTFLAGS=\"${RUSTFLAGS}\"" ${cargo_EXECUTABLE} ARGS ${MY_CARGO_ARGS} --target=aarch64-apple-darwin
-+            COMMAND ${CMAKE_COMMAND} -E env "CARGO_CMD=build" "CARGO_TARGET_DIR=${ARGS_BINARY_DIRECTORY}" "MAINTAINER_MODE=${MAINTAINER_MODE}" "RUSTFLAGS=${RUSTFLAGS}" ${cargo_EXECUTABLE} ARGS ${MY_CARGO_ARGS} --target=x86_64-apple-darwin
-+            COMMAND ${CMAKE_COMMAND} -E env "CARGO_CMD=build" "CARGO_TARGET_DIR=${ARGS_BINARY_DIRECTORY}" "MAINTAINER_MODE=${MAINTAINER_MODE}" "RUSTFLAGS=${RUSTFLAGS}" ${cargo_EXECUTABLE} ARGS ${MY_CARGO_ARGS} --target=aarch64-apple-darwin
-             COMMAND ${CMAKE_COMMAND} -E make_directory "${ARGS_BINARY_DIRECTORY}/${RUST_COMPILER_TARGET}/${CARGO_BUILD_TYPE}"
-             COMMAND lipo ARGS -create ${ARGS_BINARY_DIRECTORY}/x86_64-apple-darwin/${CARGO_BUILD_TYPE}/lib${ARGS_TARGET}.a ${ARGS_BINARY_DIRECTORY}/aarch64-apple-darwin/${CARGO_BUILD_TYPE}/lib${ARGS_TARGET}.a -output "${OUTPUT}"
-             WORKING_DIRECTORY "${ARGS_SOURCE_DIRECTORY}"
-@@ -312,7 +312,7 @@ function(add_rust_library)
-     else()
-         add_custom_command(
-             OUTPUT "${OUTPUT}"
-            COMMAND ${CMAKE_COMMAND} -E env "CARGO_CMD=build" "CARGO_TARGET_DIR=${ARGS_BINARY_DIRECTORY}" "MAINTAINER_MODE=${MAINTAINER_MODE}" "RUSTFLAGS=\"${RUSTFLAGS}\"" ${cargo_EXECUTABLE} ARGS ${MY_CARGO_ARGS}
-+            COMMAND ${CMAKE_COMMAND} -E env "CARGO_CMD=build" "CARGO_TARGET_DIR=${ARGS_BINARY_DIRECTORY}" "MAINTAINER_MODE=${MAINTAINER_MODE}" "RUSTFLAGS=${RUSTFLAGS}" ${cargo_EXECUTABLE} ${MY_CARGO_ARGS}
-             WORKING_DIRECTORY "${ARGS_SOURCE_DIRECTORY}"
-             DEPENDS ${LIB_SOURCES}
-             COMMENT "Building ${ARGS_TARGET} in ${ARGS_BINARY_DIRECTORY} with:  ${cargo_EXECUTABLE} ${MY_CARGO_ARGS_STRING}")
-@@ -465,8 +465,6 @@ if(NOT "${RUST_COMPILER_TARGET}" MATCHES
-     list(APPEND CARGO_ARGS "--target" ${RUST_COMPILER_TARGET})
- endif()
- 
-set(RUSTFLAGS "")
-
- if(NOT CMAKE_BUILD_TYPE)
-     set(CARGO_BUILD_TYPE "debug")
- elseif(${CMAKE_BUILD_TYPE} STREQUAL "Release" OR ${CMAKE_BUILD_TYPE} STREQUAL "MinSizeRel")
-@@ -475,10 +473,11 @@ elseif(${CMAKE_BUILD_TYPE} STREQUAL "Rel
- elseif(${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
-     set(CARGO_BUILD_TYPE "release")
-     list(APPEND CARGO_ARGS "--release")
-    set(RUSTFLAGS "-g")
-+    string(APPEND RUSTFLAGS " -g")
- else()
-     set(CARGO_BUILD_TYPE "debug")
- endif()
-+string(STRIP "${RUSTFLAGS}" RUSTFLAGS)
- 
- find_package_handle_standard_args(Rust
-     REQUIRED_VARS cargo_EXECUTABLE
--- a/clamav-stats-deprecation.patch
+++ b/clamav-stats-deprecation.patch
@ -0,0 +1,17 @@
+diff -up clamav-0.102.0/shared/optparser.c.stats-deprecation clamav-0.102.0/shared/optparser.c
+--- clamav-0.102.0/shared/optparser.c.stats-deprecation	2019-10-10 21:55:31.245995091 -0600
+++ clamav-0.102.0/shared/optparser.c	2019-10-11 20:40:04.580067432 -0600
+@@ -524,6 +524,13 @@ const struct clam_option __clam_options[
+     {"ArchiveLimitMemoryUsage", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_CLAMD | OPT_DEPRECATED, "", ""},
+     {"MailFollowURLs", "mail-follow-urls", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN | OPT_DEPRECATED, "", ""},
+     {"AllowSupplementaryGroups", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER | OPT_DEPRECATED, "Initialize a supplementary group access (the process must be started by root).", "no"},
+    {"StatsHostID", "stats-host-id", 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_CLAMD | OPT_CLAMSCAN | OPT_DEPRECATED, "", "" },
+    {"StatsEnabled", "enable-stats", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_CLAMSCAN | OPT_DEPRECATED, "", ""},
+    {"StatsPEDisabled", "disable-pe-stats", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN | OPT_DEPRECATED, "", ""},
+    {"StatsTimeout", "stats-timeout", 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, -1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN | OPT_FRESHCLAM | OPT_DEPRECATED, "", ""},
+    {"SubmitDetectionStats", NULL, 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_DEPRECATED, "", ""},
+    {"DetectionStatsCountry", NULL, 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_DEPRECATED, "", ""},
+    {"DetectionStatsHostID", NULL, 0, CLOPT_TYPE_STRING, NULL, -1, NULL, 0, OPT_FRESHCLAM | OPT_DEPRECATED, "", ""},
+     {"ScanOnAccess", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, -1, NULL, 0, OPT_CLAMD | OPT_DEPRECATED, "", ""},
+ 
+     /* Milter specific options */
--- a/clamav-types.h
+++ b/clamav-types.h
@ -1,14 +0,0 @@
-#ifndef CLAMAV_TYPES_H_MULTILIB
-#define CLAMAV_TYPES_H_MULTILIB
-
-#include <bits/wordsize.h>
-
-#if __WORDSIZE == 32
-# include "clamav-types-32.h"
-#elif __WORDSIZE == 64
-# include "clamav-types-64.h"
-#else
-# error "unexpected value for __WORDSIZE macro"
-#endif
-
-#endif
--- a/clamav.spec
+++ b/clamav.spec
@ -1,18 +1,26 @@
-#global prerelease  -rc
+#global prerelease  rc1

 %global _hardened_build 1

 ## Fedora specific customization below...
 %bcond_without  clamonacc
 %bcond_with     unrar
-# Failing with llvm 14 https://github.com/Cisco-Talos/clamav/issues/581
-%bcond_with  llvm
-
-# No ocaml on ix86
-%ifarch %{ix86}
-%bcond_with ocaml
+%ifnarch ppc64
+%bcond_without  llvm
 %else
-%bcond_without ocaml
+%bcond_with     llvm
+%endif
+
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%bcond_with old_freshclam
+%else
+%bcond_without old_freshclam
+%endif
+
+%ifnarch s390 s390x
+%global have_ocaml  1
+%else
+%global have_ocaml  0
 %endif

 %global scanuser    clamscan
@ -25,9 +33,9 @@

 Summary:    End-user tools for the Clam Antivirus scanner
 Name:       clamav
-Version:    1.4.3
-Release:    3%{?dist}
-License:    %{?with_unrar:proprietary}%{!?with_unrar:GPL-2.0-only}
+Version:    0.103.11
+Release:    1%{?dist}
+License:    %{?with_unrar:proprietary}%{!?with_unrar:GPLv2}
 URL:        https://www.clamav.net/
 %if %{with unrar}
 Source0:    https://www.clamav.net/downloads/production/%{name}-%{version}%{?prerelease}.tar.gz
@ -38,101 +46,69 @@ Source999:  https://www.clamav.net/downloads/production/%{name}-%{version}%{?pre
 # tarball was created with update_clamav.sh
 Source0:    %{name}-%{version}%{?prerelease}-norar.tar.xz
 %endif
-# Multilib headers
-Source1:    clamav-types.h
 #for server
 Source3:    clamd.logrotate
 Source5:    clamd-README
-# To download the *.cvd, go to https://www.clamav.net and use the links
-# there (I renamed the files to add the -version suffix for verifying).
-# Check the first line of the file for version or run file *cvd
-# Attention file < 5.33-7 have bugs see https://bugzilla.redhat.com/show_bug.cgi?id=1539107
+# To download the cvd file run update_clamav.sh 1
+# Need file >= 5.33-7 see https://bugzilla.redhat.com/show_bug.cgi?id=1539107
 #http://database.clamav.net/main.cvd
 Source10:   main-62.cvd
 #http://database.clamav.net/daily.cvd
-Source11:   daily-27673.cvd
+Source11:   daily-27075.cvd
 #http://database.clamav.net/bytecode.cvd
-Source12:   bytecode-336.cvd
+Source12:   bytecode-334.cvd
 #for update
 Source200:  freshclam-sleep
 Source201:  freshclam.sysconfig
 Source202:  clamav-update.crond
 Source203:  clamav-update.logrotate
 #for milter
-Source300:  README.fedora.md
+Source300:  README.fedora
 #for clamav-milter.systemd
 Source330:  clamav-milter.systemd
 #for scanner-systemd/server-systemd
 Source530:  clamd@.service

+# Restore some options removed in 0.100 as deprecated
+# Could be dropped in F32 with a note
+# https://bugzilla.redhat.com/show_bug.cgi?id=1565381#c1
+Patch0:     clamav-stats-deprecation.patch
 # Change default config locations for Fedora
 Patch1:     clamav-default_confs.patch
 # Fix pkg-config flags for static linking, multilib
-Patch2:     clamav-private.patch
+Patch2:     clamav-0.99-private.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,
-#   https://github.com/Cisco-Talos/clamav/pull/1366/commits/24d1341e8e34aa325ac03718121e33a3b4e5b75e,
-#   allowing 0.24 for backwards-compatibility with vendored dependencies in EPEL8
-# - Allow version 1.0 of the hex-literal crate dependency; not suitable for
-#   upstream yet due to MSRV
-Patch8:     clamav-rust-dependency-versions.patch

-BuildRequires:  cmake3
+Patch6:     clamav-freshclam.service.patch
+
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  gettext-devel
+BuildRequires:  libtool
+BuildRequires:  libtool-ltdl-devel
 BuildRequires:  make
 BuildRequires:  gcc-c++
-BuildRequires:  rust
-%if 0%{?fedora} || 0%{?rhel} >= 9
-BuildRequires:  rust-packaging
-%else
-# Undefining the appropriate __cmake*_in_source_build macro causes the
-# build to use a separate build path, so the build does not output to
-# the source path.  This separate build path is the default behavior
-# for >=EL9 and fedora.
-%if 0%{?rhel} == 8
-# EL8 defines cmake_in_source_build
-%undefine __cmake_in_source_build
-%else
-# EL7 defines cmake3_in_source_build
-%undefine __cmake3_in_source_build
-%endif
-BuildRequires:  rust-toolset
-%endif
-BuildRequires:  cargo
 BuildRequires:  bzip2-devel
-BuildRequires:  check-devel
 BuildRequires:  curl-devel
-BuildRequires:  git-core
 BuildRequires:  gmp-devel
 BuildRequires:  json-c-devel
-%if ! (0%{?fedora} > 40 || 0%{?rhel} > 9)
 BuildRequires:  libprelude-devel
 # libprelude-config --libs brings in gnutls, pcre
 # https://bugzilla.redhat.com/show_bug.cgi?id=1830473
 BuildRequires:  gnutls-devel
-%endif
+BuildRequires:  pcre2-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  openssl-devel
 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
 BuildRequires:  tcl
 BuildRequires:  groff
 BuildRequires:  graphviz
-%{?with_ocaml:BuildRequires: ocaml}
+%{?have_ocaml:BuildRequires: ocaml}
 # nc required for tests
 BuildRequires:  nc
 %{?systemd_requires}
@ -141,9 +117,6 @@ BuildRequires:  systemd-devel
 BuildRequires:  systemd-rpm-macros
 #for milter
 BuildRequires:  sendmail-devel
-%ifarch %{valgrind_arches}
-BuildRequires:  valgrind
-%endif

 Requires:   clamav-filesystem = %{version}-%{release}
 Requires:   clamav-lib = %{version}-%{release}
@ -165,6 +138,7 @@ Summary:    Filesystem structure for clamav
 # Prevent version mix
 Conflicts:  %{name} < %{version}-%{release}
 Conflicts:  %{name} > %{version}-%{release}
+Requires(pre):  shadow-utils
 BuildArch:  noarch

 %description filesystem
@ -176,61 +150,6 @@ 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.
@ -272,24 +191,26 @@ BuildArch:  noarch
 This package contains the documentation for clamav.


-%package freshclam
+%package update
 Summary:    Auto-updater for the Clam Antivirus scanner data-files
 Requires:   clamav-filesystem = %{version}-%{release}
 Requires:   clamav-lib        = %{version}-%{release}
-%if 0%{?fedora} || 0%{?rhel} >= 8
-Supplements:clamd
+%if %{with old_freshclam}
+Requires:   crontabs
+Requires:   /etc/cron.d
+Requires(post): %{__chown} %{__chmod}
 %endif
 Provides:   data(clamav) = empty
 Provides:   clamav-data-empty = %{version}-%{release}
 Obsoletes:  clamav-data-empty < %{version}-%{release}
-Provides:   clamav-update = %{version}-%{release}
-Obsoletes:  clamav-update < %{version}-%{release}

-%description freshclam
-This package contains the freshclam(1) program and clamav-freshclam
-service which can be used to update the clamav anti-virus database
-automatically. Most users should install this package in order to
-keep their definitions up to date.
+%description update
+This package contains programs which can be used to update the clamav
+anti-virus database automatically. It uses the freshclam(1) utility for
+this task. To activate it use, uncomment the entry in /etc/cron.d/clamav-update.
+Use this package when you go updating the virus database regulary and
+do not want to download a >160MB sized rpm-package with outdated virus
+definitions.


 %package -n clamd
@ -298,6 +219,7 @@ Requires:   data(clamav)
 Requires:   clamav-filesystem = %{version}-%{release}
 Requires:   clamav-lib        = %{version}-%{release}
 Requires:   coreutils
+Requires(pre):  shadow-utils
 # This is still used by clamsmtp and exim-clamav
 Provides: clamav-server = %{version}-%{release}
 Provides: clamav-scanner-systemd = %{version}-%{release}
@ -318,9 +240,9 @@ Summary:    Milter module for the Clam Antivirus scanner
 #Requires: clamd = %%{version}-%%{release}
 #Requires: /usr/sbin/sendmail
 Requires:   clamav-filesystem = %{version}-%{release}
+Requires(pre):  shadow-utils
 Provides: clamav-milter-systemd = %{version}-%{release}
 Obsoletes: clamav-milter-systemd < %{version}-%{release}
-Requires: group(clamscan)

 %description milter
 This package contains files which are needed to run the clamav-milter.
@ -328,55 +250,21 @@ This package contains files which are needed to run the clamav-milter.

 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
-%if 0%{?fedora} || 0%{?rhel} >= 9
-# 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.
-%cargo_prep
-cd libclamav_rust
-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

+# No longer support deprecated options in F32+ and EL8+
+%if (0%{?fedora} && 0%{?fedora} < 32) || (0%{?rhel} && 0%{?rhel} < 8)
+%patch -P0 -p1 -b .stats-deprecation
+%endif
 %patch -P1 -p1 -b .default_confs
 %patch -P2 -p1 -b .private
 %patch -P5 -p1 -b .clamonacc-service
 %patch -P6 -p1 -b .freshclam-service
-%patch -P7 -p1 -b .big-endian
-%patch -P8 -p1 -b .rust-dependencies

 install -p -m0644 %{SOURCE300} clamav-milter/

 mkdir -p libclamunrar{,_iface}
 %{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}}

-# Create sysusers.d config files
-cat >clamav.sysusers.conf <<EOF
-g virusgroup -
-u clamupdate - 'Clamav database update user' %{homedir} -
-m clamupdate virusgroup
-EOF
-cat >clamd.sysusers.conf <<EOF
-u clamscan - 'Clamav scanner user' - -
-m clamscan virusgroup
-EOF
-cat >clamav-milter.sysusers.conf <<EOF
-u clamilt - 'Clamav milter user' %{_rundir}/clamav-milter -
-m clamilt virusgroup
-m clamilt clamscan
-EOF
-
-%if 0%{?fedora} || 0%{?rhel} >= 9
-%generate_buildrequires
-# The generate_buildrequires stage doesn't exist prior to EL9, so this
-# section is conditionally removed in these build environments.
-cd libclamav_rust
-%cargo_generate_buildrequires
-%endif

 %build
 # add -Wl,--as-needed if not exist
@ -384,39 +272,41 @@ export LDFLAGS=$(echo %{?__global_ldflags} | sed '/-Wl,--as-needed/!s/$/ -Wl,--a
 # IPv6 check is buggy and does not work when there are no IPv6 interface on build machine
 export have_cv_ipv6=yes

-%cmake3 \
-%if 0%{?fedora} || 0%{?rhel} >= 8
-    -DRUSTFLAGS="%build_rustflags" \
-%else
-    -DRUSTFLAGS="%__global_rustflags" \
-%endif
-    -DAPP_CONFIG_DIRECTORY=%{_sysconfdir} \
-    -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}
+rm -rf libltdl autom4te.cache Makefile.in
+autoreconf -i
+%configure \
+    --enable-milter \
+    --disable-clamav \
+    --disable-static \
+    --disable-zlib-vcheck \
+    %{!?with_unrar:--disable-unrar} \
+    --enable-id-check \
+    --enable-dns \
+    --with-dbdir=%{homedir} \
+    --with-group=%{updateuser} \
+    --with-user=%{updateuser} \
+    --disable-rpath \
+    --disable-silent-rules \
+    --enable-clamdtop \
+    --enable-prelude \
+    %{!?with_clamonacc:--disable-clamonacc} \
+    %{!?with_llvm:--disable-llvm}

 # TODO: check periodically that CLAMAVUSER is used for freshclam only

-%cmake3_build
-
-cd libclamav_rust
-%cargo_license_summary
-%{cargo_license} > ../LICENSES.dependencies
+%make_build


 %install
-rm -rf _doc*
-%cmake3_install
+%make_install

 install -d -m 0755 \
    %{buildroot}%{_tmpfilesdir} \
    %{buildroot}%{homedir} \
    %{buildroot}%{quarantinedir}

+rm -f %{buildroot}%{_libdir}/*.la
+
 ### data
 install -D -m 0644 -p %{SOURCE10}     %{buildroot}%{homedir}/main.cvd
 install -D -m 0644 -p %{SOURCE11}     %{buildroot}%{homedir}/daily.cvd
@ -432,6 +322,15 @@ mv %{buildroot}%{_sysconfdir}/freshclam.conf{.sample,}
 # Can contain HTTPProxyPassword (bugz#1733112)
 chmod 600 %{buildroot}%{_sysconfdir}/freshclam.conf

+%if %{with old_freshclam}
+install -d -m 0755 %{buildroot}%{_var}/log
+install -d -m 0755 %{buildroot}%{_sysconfdir}/logrotate.d
+install -D -p -m 0755 %{SOURCE200}    %{buildroot}%{_datadir}/%{name}/freshclam-sleep
+install -D -p -m 0644 %{SOURCE201}    %{buildroot}%{_sysconfdir}/sysconfig/freshclam
+install -D -p -m 0600 %{SOURCE202}    %{buildroot}%{_sysconfdir}/cron.d/clamav-update
+install -D -m 0644 -p %{SOURCE203}    %{buildroot}%{_sysconfdir}/logrotate.d/clamav-update
+%endif
+
 ### The scanner stuff
 install -D -m 0644 -p %{SOURCE3}      _doc_server/clamd.logrotate
 install -D -m 0644 -p %{SOURCE5}      _doc_server/README
@ -482,34 +381,12 @@ cat << EOF > %{buildroot}%{_tmpfilesdir}/clamav-milter.conf
 d %{_rundir}/clamav-milter 0710 %{milteruser} %{milteruser}
 EOF

-#Fixup headers and scripts for multilib
-%if 0%{?__isa_bits} == 64
-mv %{buildroot}%{_includedir}/clamav-types.h \
-   %{buildroot}%{_includedir}/clamav-types-64.h
-%else
-mv %{buildroot}%{_includedir}/clamav-types.h \
-   %{buildroot}%{_includedir}/clamav-types-32.h
-%endif
-install -m 0644 %SOURCE1 %{buildroot}%{_includedir}/clamav-types.h
-
 # TODO: Evaluate using upstream's unit with clamav-daemon.socket
 rm %{buildroot}%{_unitdir}/clamav-daemon.*

-install -m0644 -D clamav.sysusers.conf %{buildroot}%{_sysusersdir}/clamav.conf
-install -m0644 -D clamd.sysusers.conf %{buildroot}%{_sysusersdir}/clamd.conf
-install -m0644 -D clamav-milter.sysusers.conf %{buildroot}%{_sysusersdir}/clamav-milter.conf
-

 %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 || :
+make check


 %post
@ -522,21 +399,35 @@ install -m0644 -D clamav-milter.sysusers.conf %{buildroot}%{_sysusersdir}/clamav
 %systemd_postun_with_restart clamav-clamonacc.service


-%post data
-# nullglob. If set, Bash allows filename patterns which match no files to expand to a null string, rather than themselves
-shopt -s nullglob
-# Let newer .cld files take precedence over the shipped .cvd files
-for f in %{homedir}/*.cld
-do
-    cvd=${f/.cld/.cvd}
-    [ -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 || \
+    useradd -r -g %{updateuser} -d %{homedir} -s /sbin/nologin \
+    -c "Clamav database update user" %{updateuser}
+getent group virusgroup >/dev/null || groupadd -r virusgroup
+usermod %{updateuser} -a -G virusgroup
+exit 0
+
+
+%pre -n clamd
+getent group %{scanuser} >/dev/null || groupadd -r %{scanuser}
+getent passwd %{scanuser} >/dev/null || \
+    useradd -r -g %{scanuser} -d / -s /sbin/nologin \
+    -c "Clamav scanner user" %{scanuser}
+usermod %{scanuser} -a -G virusgroup
+exit 0

 %post -n clamd
 # Point to the new service unit
 [ -L /etc/systemd/system/multi-user.target.wants/clamd@scan.service ] &&
    ln -sf /usr/lib/systemd/system/clamd@.service /etc/systemd/system/multi-user.target.wants/clamd@scan.service || :
 %systemd_post clamd@scan.service
+%if 0%{?rhel}
+if [ $1 -eq 1 ] && [ -x /usr/bin/systemctl ]; then
+# Initial installation
+/bin/systemd-tmpfiles --create %{_tmpfilesdir}/clamd.scan.conf
+fi
+%endif

 %preun -n clamd
 %systemd_preun clamd@scan.service
@ -544,8 +435,28 @@ done
 %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
+/usr/sbin/groupmems -g %{scanuser} -a %{milteruser} &>/dev/null || :
+
+%pre milter
+getent group %{milteruser} >/dev/null || groupadd -r %{milteruser}
+getent passwd %{milteruser} >/dev/null || \
+    useradd -r -g %{milteruser} -d %{_rundir}/clamav-milter -s /sbin/nologin \
+    -c "Clamav Milter user" %{milteruser}
+usermod %{milteruser} -a -G virusgroup
+exit 0
+
 %post milter
 %systemd_post clamav-milter.service
+%if 0%{?rhel}
+if [ $1 -eq 1 ] && [ -x /usr/bin/systemctl ]; then
+# Initial installation
+/bin/systemd-tmpfiles --create %{_tmpfilesdir}/clamav-milter.conf || :
+fi
+%endif

 %preun milter
 %systemd_preun clamav-milter.service
@ -553,13 +464,28 @@ done
 %postun milter
 %systemd_postun_with_restart clamav-milter.service

-%post freshclam
+%post update
+%if %{with old_freshclam}
+test -e %{freshclamlog} || {
+    touch %{freshclamlog}
+    %{__chmod} 0664 %{freshclamlog}
+    %{__chown} root:%{updateuser} %{freshclamlog}
+    ! test -x /sbin/restorecon || /sbin/restorecon %{freshclamlog}
+}
+#%%else
+#if [ $1 -eq 2 ] ; then
+#   echo "Warning: clamav-update package changed"
+#   echo "Now we provide clamav-freshclam.service systemd unit instead old scripts and the cron.d entry."
+#   echo "Unfortunately this may break existing unattended installations."
+#   echo "Please run 'systemctl enable clamav-freshclam --now' to enable freshclam updates again."
+#fi
+%endif
 %systemd_post clamav-freshclam.service

-%preun freshclam
+%preun update
 %systemd_preun clamav-freshclam.service

-%postun freshclam
+%postun update
 %systemd_postun_with_restart clamav-freshclam.service

 %ldconfig_scriptlets   lib
@ -588,19 +514,16 @@ done


 %files lib
-# Licenses for statically linked Rust dependencies in libclamav
-%license LICENSES.dependencies
-%{_libdir}/libclamav.so.12*
+%{_libdir}/libclamav.so.9*
 %{_libdir}/libclammspack.so.0*
 %if %{with unrar}
-%{_libdir}/libclamunrar*.so.12*
+%{_libdir}/libclamunrar*.so.9*
 %endif


 %files devel
 %{_includedir}/*
 %{_libdir}/*.so
-%{_libdir}/libclamav_rust.a
 %{_libdir}/pkgconfig/*
 %{_bindir}/clamav-config

@ -610,7 +533,6 @@ done
 %dir %{_sysconfdir}/clamd.d
 # Used by both clamd, clamdscan, and clamonacc
 %config(noreplace) %{_sysconfdir}/clamd.d/scan.conf
-%{_sysusersdir}/clamav.conf


 %files data
@ -623,24 +545,27 @@ done

 %files doc
 %license COPYING
-%{_pkgdocdir}/html/
+%doc docs/html


-%files freshclam
+%files update
 %{_bindir}/freshclam
-%{_libdir}/libfreshclam.so.3*
+%{_libdir}/libfreshclam.so.2*
 %{_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
+%if %{with old_freshclam}
+%{_datadir}/%{name}/freshclam-sleep
+%config(noreplace) %{_sysconfdir}/cron.d/clamav-update
+%config(noreplace) %{_sysconfdir}/sysconfig/freshclam
+%config(noreplace) %verify(not mtime)  %{_sysconfdir}/logrotate.d/*
+# freshclamlog file is created in post
+%ghost %attr(0664,root,%{updateuser}) %verify(not size md5 mtime) %{freshclamlog}
+%endif
+%ghost %attr(0644,%{updateuser},%{updateuser}) %{homedir}/main.cvd
 %ghost %attr(0644,%{updateuser},%{updateuser}) %{homedir}/freshclam.dat
 %ghost %attr(0644,%{updateuser},%{updateuser}) %{homedir}/daily.cld
-%ghost %attr(0644,%{updateuser},%{updateuser}) %{homedir}/daily.cvd
-%ghost %attr(0644,%{updateuser},%{updateuser}) %{homedir}/main.cld
-%ghost %attr(0644,%{updateuser},%{updateuser}) %{homedir}/main.cvd
+%ghost %attr(0644,%{updateuser},%{updateuser}) %{homedir}/bytecode.cld


 %files -n clamd
@ -650,95 +575,30 @@ done
 %{_sbindir}/clamd
 %{_unitdir}/clamd@.service
 %{_tmpfilesdir}/clamd.scan.conf
-%{_sysusersdir}/clamd.conf


 %files milter
-%doc clamav-milter/README.fedora.md
+%doc clamav-milter/README.fedora
 %{_sbindir}/*milter*
 %{_unitdir}/clamav-milter.service
 %{_mandir}/man8/clamav-milter*
 %dir %{_sysconfdir}/mail
 %config(noreplace) %{_sysconfdir}/mail/clamav-milter.conf
 %{_tmpfilesdir}/clamav-milter.conf
-%{_sysusersdir}/clamav-milter.conf


 %changelog
-* Thu Dec 04 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.4.3-3
- Bump EVR, hex-literal patches.
+* Sun Oct 29 2023 Orion Poplawski <orion@nwra.com> - 0.103.11-1
+- Update to 0.103.11

-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+* Thu Aug 31 2023 Sérgio Basto <sergio@serjux.com> - 0.103.10-1
+- Update to 0.103.10

-* Wed Jun 18 2025 Gwyn Ciesla <gwync@protonmail.com> - 1.4.3-1
- 1.4.3
+* Fri Aug 18 2023 Orion Poplawski <orion@nwra.com> - 0.103.9-1
+- Update to 0.103.9 CVE-2023-20197 (bz#2232508)

-* Sat Feb  8 2025 Zbigniew Jedrzejewski-Szmek <zbyszek@in.waw.pl> - 1.4.2-2
- Add sysusers.d config files to allow rpm to create users/groups automatically
-
-* Thu Jan 23 2025 Orion Poplawski <orion@nwra.com> - 1.4.2-1
- Update to 1.4.2
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Sep 25 2024 Orion Poplawski <orion@nwra.com> - 1.4.1-1
- Update to 1.4.1
-
-* Sun Sep 15 2024 Benjamin A. Beasley <code@musicinmybrain.net> - 1.0.7-2
- Update the image crate dependency to 0.25, the current release
-
-* 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
-
-* Mon Apr 08 2024 Sérgio Basto <sergio@serjux.com> - 1.0.5-5
- Update clamav-data and README.fedora.md
-
-* 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
- (#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
+* 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
--- a/clamd.logrotate
+++ b/clamd.logrotate
@ -4,6 +4,6 @@
 	missingok

 	postrotate
-		pkill -u <USER> -HUP -f "/usr/sbin/clamd -c /etc/clamd.d/<SERVICE>.conf" >/dev/null 2>&1 || :
+		pkill -u <USER> -HUP -f '/usr/sbin/clamd -c /etc/clamd.d/<SERVICE>.conf >/dev/null 2>&1 || :
 	endscript
 }
--- a/libclamav-pe-Use-endian-wrapper-in-more-places.patch
+++ b/libclamav-pe-Use-endian-wrapper-in-more-places.patch
@ -1,73 +0,0 @@
-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. */
-    if (peinfo->dirs[1].VirtualAddress == 0 || peinfo->dirs[1].Size == 0) {
-+    if (EC32(peinfo->dirs[1].VirtualAddress) == 0 || EC32(peinfo->dirs[1].Size) == 0) {
-         cli_dbgmsg("scan_pe: import table data dir does not exist (skipping .imp scanning)\n");
-         status = CL_BREAK;
-         goto done;
-     }
- 
-     // TODO Add EC32 wrappers
-    impoff = cli_rawaddr(peinfo->dirs[1].VirtualAddress, peinfo->sections, peinfo->nsections, &err, fsize, peinfo->hdr_size);
-    if (err || impoff + peinfo->dirs[1].Size > fsize) {
-+    impoff = cli_rawaddr(EC32(peinfo->dirs[1].VirtualAddress), peinfo->sections, peinfo->nsections, &err, fsize, peinfo->hdr_size);
-+    if (err || impoff + EC32(peinfo->dirs[1].Size) > fsize) {
-         cli_dbgmsg("scan_pe: invalid rva for import table data\n");
-         status = CL_BREAK;
-         goto done;
-     }
- 
-     // TODO Add EC32 wrapper
-    impdes = (const struct pe_image_import_descriptor *)fmap_need_off(map, impoff, peinfo->dirs[1].Size);
-+    impdes = (const struct pe_image_import_descriptor *)fmap_need_off(map, impoff, EC32(peinfo->dirs[1].Size));
-     if (impdes == NULL) {
-         cli_dbgmsg("scan_pe: failed to acquire fmap buffer\n");
-         status = CL_EREAD;
-@@ -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. */
-    left = peinfo->dirs[1].Size;
-+    left = EC32(peinfo->dirs[1].Size);
- 
-     if (genhash[CLI_HASH_MD5]) {
-         hashctx[CLI_HASH_MD5] = cl_hash_init("md5");
-@@ -2556,7 +2556,7 @@ static cl_error_t hash_imptbl(cli_ctx *c
- 
- done:
-     if (needed_impoff) {
-        fmap_unneed_off(map, impoff, peinfo->dirs[1].Size);
-+        fmap_unneed_off(map, impoff, EC32(peinfo->dirs[1].Size));
-     }
- 
-     for (type = CLI_HASH_MD5; type < CLI_HASH_AVAIL_TYPES; type++) {
-@@ -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 = calloc(1, sizeof(*stats));
-             unsigned int m            = 1000;
-             ret                       = CL_CLEAN;
-@@ -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);
-     }
- 
-    if (is_dll || peinfo->ndatadirs < 3 || !peinfo->dirs[2].Size)
-+    if (is_dll || peinfo->ndatadirs < 3 || !EC32(peinfo->dirs[2].Size))
-         peinfo->res_addr = 0;
-     else
-         peinfo->res_addr = peinfo->dirs[2].VirtualAddress;
- 
-     while (opts & CLI_PEHEADER_OPT_EXTRACT_VINFO &&
-           peinfo->ndatadirs >= 3 && peinfo->dirs[2].Size) {
-+           peinfo->ndatadirs >= 3 && EC32(peinfo->dirs[2].Size)) {
-         struct vinfo_list vlist;
-         const uint8_t *vptr, *baseptr;
-         uint32_t rva, res_sz;
--- a/6
+++ b/6
@ -1,4 +1,4 @@
-SHA512 (clamav-1.4.3-norar.tar.xz) = d9e6835b88e4934a36b037d28cf01e627b7843e52ef9fc6858f59000acf26120f3534e7a6b262d3ad66a2668557f3a1d0a93fb676711c91f64c8b97fa36fe191
+SHA512 (clamav-0.103.11-norar.tar.xz) = a215a48be417d351353babf8a54778f35a2ce88c8b90431f983d890a1cfa19715896bab7655c5fa50961997861884a09193e1a0da76dc22817b9b144b400778f
 SHA512 (main-62.cvd) = b52e5d9ecacbd9b11c3b0cc460388746fccb353a7520522ed15ee25f645a432bed5be7e6b38512f134f085eb9be76a1e26c19de8b09491d4ec46da8c5afc318e
-SHA512 (daily-27673.cvd) = e0447f80ef2cc8981b0e1ea430a7006a1027de0b989f5a3256766804f74a50aac52f577ef929c8e1789b9353d1a4cf18d289a27b1f7e609098e11ad81bb62226
-SHA512 (bytecode-336.cvd) = 62a7f8b62da2a2476d3f66851d71e84f055f84543112b18f14e86484b02370d4daff0cb3e2b9ec77acf4a179327619a8b9950122e7882003074a9a0bf4a7ebab
+SHA512 (daily-27075.cvd) = 4cc826f58a45ceb28faba4bf7dd9f8c5ec47f5c0467e73c70d76f415ba3e36cb8585c8924fad59e8818a6e33499744e04378adc27abcca018d2b5ece4cd6a52f
+SHA512 (bytecode-334.cvd) = 83478af4e097b4b3fe136c943d3dd018f3e678c6859873dc1aef527db40a018b77439be2113ac251dfb797074ef8c201336570c3fe03c7ac507d5b94ab6d61c9
--- a/update_clamav.sh
+++ b/update_clamav.sh
@ -1,5 +1,6 @@
-VERSION=1.4.3
-REPOS="n"
+# this script is to run on branch f37
+VERSION=0.103.11
+REPOS="epel8 epel7"

 if [ -z "$1" ]
 then
@ -29,18 +30,38 @@ wget -c https://www.clamav.net/downloads/production/${TARBALL}
 wget -c https://www.clamav.net/downloads/production/${TARBALL}.sig
 gpg --verify ${TARBALL}.sig ${TARBALL}
 zcat ${TARBALL} | tar --delete -f - '*/libclamunrar/*' | xz -c > ${TARBALL_CLEAN}
-git checkout rawhide
+git checkout f37
 git pull
 rpmdev-bumpspec -n $VERSION -c "Update to $VERSION" clamav.spec
 fi
 fi

+#python3 -m pip install --user cvdupdate
+#python -m cvdupdate.cvdupdate --help
+cvd config set --dbdir my_dbs
+cvdupdate list
+cvdupdate update
+pushd my_dbs
+main_ver=$(file main.cvd | sed -e 's/.*version /main-/;s/,.*/.cvd/')
+daily_ver=$(file daily.cvd | sed -e 's/.*version /daily-/;s/,.*/.cvd/')
+bytecode_ver=$(file bytecode.cvd | sed -e 's/.*version /bytecode-/;s/,.*/.cvd/')
+popd
+
 if test $stage -le 1
 then
 echo STAGE 1
 echo Press enter convert cvd into spec or n to skip ; read dummy;
 if [[ "$dummy" != "n" ]]; then
-./update_clamav_data.sh
+
+pushd my_dbs
+cp -f main.cvd ../$main_ver
+cp -f daily.cvd ../$daily_ver
+cp -f bytecode.cvd ../$bytecode_ver
+popd
+
+sed -i "s|^Source10: .*|Source10:   $main_ver|" clamav.spec
+sed -i "s|^Source11: .*|Source11:   $daily_ver|" clamav.spec
+sed -i "s|^Source12: .*|Source12:   $bytecode_ver|" clamav.spec
 fi
 fi

@ -63,7 +84,7 @@ fi
 if test $stage -le 3
 then
 echo STAGE 3
-echo Press enter to build rawhide or n to skip; read dummy;
+echo Press enter to build f37 or n to skip; read dummy;
 if [[ "$dummy" != "n" ]]; then
 git push && fedpkg build --nowait
 fi
@ -73,7 +94,7 @@ echo STAGE 4
 for repo in $REPOS ; do
 echo Press enter to build on branch $repo or n to skip; read dummy;
 if [[ "$dummy" != "n" ]]; then
-git checkout $repo && git merge rawhide && fedpkg push && fedpkg build --nowait; git checkout rawhide
+git checkout $repo && git merge f37 && fedpkg push && fedpkg build --nowait; git checkout f37
 fi
 done

--- a/update_clamav_data.sh
+++ b/update_clamav_data.sh
@ -1,20 +0,0 @@
-# dnf install python3-cvdupdate
-# python -m cvdupdate.cvdupdate --help
-cvd config set --dbdir my_dbs
-cvdupdate list
-cvdupdate update
-pushd my_dbs
-main_ver=$(file main.cvd | sed -e 's/.*version /main-/;s/,.*/.cvd/')
-daily_ver=$(file daily.cvd | sed -e 's/.*version /daily-/;s/,.*/.cvd/')
-bytecode_ver=$(file bytecode.cvd | sed -e 's/.*version /bytecode-/;s/,.*/.cvd/')
-popd
-
-pushd my_dbs
-cp -f main.cvd ../$main_ver
-cp -f daily.cvd ../$daily_ver
-cp -f bytecode.cvd ../$bytecode_ver
-popd
-
-sed -i "s|^Source10: .*|Source10:   $main_ver|" clamav.spec
-sed -i "s|^Source11: .*|Source11:   $daily_ver|" clamav.spec
-sed -i "s|^Source12: .*|Source12:   $bytecode_ver|" clamav.spec
Author	SHA1	Message	Date
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