$ git diff --patch-with-stat --summary 095b7ba51913428598009c75298016939f51d56d..d1f65c3ed3548d4b0d871df6920dbb0cf4b4803f
.abf.yml | 8 +++---
clamav-0.98-umask.patch | 20 ++++++-------
clamav-mdv_conf.diff | 74 ++++++++++++++++++++++++-------------------------
clamav.spec | 12 +++++---
4 files changed, 59 insertions(+), 55 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index d704105..6193809 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,5 +1,5 @@
sources:
- bytecode.cvd: 733652e460cdb26759814dc43d86a3034f2c34d1
- clamav-0.102.0.tar.gz: 42413ff5eaed69f20a3756fa3b06cbbb63ee7766
- daily.cvd: 606a4ac2485766f4dfada47ca468f81df098427b
- main.cvd: d275ad7d79af6ecf602d8813173a0bb0a0a00a88
+ clamav-0.103.0.tar.gz: 259a726e7aaeebeed138578192a80e06f949638c
+ bytecode.cvd: f47e8073de0be406e1784e8d35f5a50e196d84bb
+ daily.cvd: cd4d26138be1ea356c394cf1efad8b7ea8f79671
+ main.cvd: f5856e9669af3ce48a467b02a5a22d0c51431b6a
diff --git a/clamav-0.98-umask.patch b/clamav-0.98-umask.patch
index 31c0fdc..2679e2e 100644
--- a/clamav-0.98-umask.patch
+++ b/clamav-0.98-umask.patch
@@ -1,19 +1,19 @@
-diff -up clamav-0.102.0/freshclam/freshclam.c clamav-0.102.0/freshclam/freshclam.c-angry
---- clamav-0.102.0/freshclam/freshclam.c 2019-10-01 19:24:08.000000000 +0200
-+++ clamav-0.102.0/freshclam/freshclam.c-angry 2019-11-02 02:14:31.667081297 +0100
-@@ -124,7 +124,7 @@ static void writepid(const char *pidfile
+diff -up clamav-0.103.0/freshclam/freshclam.c.3~ clamav-0.103.0/freshclam/freshclam.c
+--- clamav-0.103.0/freshclam/freshclam.c.3~ 2020-09-19 16:55:15.032430843 +0200
++++ clamav-0.103.0/freshclam/freshclam.c 2020-09-19 16:56:04.130021827 +0200
+@@ -126,7 +126,7 @@ static int writepid(const char *pidfile)
{
FILE *fd;
int old_umask;
-- old_umask = umask(0006);
+- old_umask = umask(0002);
+ old_umask = umask(0022);
if ((fd = fopen(pidfile, "w")) == NULL) {
logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno));
- } else {
-diff -up clamav-0.102.0/shared/output.c clamav-0.102.0/shared/output.c-angry
---- clamav-0.102.0/shared/output.c 2019-10-01 19:24:09.000000000 +0200
-+++ clamav-0.102.0/shared/output.c-angry 2019-11-02 02:15:53.914082618 +0100
-@@ -359,7 +359,7 @@ int logg(const char *str, ...)
+ return 1;
+diff -up clamav-0.103.0/shared/output.c.3~ clamav-0.103.0/shared/output.c
+--- clamav-0.103.0/shared/output.c.3~ 2020-09-13 02:27:10.000000000 +0200
++++ clamav-0.103.0/shared/output.c 2020-09-19 16:55:15.032430843 +0200
+@@ -357,7 +357,7 @@ int logg(const char *str, ...)
logg_open();
if (!logg_fp && logg_file) {
diff --git a/clamav-mdv_conf.diff b/clamav-mdv_conf.diff
index 8e26a76..fcba85c 100644
--- a/clamav-mdv_conf.diff
+++ b/clamav-mdv_conf.diff
@@ -1,6 +1,6 @@
-diff -up clamav-0.102.0/etc/clamav-milter.conf.sample clamav-0.102.0/etc/clamav-milter.conf.sample-angry
---- clamav-0.102.0/etc/clamav-milter.conf.sample 2019-10-01 19:24:08.000000000 +0200
-+++ clamav-0.102.0/etc/clamav-milter.conf.sample-angry 2019-11-02 01:32:33.476040827 +0100
+diff -up clamav-0.103.0/etc/clamav-milter.conf.sample.1~ clamav-0.103.0/etc/clamav-milter.conf.sample
+--- clamav-0.103.0/etc/clamav-milter.conf.sample.1~ 2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/etc/clamav-milter.conf.sample 2020-09-19 16:53:06.161903456 +0200
@@ -2,9 +2,6 @@
## Example config file for clamav-milter
##
@@ -36,8 +36,8 @@ diff -up clamav-0.102.0/etc/clamav-milter.conf.sample clamav-0.102.0/etc/clamav-
# Waiting for data from clamd will timeout after this time (seconds).
# Value of 0 disables the timeout.
-@@ -61,12 +60,12 @@ Example
- # daemon (main thread).
+@@ -64,12 +63,12 @@ Example
+ # also owned by root to keep other users from tampering with it.
#
# Default: disabled
-#PidFile /var/run/clamav-milter.pid
@@ -51,7 +51,7 @@ diff -up clamav-0.102.0/etc/clamav-milter.conf.sample clamav-0.102.0/etc/clamav-
##
## Clamd options
-@@ -88,7 +87,7 @@ Example
+@@ -91,7 +90,7 @@ Example
# fashion.
#
# Default: no default
@@ -60,7 +60,7 @@ diff -up clamav-0.102.0/etc/clamav-milter.conf.sample clamav-0.102.0/etc/clamav-
##
-@@ -211,7 +210,7 @@ Example
+@@ -214,7 +213,7 @@ Example
# A full path is required.
#
# Default: disabled
@@ -69,7 +69,7 @@ diff -up clamav-0.102.0/etc/clamav-milter.conf.sample clamav-0.102.0/etc/clamav-
# By default the log file is locked for writing - the lock protects against
# running clamav-milter multiple times.
-@@ -249,7 +248,7 @@ Example
+@@ -252,7 +251,7 @@ Example
# Enable verbose logging.
#
# Default: no
@@ -78,9 +78,9 @@ diff -up clamav-0.102.0/etc/clamav-milter.conf.sample clamav-0.102.0/etc/clamav-
# Enable log rotation. Always enabled when LogFileMaxSize is enabled.
# Default: no
-diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.sample-angry
---- clamav-0.102.0/etc/clamd.conf.sample 2019-10-01 19:24:08.000000000 +0200
-+++ clamav-0.102.0/etc/clamd.conf.sample-angry 2019-11-02 01:42:03.331049985 +0100
+diff -up clamav-0.103.0/etc/clamd.conf.sample.1~ clamav-0.103.0/etc/clamd.conf.sample
+--- clamav-0.103.0/etc/clamd.conf.sample.1~ 2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/etc/clamd.conf.sample 2020-09-19 16:53:50.146420540 +0200
@@ -4,14 +4,11 @@
##
@@ -97,9 +97,9 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# By default the log file is locked for writing - the lock protects against
# running clamd multiple times (if want to run another clamd, please
-@@ -71,15 +68,15 @@ Example
- # This option allows you to save a process identifier of the listening
- # daemon (main thread).
+@@ -74,15 +71,15 @@ Example
+ # It is recommended that the directory where this file is stored is
+ # also owned by root to keep other users from tampering with it.
# Default: disabled
-#PidFile /var/run/clamd.pid
+PidFile /run/clamav/clamd.pid
@@ -116,7 +116,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# Only load the official signatures published by the ClamAV project.
# Default: no
-@@ -90,7 +87,7 @@ Example
+@@ -93,7 +90,7 @@ Example
# Path to a local socket file the daemon will listen on.
# Default: disabled (must be specified by a user)
@@ -125,7 +125,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# Sets the group ownership on the unix socket.
# Default: disabled (the primary group of the user running clamd)
-@@ -102,7 +99,7 @@ Example
+@@ -105,7 +102,7 @@ Example
# Remove stale socket after unclean shutdown.
# Default: yes
@@ -134,7 +134,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# TCP port address.
# Default: no
-@@ -137,11 +134,11 @@ Example
+@@ -140,11 +137,11 @@ Example
# Maximum number of threads running at the same time.
# Default: 10
@@ -148,7 +148,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# This option specifies the time (in seconds) after which clamd should
# timeout if a client doesn't provide any initial command after connecting.
-@@ -164,7 +161,7 @@ Example
+@@ -167,7 +164,7 @@ Example
# max is 1024).
#
# Default: 100
@@ -157,7 +157,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# Waiting for a new job will timeout after this time (seconds).
# Default: 30
-@@ -182,11 +179,11 @@ Example
+@@ -185,11 +182,11 @@ Example
# Follow directory symlinks.
# Default: no
@@ -171,7 +171,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# Scan files and directories on other filesystems.
# Default: yes
-@@ -203,10 +200,11 @@ Example
+@@ -216,10 +213,11 @@ Example
# Run as another user (clamd must be started by root for this option to work)
# Default: don't drop privileges
@@ -185,7 +185,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# Don't fork into background.
# Default: no
-@@ -333,7 +331,7 @@ Example
+@@ -346,7 +344,7 @@ Example
# and Petite. If you turn off this option, the original files will still be
# scanned, but without additional processing.
# Default: yes
@@ -194,7 +194,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# Certain PE files contain an authenticode signature. By default, we check
# the signature chain in the PE file against a database of trusted and
-@@ -362,7 +360,7 @@ Example
+@@ -375,7 +373,7 @@ Example
# If you turn off this option, the original files will still be scanned, but
# without additional processing.
# Default: yes
@@ -203,7 +203,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# This option enables scanning within PDF files.
# If you turn off this option, the original files will still be scanned, but
-@@ -397,7 +395,7 @@ Example
+@@ -410,7 +408,7 @@ Example
# If you turn off this option, the original files will still be scanned, but
# without parsing individual messages/attachments.
# Default: yes
@@ -212,7 +212,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# Scan RFC1341 messages split over many emails.
# You will need to periodically clean up $TemporaryDirectory/clamav-partial
-@@ -410,7 +408,7 @@ Example
+@@ -423,7 +421,7 @@ Example
# With this option enabled ClamAV will try to detect phishing attempts by using
# HTML.Phishing and Email.Phishing NDB signatures.
# Default: yes
@@ -221,7 +221,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
# With this option enabled ClamAV will try to detect phishing attempts by
# analyzing URLs found in emails using WDB and PDB signature databases.
-@@ -455,7 +453,7 @@ Example
+@@ -473,7 +471,7 @@ Example
# Default: yes
# If you turn off this option, the original files will still be scanned, but
# without additional processing.
@@ -230,7 +230,7 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
##
-@@ -466,7 +464,7 @@ Example
+@@ -484,7 +482,7 @@ Example
# If you turn off this option, the original files will still be scanned, but
# without unpacking and additional processing.
# Default: yes
@@ -239,9 +239,9 @@ diff -up clamav-0.102.0/etc/clamd.conf.sample clamav-0.102.0/etc/clamd.conf.samp
##
-diff -up clamav-0.102.0/etc/freshclam.conf.sample clamav-0.102.0/etc/freshclam.conf.sample-angry
---- clamav-0.102.0/etc/freshclam.conf.sample 2019-10-01 19:24:08.000000000 +0200
-+++ clamav-0.102.0/etc/freshclam.conf.sample-angry 2019-11-02 01:47:06.038054850 +0100
+diff -up clamav-0.103.0/etc/freshclam.conf.sample.1~ clamav-0.103.0/etc/freshclam.conf.sample
+--- clamav-0.103.0/etc/freshclam.conf.sample.1~ 2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/etc/freshclam.conf.sample 2020-09-19 16:54:32.742925593 +0200
@@ -4,17 +4,14 @@
##
@@ -271,12 +271,12 @@ diff -up clamav-0.102.0/etc/freshclam.conf.sample clamav-0.102.0/etc/freshclam.c
# Use system logger (can work together with UpdateLogFile).
# Default: no
-@@ -48,12 +45,13 @@ Example
-
- # This option allows you to save the process identifier of the daemon
+@@ -51,12 +48,13 @@ Example
+ # It is recommended that the directory where this file is stored is
+ # also owned by root to keep other users from tampering with it.
# Default: disabled
-#PidFile /var/run/freshclam.pid
-+PidFile /run//clamav/freshclam.pid
++PidFile /run/clamav/freshclam.pid
# By default when started freshclam drops privileges and switches to the
# "clamav" user. This directive allows you to change the database owner.
@@ -287,7 +287,7 @@ diff -up clamav-0.102.0/etc/freshclam.conf.sample clamav-0.102.0/etc/freshclam.c
# Use DNS to verify virus database version. Freshclam uses DNS TXT records
# to verify database and software versions. With this directive you can change
-@@ -61,7 +59,7 @@ Example
+@@ -64,7 +62,7 @@ Example
# WARNING: Do not touch it unless you're configuring freshclam to use your
# own database verification domain.
# Default: current.cvd.clamav.net
@@ -296,7 +296,7 @@ diff -up clamav-0.102.0/etc/freshclam.conf.sample clamav-0.102.0/etc/freshclam.c
# database.clamav.net is now the primary domain name to be used world-wide.
# Now that CloudFlare is being used as our Content Delivery Network (CDN),
-@@ -73,12 +71,12 @@ DatabaseMirror database.clamav.net
+@@ -76,12 +74,12 @@ DatabaseMirror database.clamav.net
# How many attempts to make before giving up.
# Default: 3 (per mirror)
@@ -311,7 +311,7 @@ diff -up clamav-0.102.0/etc/freshclam.conf.sample clamav-0.102.0/etc/freshclam.c
# By default freshclam will keep the local databases (.cld) uncompressed to
# make their handling faster. With this option you can enable the compression;
-@@ -112,7 +110,7 @@ DatabaseMirror database.clamav.net
+@@ -115,7 +113,7 @@ DatabaseMirror database.clamav.net
# Number of database checks per day.
# Default: 12 (every two hours)
@@ -320,7 +320,7 @@ diff -up clamav-0.102.0/etc/freshclam.conf.sample clamav-0.102.0/etc/freshclam.c
# Proxy settings
# The HTTPProxyServer may be prefixed with [scheme]:// to specify which kind
-@@ -142,7 +140,7 @@ DatabaseMirror database.clamav.net
+@@ -145,7 +143,7 @@ DatabaseMirror database.clamav.net
# Send the RELOAD command to clamd.
# Default: no
diff --git a/clamav.spec b/clamav.spec
index 9c3f221..a8915ed 100644
--- a/clamav.spec
+++ b/clamav.spec
@@ -1,6 +1,7 @@
%define major 9
%define libname %mklibname %{name} %{major}
%define develname %mklibname %{name} -d
+%define debug_package %{nil}
%define _disable_rebuild_configure 1
%define _disable_lto 1
@@ -11,7 +12,7 @@
Summary: An anti-virus utility for Unix
Name: clamav
-Version: 0.102.0
+Version: 0.103.0
Release: 1
License: GPLv2+
Group: File tools
@@ -131,7 +132,7 @@ This package contains the development library and header files for the
%prep
%setup -q -n %{name}-%{version}
-%apply_patches
+%autopatch -p1
# (tpg) needed for patch2
autoreconf -vfi
@@ -341,7 +342,8 @@ done
%{_presetdir}/86-clamav-freshclam.preset
%{_unitdir}/%{name}-freshclam.service
%{_tmpfilesdir}/%{name}.conf
-%{_bindir}/clamonacc
+%{_unitdir}/clamav-clamonacc.service
+%{_sbindir}/clamonacc
%{_bindir}/clambc
%{_bindir}/clamconf
%{_bindir}/clamdscan
@@ -360,6 +362,7 @@ done
%{_mandir}/man1/sigtool.1*
%{_mandir}/man5/clamd.conf.5*
%{_mandir}/man5/freshclam.conf.5*
+%{_mandir}/man8/clamonacc.8*
%if !%{milter}
%exclude %{_mandir}/man8/%{name}-milter.8*
%endif
@@ -381,9 +384,10 @@ done
%files -n %{name}-milter
#attr(0644,root,root) %config(noreplace) #{_sysconfdir}/%{name}-milter.conf*
%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-milter
+%{_sysconfdir}/clamav-milter.conf.sample
%{_presetdir}/86-milter.preset
%{_unitdir}/%{name}-milter.service
-#{_sbindir}/%{name}-milter
+%{_sbindir}/%{name}-milter
%{_mandir}/man8/%{name}-milter.8*
%{_mandir}/man5/%{name}-milter.conf.5*
%ghost %attr(0644,%{name},%{name}) %{_var}/log/%{name}/%{name}-milter.log