Up to 1.2.0

[packages/clamav.git] / clamav-pld_config.patch

diff -ur clamav-1.2.0.org/etc/clamav-milter.conf.sample clamav-1.2.0/etc/clamav-milter.conf.sample
--- clamav-1.2.0.org/etc/clamav-milter.conf.sample	2023-08-27 00:00:24.000000000 +0200
+++ clamav-1.2.0/etc/clamav-milter.conf.sample	2023-09-05 10:47:53.869998771 +0200
@@ -3,7 +3,7 @@
 ##
 
 # Comment or remove the line below.
-Example
+#Example
 
 
 ##
@@ -20,10 +20,11 @@
 #MilterSocket /run/clamav/clamav-milter.sock
 #MilterSocket /tmp/clamav-milter.sock
 #MilterSocket inet:7357
+MilterSocket /var/lib/clamav/clamav-milter.socket
 
 # 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)
@@ -66,6 +67,7 @@
 #
 # Default: disabled
 #PidFile /run/clamav/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).
@@ -94,7 +96,7 @@
 # Default: no default
 #ClamdSocket tcp:scanner.mydomain:7357
 #ClamdSocket unix:/run/clamav/clamd.sock
-
+ClamdSocket unix:/var/lib/clamav/clamd.socket
 
 ##
 ## Exclusions
@@ -243,13 +245,13 @@
 # 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.
 #
Only in clamav-1.2.0/etc: clamav-milter.conf.sample~
Only in clamav-1.2.0/etc: clamav-milter.conf.sample.orig
Only in clamav-1.2.0/etc: clamav-milter.conf.sample.rej
diff -ur clamav-1.2.0.org/etc/clamd.conf.sample clamav-1.2.0/etc/clamd.conf.sample
--- clamav-1.2.0.org/etc/clamd.conf.sample	2023-08-27 00:00:24.000000000 +0200
+++ clamav-1.2.0/etc/clamd.conf.sample	2023-09-05 10:48:39.263332082 +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 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
@@ -41,12 +41,12 @@
 
 # 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.
 # Default: no
@@ -75,6 +75,7 @@
 # also owned by root to keep other users from tampering with it.
 # Default: disabled
 #PidFile /run/clamav/clamd.pid
+PidFile /var/run/clamav/clamd.pid
 
 # Optional path to the global temporary directory.
 # Default: system specific (usually /tmp or /var/tmp).
@@ -100,10 +101,11 @@
 # Default: disabled (must be specified by a user)
 #LocalSocket /run/clamav/clamd.sock
 #LocalSocket /tmp/clamd.sock
+LocalSocket /var/lib/clamav/clamd.socket
 
 # Sets the group ownership on the unix socket.
 # Default: disabled (the primary group of the user running clamd)
-#LocalSocketGroup virusgroup
+#LocalSocketGroup clamav
 
 # Sets the permissions on the unix socket to the specified mode.
 # Default: disabled (socket is world accessible)
@@ -224,7 +226,7 @@
 
 # Run as another user (clamd must be started by root for this option to work)
 # Default: don't drop privileges
-#User clamav
+User clamav
 
 # Stop daemon when libclamav reports out of memory condition.
 #ExitOnOOM yes
Only in clamav-1.2.0/etc: clamd.conf.sample.orig
Only in clamav-1.2.0/etc: clamd.conf.sample.rej
diff -ur clamav-1.2.0.org/etc/freshclam.conf.sample clamav-1.2.0/etc/freshclam.conf.sample
--- clamav-1.2.0.org/etc/freshclam.conf.sample	2023-08-27 00:00:24.000000000 +0200
+++ clamav-1.2.0/etc/freshclam.conf.sample	2023-09-05 10:47:06.513332122 +0200
@@ -3,9 +3,14 @@
 ## Please read the freshclam.conf(5) manual before editing this file.
 ##
 
+## 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 @@
 
 # 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.
@@ -57,7 +62,7 @@
 # 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
@@ -116,7 +121,7 @@
 
 # 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
@@ -148,7 +153,7 @@
 
 # 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.
Only in clamav-1.2.0/etc: freshclam.conf.sample.orig