- release 2 (rebuild without libcurl.la)

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

diff --git a/clamav-pld_config.patch b/clamav-pld_config.patch
index d6c53d0d6ae35669874a0f88e1429f5ca6c56ff1..922396aea72868d9ec3ea6ce730018b748911ec6 100644 (file)
--- a/clamav-pld_config.patch
+++ b/clamav-pld_config.patch
@@ -1,5 +1,67 @@
---- clamav-0.96rc1/etc/clamd.conf~     2010-03-10 15:27:30.000000000 +0100
-+++ clamav-0.96rc1/etc/clamd.conf      2010-03-11 09:45:32.817607707 +0100
+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 @@
+ ##
+ 
+ # Comment or remove the line below.
+-Example
++#Example
+ 
+ 
+ ##
+@@ -17,12 +17,12 @@
+ # inet6:port@[hostname|ip-address] - to specify an ipv6 socket
+ #
+ # Default: no default
+-#MilterSocket /tmp/clamav-milter.socket
++MilterSocket /var/lib/clamav/clamav-milter.socket
+ #MilterSocket inet:7357
+ 
+ # 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)
+@@ -64,7 +64,7 @@
+ # daemon (main thread).
+ #
+ # Default: disabled
+-#PidFile /var/run/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).
+@@ -90,7 +90,7 @@
+ # with the same socket: clamd servers will be selected in a round-robin fashion.
+ #
+ # Default: no default
+-#ClamdSocket tcp:scanner.mydomain:7357
++ClamdSocket unix:/var/lib/clamav/clamd.socket
+ 
+ 
+ ##
+@@ -238,13 +238,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.
+ #
+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 @@
  
  
@@ -31,7 +93,7 @@
  
  # Enable verbose logging.
  # Default: no
-@@ -54,7 +54,7 @@
+@@ -58,7 +58,7 @@
  # This option allows you to save a process identifier of the listening
  # daemon (main thread).
  # Default: disabled
@@ -40,7 +102,7 @@
  
  # Optional path to the global temporary directory.
  # Default: system specific (usually /tmp or /var/tmp).
-@@ -73,7 +73,7 @@
+@@ -77,11 +77,11 @@
  
  # Path to a local socket file the daemon will listen on.
  # Default: disabled (must be specified by a user)
@@ -49,42 +111,23 @@
  
  # Sets the group ownership on the unix socket.
  # Default: disabled (the primary group of the user running clamd)
-@@ -183,11 +183,11 @@
+-#LocalSocketGroup virusgroup
++#LocalSocketGroup clamav
+ 
+ # Sets the permissions on the unix socket to the specified mode.
+ # Default: disabled (socket is world accessible)
+@@ -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
-@@ -436,15 +436,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)
---- clamav-0.96rc1/etc/freshclam.conf~ 2010-02-26 11:56:59.000000000 +0100
-+++ clamav-0.96rc1/etc/freshclam.conf  2010-03-11 09:52:38.261708157 +0100
+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.
  ##
@@ -101,12 +144,7 @@
  
  # Path to the database directory.
  # WARNING: It must match clamd.conf's directive!
-@@ -30,11 +35,11 @@
- 
- # Enable verbose logging.
- # Default: no
--#LogVerbose yes
-+LogVerbose yes
+@@ -30,7 +35,7 @@
  
  # Use system logger (can work together with UpdateLogFile).
  # Default: no
@@ -124,7 +162,7 @@
  
  # Initialize supplementary group access (freshclam must be started by root).
  # Default: no
-@@ -89,7 +94,7 @@
+@@ -96,7 +101,7 @@
  
  # Number of database checks per day.
  # Default: 12 (every two hours)
@@ -133,7 +171,7 @@
  
  # Proxy settings
  # Default: disabled
-@@ -111,7 +116,7 @@
+@@ -118,7 +123,7 @@
  
  # Send the RELOAD command to clamd.
  # Default: no