- up to 0.100.2

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

diff --git a/clamav-pld_config.patch b/clamav-pld_config.patch
index 4cb395886e37bef1683eb7e9723d2f2889d91431..abb209422a797234c4a8740cfbda9d5e5443c100 100644 (file)
--- a/clamav-pld_config.patch
+++ b/clamav-pld_config.patch
@@ -1,6 +1,6 @@
-diff -ur clamav-0.97.1/etc//clamav-milter.conf clamav-0.97.1.new/etc//clamav-milter.conf
---- clamav-0.97.1/etc//clamav-milter.conf      2011-01-10 18:48:28.000000000 +0100
-+++ clamav-0.97.1.new/etc//clamav-milter.conf  2011-07-14 18:24:02.801795736 +0200
+diff -ur clamav-0.97.1/etc//clamav-milter.conf.sample clamav-0.97.1.new/etc//clamav-milter.conf.sample
+--- clamav-0.97.1/etc//clamav-milter.conf.sample       2011-01-10 18:48:28.000000000 +0100
++++ clamav-0.97.1.new/etc//clamav-milter.conf.sample   2011-07-14 18:24:02.801795736 +0200
 @@ -3,7 +3,7 @@
  ##
  
@@ -25,15 +25,6 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf clamav-0.97.1.new/etc//clamav-mil
  
  # Sets the permissions on the (unix) milter socket to the specified mode.
  # Default: disabled (obey umask)
-@@ -41,7 +41,7 @@
- # Initialize supplementary group access (clamav-milter must be started by root).
- #
- # Default: no
--#AllowSupplementaryGroups no
-+AllowSupplementaryGroups yes
- 
- # Waiting for data from clamd will timeout after this time (seconds).
- # Value of 0 disables the timeout.
 @@ -64,7 +64,7 @@
  # daemon (main thread).
  #
@@ -48,7 +39,7 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf clamav-0.97.1.new/etc//clamav-mil
  #
  # Default: no default
 -#ClamdSocket tcp:scanner.mydomain:7357
-+ClamdSocket /var/lib/clamav/clamd.socket
++ClamdSocket unix:/var/lib/clamav/clamd.socket
  
  
  ##
@@ -68,9 +59,9 @@ diff -ur clamav-0.97.1/etc//clamav-milter.conf clamav-0.97.1.new/etc//clamav-mil
  
  # Enable verbose logging.
  #
-diff -ur clamav-0.97.1/etc//clamd.conf clamav-0.97.1.new/etc//clamd.conf
---- clamav-0.97.1/etc//clamd.conf      2011-05-13 13:25:31.000000000 +0200
-+++ clamav-0.97.1.new/etc//clamd.conf  2011-07-14 18:19:05.824861957 +0200
+diff -ur clamav-0.97.1/etc//clamd.conf.sample clamav-0.97.1.new/etc//clamd.conf.sample
+--- clamav-0.97.1/etc//clamd.conf.sample       2011-05-13 13:25:31.000000000 +0200
++++ clamav-0.97.1.new/etc//clamd.conf.sample   2011-07-14 18:19:05.824861957 +0200
 @@ -5,13 +5,13 @@
  
  
@@ -125,43 +116,18 @@ diff -ur clamav-0.97.1/etc//clamd.conf clamav-0.97.1.new/etc//clamd.conf
  
  # Sets the permissions on the unix socket to the specified mode.
  # Default: disabled (socket is world accessible)
-@@ -186,11 +186,11 @@
+@@ -204,7 +204,7 @@ LocalSocket /var/lib/clamav/clamd.socket
  
  # 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: no
--#AllowSupplementaryGroups no
-+AllowSupplementaryGroups yes
- 
  # Stop daemon when libclamav reports out of memory condition.
  #ExitOnOOM yes
-@@ -443,15 +443,15 @@
- 
- # Set access mask for Clamuko (Dazuko only).
- # 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. (Dazuko only)
- # Default: disabled
--#ClamukoIncludePath /home
-+ClamukoIncludePath /home
- #ClamukoIncludePath /students
- 
- # Set the exclude paths. All subdirectories are also excluded. (Dazuko only)
-diff -ur clamav-0.97.1/etc//freshclam.conf clamav-0.97.1.new/etc//freshclam.conf
---- clamav-0.97.1/etc//freshclam.conf  2011-01-10 18:48:28.000000000 +0100
-+++ clamav-0.97.1.new/etc//freshclam.conf      2011-07-14 18:14:32.705707450 +0200
+diff -ur clamav-0.97.1/etc//freshclam.conf.sample clamav-0.97.1.new/etc//freshclam.conf.sample
+--- clamav-0.97.1/etc//freshclam.conf.sample   2011-01-10 18:48:28.000000000 +0100
++++ clamav-0.97.1.new/etc//freshclam.conf.sample       2011-07-14 18:14:32.705707450 +0200
 @@ -3,9 +3,14 @@
  ## Please read the freshclam.conf(5) manual before editing this file.
  ##