-diff -urN clamav-0.65.orig/etc/clamav.conf clamav-0.65/etc/clamav.conf
---- clamav-0.65.orig/etc/clamav.conf Mon Dec 1 14:59:35 2003
-+++ clamav-0.65/etc/clamav.conf Mon Dec 1 14:57:07 2003
-@@ -5,12 +5,12 @@
-
+diff -urNp -x '*.orig' clamav-0.103.0.org/etc/clamav-milter.conf.sample clamav-0.103.0/etc/clamav-milter.conf.sample
+--- clamav-0.103.0.org/etc/clamav-milter.conf.sample 2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/etc/clamav-milter.conf.sample 2021-04-06 16:38:59.095023292 +0200
+@@ -3,7 +3,7 @@
+ ##
# Comment or remove the line below.
-Example
-+# Example
++#Example
+
+
+ ##
+@@ -17,12 +17,12 @@ Example
+ # inet6:port@[hostname|ip-address] - to specify an ipv6 socket
+ #
+ # Default: no default
+-#MilterSocket /tmp/clamav-milter.socket
++MilterSocket /var/lib/clamav/clamav-milter.socket
+ #MilterSocket inet:7357
+
+ # Define the group ownership for the (unix) milter socket.
+ # Default: disabled (the primary group of the user running clamd)
+-#MilterSocketGroup virusgroup
++#MilterSocketGroup clamav
+
+ # Sets the permissions on the (unix) milter socket to the specified mode.
+ # Default: disabled (obey umask)
+@@ -64,7 +64,7 @@ Example
+ # also owned by root to keep other users from tampering with it.
+ #
+ # Default: disabled
+-#PidFile /var/run/clamav-milter.pid
++PidFile /var/run/clamav/clamav-milter.pid
+
+ # Optional path to the global temporary directory.
+ # Default: system specific (usually /tmp or /var/tmp).
+@@ -91,7 +91,7 @@ Example
+ # fashion.
+ #
+ # Default: no default
+-#ClamdSocket tcp:scanner.mydomain:7357
++ClamdSocket unix:/var/lib/clamav/clamd.socket
+
+
+ ##
+@@ -241,13 +241,13 @@ Example
+ # Use system logger (can work together with LogFile).
+ #
+ # Default: no
+-#LogSyslog yes
++LogSyslog yes
+
+ # Specify the type of syslog messages - please refer to 'man syslog'
+ # for facility names.
+ #
+ # Default: LOG_LOCAL6
+-#LogFacility LOG_MAIL
++LogFacility LOG_MAIL
+
+ # Enable verbose logging.
+ #
+diff -urNp -x '*.orig' clamav-0.103.0.org/etc/clamd.conf.sample clamav-0.103.0/etc/clamd.conf.sample
+--- clamav-0.103.0.org/etc/clamd.conf.sample 2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/etc/clamd.conf.sample 2021-04-06 16:38:59.095023292 +0200
+@@ -5,13 +5,13 @@
+
+
+ # Comment or remove the line below.
+-Example
++#Example
# Uncomment this option to enable logging.
- # LogFile must be writable for the user running the daemon.
- # Full path is required.
+ # LogFile must be writable for the user running daemon.
+ # A full path is required.
+ # Default: disabled
-#LogFile /tmp/clamd.log
+#LogFile /var/log/clamd.log
# By default the log file is locked for writing - the lock protects against
# running clamd multiple times (if want to run another clamd, please
-@@ -30,19 +30,20 @@
- #LogTime
+@@ -41,12 +41,12 @@ Example
# Use system logger (can work together with LogFile).
--#LogSyslog
-+LogSyslog
+ # Default: no
+-#LogSyslog yes
++LogSyslog yes
- # Enable verbose logging.
--#LogVerbose
-+# LogVerbose
+ # Specify the type of syslog messages - please refer to 'man syslog'
+ # for facility names.
+ # Default: LOG_LOCAL6
+-#LogFacility LOG_MAIL
++LogFacility LOG_MAIL
- # This option allows you to save the process identifier of the listening
- # daemon (main thread).
+ # Enable verbose logging.
+ # Default: no
+@@ -74,7 +74,7 @@ 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
-+# We use dir becouse covering clamd.pid file couse default rights are sane.
-+PidFile /var/run/clamav/clamd.pid
-
- # Path to a directory containing .db files.
- # Default is the hardcoded directory (mostly /usr/local/share/clamav,
- # it depends on installation options).
--#DataDirectory /var/lib/clamav
-+DataDirectory /var/lib/clamav
-
- # The daemon works in local or network mode. Currently the local mode is
- # recommended for security reasons.
-@@ -50,10 +51,12 @@
- # Path to the local socket. The daemon doesn't change the mode of the
- # created file (portability reasons). You may want to create it in a directory
- # which is only accessible for a user running daemon.
--LocalSocket /tmp/clamd
-+# LocalSocket /var/run/clamav/clamd.socket
-+
++PidFile /var/run/clamav/clamd.pid
+
+ # Optional path to the global temporary directory.
+ # Default: system specific (usually /tmp or /var/tmp).
+@@ -93,11 +93,11 @@ Example
+
+ # Path to a local socket file the daemon will listen on.
+ # Default: disabled (must be specified by a user)
+-#LocalSocket /tmp/clamd.socket
+LocalSocket /var/lib/clamav/clamd.socket
- # Remove stale socket after unclean shutdown.
--#FixStaleSocket
-+FixStaleSocket
+ # Sets the group ownership on the unix socket.
+ # Default: disabled (the primary group of the user running clamd)
+-#LocalSocketGroup virusgroup
++#LocalSocketGroup clamav
- # TCP port address.
- #TCPSocket 3310
-@@ -111,11 +114,11 @@
+ # Sets the permissions on the unix socket to the specified mode.
+ # Default: disabled (socket is world accessible)
+@@ -216,7 +216,7 @@ Example
- # Run as selected user (clamd must be started by root).
- # By default it doesn't drop privileges.
+ # Run as another user (clamd must be started by root for this option to work)
+ # Default: don't drop privileges
-#User clamav
+User clamav
- # Initialize the supplementary group access (for all groups in /etc/group
- # user is added in. clamd must be started by root).
--#AllowSupplementaryGroups
-+AllowSupplementaryGroups
-
- # Don't fork into background. Useful in debugging.
- #Foreground
-@@ -128,13 +131,12 @@
+ # Stop daemon when libclamav reports out of memory condition.
+ #ExitOnOOM yes
+diff -urNp -x '*.orig' clamav-0.103.0.org/etc/freshclam.conf.sample clamav-0.103.0/etc/freshclam.conf.sample
+--- clamav-0.103.0.org/etc/freshclam.conf.sample 2020-09-13 02:27:09.000000000 +0200
++++ clamav-0.103.0/etc/freshclam.conf.sample 2021-04-06 16:38:59.095023292 +0200
+@@ -3,9 +3,14 @@
+ ## Please read the freshclam.conf(5) manual before editing this file.
##
- # Uncomment this option if you are planning to scan mail files.
--#ScanMail
-+ScanMail
-
- ##
- ## Archive support
- ##
-
--
- # Comment this line to disable scanning of the archives.
- ScanArchive
++## PLD NOTE: Note that freshclam is called periodically via cron
++## Check /etc/sysconfig/clamd for details
++## Seems better to run task once per period than keep daemon running
++## only for that.
++## But if you have arguments please tell us.
+ # Comment or remove the line below.
+-Example
++#Example
+
+ # Path to the database directory.
+ # WARNING: It must match clamd.conf's directive!
+@@ -35,7 +40,7 @@ Example
+
+ # Use system logger (can work together with UpdateLogFile).
+ # Default: no
+-#LogSyslog yes
++LogSyslog yes
+
+ # Specify the type of syslog messages - please refer to 'man syslog'
+ # for facility names.
+@@ -61,7 +61,7 @@ LogSyslog yes
+ # By default when started freshclam drops privileges and switches to the
+ # "clamav" user. This directive allows you to change the database owner.
+ # Default: clamav (may depend on installation options)
+-#DatabaseOwner clamav
++DatabaseOwner clamav
+
+ # Use DNS to verify virus database version. FreshClam uses DNS TXT records
+ # to verify database and software versions. With this directive you can change
+@@ -115,7 +120,7 @@ DatabaseMirror database.clamav.net
+
+ # Number of database checks per day.
+ # Default: 12 (every two hours)
+-#Checks 24
++Checks 2
+
+ # Proxy settings
+ # The HTTPProxyServer may be prefixed with [scheme]:// to specify which kind
+@@ -150,7 +150,7 @@ Checks 2
+
+ # Send the RELOAD command to clamd.
+ # Default: no
+-#NotifyClamd /path/to/clamd.conf
++#NotifyClamd /etc/clamd.conf
+
+ # Run command after successful database update.
+ # Use EXIT_1 to return 1 after successful database update.
projects / packages / clamav.git / blobdiff