- up for 0.92

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

diff --git a/clamav-pld_config.patch b/clamav-pld_config.patch
index dab80b04daf4eabc2ee90d74c0cb2919756c87ce..2d692985714421419b046876dc0180a44c5a9e19 100644 (file)
--- a/clamav-pld_config.patch
+++ b/clamav-pld_config.patch
@@ -1,6 +1,5 @@
-diff -uN clamav-0.80-orig/etc/clamd.conf clamav-0.80/etc/clamd.conf
---- clamav-0.80-orig/etc/clamd.conf    2004-10-11 03:14:30.000000000 +0200
-+++ clamav-0.80/etc/clamd.conf 2005-01-21 15:03:26.335610128 +0100
+--- clamav-0.92.orig/etc/clamd.conf    2007-12-06 13:59:09.000000000 +0100
++++ clamav-0.92/etc/clamd.conf 2007-12-17 21:48:15.000000000 +0100
 @@ -5,13 +5,13 @@
  
  
@@ -17,15 +16,21 @@ diff -uN clamav-0.80-orig/etc/clamd.conf clamav-0.80/etc/clamd.conf
  
  # By default the log file is locked for writing - the lock protects against
  # running clamd multiple times (if want to run another clamd, please
-@@ -40,7 +40,7 @@
+@@ -40,12 +40,12 @@
  
  # Use system logger (can work together with LogFile).
- # Default: disabled
--#LogSyslog
-+LogSyslog
+ # 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
 @@ -54,7 +54,7 @@
  # This option allows you to save a process identifier of the listening
  # daemon (main thread).
@@ -35,41 +40,32 @@ diff -uN clamav-0.80-orig/etc/clamd.conf clamav-0.80/etc/clamd.conf
  
  # 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/lib/clamav/clamd.socket
- 
- # Remove stale socket after unclean shutdown.
- # Default: disabled
-@@ -130,11 +130,11 @@
+@@ -141,11 +141,11 @@
  
- # Run as a selected user (clamd must be started by root).
- # Default: disabled
+ # 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 supplementary group access (clamd must be started by root).
- # Default: disabled
--#AllowSupplementaryGroups
-+AllowSupplementaryGroups
+ # Default: no
+-#AllowSupplementaryGroups no
++AllowSupplementaryGroups yes
  
- # Don't fork into background.
- # Default: disabled
-@@ -273,15 +273,15 @@
+ # Stop daemon when libclamav reports out of memory condition.
+ #ExitOnOOM yes
+@@ -327,15 +327,15 @@
  
  # Set access mask for Clamuko.
- # Default: disabled
--#ClamukoScanOnOpen
--#ClamukoScanOnClose
--#ClamukoScanOnExec
-+ClamukoScanOnOpen
-+ClamukoScanOnClose
-+ClamukoScanOnExec
- 
- # Set the include paths (all files in them will be scanned). You can have
+ # Default: no
+-#ClamukoScanOnOpen yes
+-#ClamukoScanOnClose yes
+-#ClamukoScanOnExec yes
++ClamukoScanOnOpen yes
++ClamukoScanOnClose yes
++ClamukoScanOnExec yes
+ 
+ # Set the include paths (all files inside them will be scanned). You can have
  # multiple ClamukoIncludePath directives but each directory must be added
  # in a seperate line.
  # Default: disabled
@@ -78,12 +74,11 @@ diff -uN clamav-0.80-orig/etc/clamd.conf clamav-0.80/etc/clamd.conf
  #ClamukoIncludePath /students
  
  # Set the exclude paths. All subdirectories are also excluded.
-diff -uN clamav-0.80-orig/etc/freshclam.conf clamav-0.80/etc/freshclam.conf
---- clamav-0.80-orig/etc/freshclam.conf        2004-09-27 22:35:01.000000000 +0200
-+++ clamav-0.80/etc/freshclam.conf     2005-01-21 15:03:26.376602687 +0100
-@@ -3,10 +3,14 @@
+--- clamav-0.92.orig/etc/freshclam.conf        2007-12-06 13:59:09.000000000 +0100
++++ clamav-0.92/etc/freshclam.conf     2007-12-17 21:48:15.000000000 +0100
+@@ -2,10 +2,14 @@
+ ## Example config file for freshclam
  ## Please read the freshclam.conf(5) manual before editing this file.
- ## This file may be optionally merged with clamd.conf.
  ##
 -
 +## PLD NOTE: Note that freshclam is called periodically via cron
@@ -98,30 +93,30 @@ diff -uN clamav-0.80-orig/etc/freshclam.conf clamav-0.80/etc/freshclam.conf
  
  # Path to the database directory.
  # WARNING: It must match clamd.conf's directive!
-@@ -19,11 +23,11 @@
+@@ -30,11 +34,11 @@
  
  # Enable verbose logging.
- # Default: disabled
--#LogVerbose
-+LogVerbose
+ # Default: no
+-#LogVerbose yes
++LogVerbose yes
  
  # Use system logger (can work together with UpdateLogFile).
- # Default: disabled
--#LogSyslog
-+LogSyslog
+ # Default: no
+-#LogSyslog yes
++LogSyslog yes
  
  # Specify the type of syslog messages - please refer to 'man syslog'
  # for facility names.
-@@ -37,7 +41,7 @@
+@@ -48,7 +52,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 @@
+ # Initialize supplementary group access (freshclam must be started by root).
+ # Default: no
+@@ -82,7 +86,7 @@
  
  # Number of database checks per day.
  # Default: 12 (every two hours)
@@ -130,12 +125,12 @@ diff -uN clamav-0.80-orig/etc/freshclam.conf clamav-0.80/etc/freshclam.conf
  
  # 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/clamd.conf
+@@ -104,7 +108,7 @@
+ 
+ # Send the RELOAD command to clamd.
+ # Default: no
+-#NotifyClamd /path/to/clamd.conf
++#NotifyClamd /etc/clamd.conf
  
  # Run command after successful database update.
  # Default: disabled