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

diff --git a/clamav-pld_config.patch b/clamav-pld_config.patch
index 4fe52e6..2713ce7 100644
--- a/clamav-pld_config.patch
+++ b/clamav-pld_config.patch
@@ -1,8 +1,7 @@
-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
+--- clamav-0.66.org/etc/clamav.conf	Wed Feb 11 11:51:14 2004
++++ clamav-0.66/etc/clamav.conf	Wed Feb 11 11:52:00 2004
 @@ -5,12 +5,12 @@
-  
+ 
  
  # Comment or remove the line below.
 -Example
@@ -12,47 +11,51 @@ diff -urN clamav-0.60.orig/etc/clamav.conf clamav-0.60/etc/clamav.conf
  # LogFile must be writable for the user running the daemon.
  # Full path is required.
 -#LogFile /tmp/clamd.log
-+#LogFile /var/log/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
+@@ -34,7 +34,7 @@
+ #LogClean
  
  # Use system logger (can work together with LogFile).
 -#LogSyslog
 +LogSyslog
  
- # Enable verbose logging.
--#LogVerbose
-+# LogVerbose
+ # Specify the type of syslog messages - please refer to 'man syslog'
+ # for facility names. Default is LOG_LOCAL6.
+@@ -45,7 +45,7 @@
  
  # This option allows you to save the process identifier of the listening
  # daemon (main thread).
 -#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 @@
++PidFile /var/run/clamav/clamd.pid
+ 
+ # Optional path to the global temporary directory.
+ # Default is system specific - usually /var/tmp or /tmp.
+@@ -62,10 +62,10 @@
  # 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
-+
 +LocalSocket /var/lib/clamav/clamd.socket
  
+ # Remove stale socket after unclean shutdown.
+-#FixStaleSocket
++FixStaleSocket
+ 
  # TCP port address.
  #TCPSocket 3310
-@@ -93,11 +96,11 @@
+@@ -90,7 +90,7 @@
+ # Maximal number of a threads running at the same time.
+ # Default is 5, and it should be sufficient for a typical workstation.
+ # You may need to increase threads number for a server machine.
+-#MaxThreads 10
++MaxThreads 10
+ 
+ # Waiting for data from a client socket will timeout after this time (seconds).
+ # Default is 120. Value of 0 disables the timeout.
+@@ -118,11 +118,11 @@
  
  # Run as selected user (clamd must be started by root).
  # By default it doesn't drop privileges.
@@ -66,7 +69,7 @@ diff -urN clamav-0.60.orig/etc/clamav.conf clamav-0.60/etc/clamav.conf
  
  # Don't fork into background. Useful in debugging.
  #Foreground
-@@ -107,13 +110,12 @@
+@@ -145,7 +145,7 @@
  ##
  
  # Uncomment this option if you are planning to scan mail files.
@@ -75,9 +78,56 @@ diff -urN clamav-0.60.orig/etc/clamav.conf clamav-0.60/etc/clamav.conf
  
  ##
  ## Archive support
+--- clamav-0.70/etc/freshclam.conf.orig	2004-04-17 00:42:13.000000000 +0200
++++ clamav-0.70/etc/freshclam.conf	2004-04-20 04:22:51.208555704 +0200
+@@ -3,6 +3,11 @@
+ ## Please read the clamav.conf(5) manual before editing this file.
+ ## This file may be optionally merged with clamav.conf.
  ##
++## 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.
+ 
+ # It should match clamav.conf's directive ! (in most cases you shouldn't
+ # change it)
+@@ -12,10 +17,10 @@
+ #UpdateLogFile /var/log/freshclam.log
+ 
+ # Enable verbose logging.
+-#LogVerbose
++LogVerbose
+ 
+ # Use system logger (can work together with UpdateLogFile).
+-#LogSyslog
++LogSyslog
+ 
+ # Specify the type of syslog messages - please refer to 'man syslog'
+ # for facility names. Default is LOG_LOCAL6.
+@@ -23,7 +28,7 @@
+ 
+ # By default when freshclam is started by root it drops privileges and
+ # switches to the "clamav" user. You can change this behaviour here.
+-#DatabaseOwner clamav
++DatabaseOwner clamav
+ 
+ # The main database mirror is database.clamav.net (this is a round-robin
+ # DNS that points to many mirrors on the world) and in most cases you
+@@ -35,7 +40,7 @@
+ 
+ # How often check for a new database. We suggest checking for it every
+ # two hours.
+-Checks 12
++Checks 2
+ 
+ # Proxy settings
+ #HTTPProxyServer myproxy.com
+@@ -45,6 +50,7 @@
  
--
- # Comment this line to disable scanning of the archives.
- ScanArchive
+ # Send the RELOAD command to clamd.
+ #NotifyClamd [/optional/config/file/path]
++NotifyClamd /etc/clamav.conf
  
+ # Run command after database update.
+ #OnUpdateExecute command