X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=clamav-pld_config.patch;h=6563b07c293cd5a6efaeec4069baf11ed0607a99;hb=d093ed8c1728a43dc6cefb9b0827551f8d32fef0;hp=4fe52e643705ac508b7fc3e86e1a8b74c04fc749;hpb=c935072a937b4145bcaccd666599713ab88e6a1b;p=packages%2Fclamav.git

diff --git a/clamav-pld_config.patch b/clamav-pld_config.patch
index 4fe52e6..6563b07 100644
--- a/clamav-pld_config.patch
+++ b/clamav-pld_config.patch
@@ -1,83 +1,141 @@
-diff -urN clamav-0.60.orig/etc/clamav.conf clamav-0.60/etc/clamav.conf
---- clamav-0.60.orig/etc/clamav.conf	Thu Aug 28 14:14:08 2003
-+++ clamav-0.60/etc/clamav.conf	Thu Aug 28 14:15:09 2003
-@@ -5,12 +5,12 @@
-  
+diff -urN clamav-0.80rc4.orig/etc/clamd.conf clamav-0.80rc4/etc/clamd.conf
+--- clamav-0.80rc4.orig/etc/clamd.conf	2004-10-11 03:14:30.000000000 +0200
++++ clamav-0.80rc4/etc/clamd.conf	2004-10-16 23:14:10.722021576 +0200
+@@ -5,13 +5,13 @@
+ 
  
  # Comment or remove the line below.
 -Example
-+# 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
+@@ -40,7 +40,7 @@
  
  # Use system logger (can work together with LogFile).
+ # Default: disabled
 -#LogSyslog
 +LogSyslog
  
- # Enable verbose logging.
--#LogVerbose
-+# LogVerbose
- 
- # This option allows you to save the process identifier of the listening
+ # Specify the type of syslog messages - please refer to 'man syslog'
+ # for facility names.
+@@ -54,7 +54,7 @@
+ # This option allows you to save a process identifier of the listening
  # daemon (main thread).
+ # 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,7 +51,9 @@
- # 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.
++PidFile /var/run/clamav/clamd.pid
+ 
+ # Optional path to the global temporary directory.
+ # Default: system specific (usually /tmp or /var/tmp).
+@@ -69,7 +69,7 @@
+ 
+ # Path to a local socket file the daemon will listen on.
+ # Default: disabled
 -LocalSocket /tmp/clamd
-+# LocalSocket /var/run/clamav/clamd.socket
-+
 +LocalSocket /var/lib/clamav/clamd.socket
  
- # TCP port address.
- #TCPSocket 3310
-@@ -93,11 +96,11 @@
+ # Remove stale socket after unclean shutdown.
+ # Default: disabled
+@@ -130,11 +130,11 @@
  
- # Run as selected user (clamd must be started by root).
- # By default it doesn't drop privileges.
+ # Run as a selected user (clamd must be started by root).
+ # Default: disabled
 -#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).
+ # Initialize supplementary group access (clamd must be started by root).
+ # Default: disabled
 -#AllowSupplementaryGroups
 +AllowSupplementaryGroups
  
- # Don't fork into background. Useful in debugging.
- #Foreground
-@@ -107,13 +110,12 @@
- ##
+ # Don't fork into background.
+ # Default: disabled
+@@ -273,15 +273,15 @@
  
- # Uncomment this option if you are planning to scan mail files.
--#ScanMail
-+ScanMail
+ # Set access mask for Clamuko.
+ # Default: disabled
+-#ClamukoScanOnOpen
+-#ClamukoScanOnClose
+-#ClamukoScanOnExec
++ClamukoScanOnOpen
++ClamukoScanOnClose
++ClamukoScanOnExec
  
- ##
- ## Archive support
- ##
+ # Set the include paths (all files in them will be scanned). You can have
+ # multiple ClamukoIncludePath directives but each directory must be added
+ # in a seperate line.
+ # Default: disabled
+-#ClamukoIncludePath /home
++ClamukoIncludePath /home
+ #ClamukoIncludePath /students
  
+ # Set the exclude paths. All subdirectories are also excluded.
+diff -urN clamav-0.80rc4.orig/etc/freshclam.conf clamav-0.80rc4/etc/freshclam.conf
+--- clamav-0.80rc4.orig/etc/freshclam.conf	2004-09-27 22:35:01.000000000 +0200
++++ clamav-0.80rc4/etc/freshclam.conf	2004-10-16 23:17:04.467608232 +0200
+@@ -3,10 +3,14 @@
+ ## Please read the freshclam.conf(5) manual before editing this file.
+ ## This file may be optionally merged with clamd.conf.
+ ##
 -
- # 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!
+@@ -19,11 +23,11 @@
+ 
+ # Enable verbose logging.
+ # Default: disabled
+-#LogVerbose
++LogVerbose
+ 
+ # Use system logger (can work together with UpdateLogFile).
+ # Default: disabled
+-#LogSyslog
++LogSyslog
+ 
+ # Specify the type of syslog messages - please refer to 'man syslog'
+ # for facility names.
+@@ -37,7 +41,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. We highly recommend enabling
+@@ -62,7 +66,7 @@
+ 
+ # Number of database checks per day.
+ # Default: 12 (every two hours)
+-#Checks 24
++Checks 2
+ 
+ # Proxy settings
+ # Default: disabled
+@@ -76,7 +80,7 @@
+ #NotifyClamd
+ # By default it uses the hardcoded configuration file but you can force an
+ # another one.
+-#NotifyClamd /config/file/path
++NotifyClamd /etc/clamav.conf
  
+ # Run command after successful database update.
+ # Default: disabled