X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=clamav-pld_config.patch;h=abb209422a797234c4a8740cfbda9d5e5443c100;hb=9df7e7ff9a8fc7d9d8a75858f7a87f3b81c9274e;hp=7ad436dfe1e56c5d48228461851e05124b36c759;hpb=0ad467392c31b7265f71a177250bfd7542330efd;p=packages%2Fclamav.git diff --git a/clamav-pld_config.patch b/clamav-pld_config.patch index 7ad436d..abb2094 100644 --- a/clamav-pld_config.patch +++ b/clamav-pld_config.patch @@ -1,131 +1,187 @@ -diff -urN clamav-0.66.org/etc/clamav.conf clamav-0.66/etc/clamav.conf ---- 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 @@ +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 @@ # 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 ++#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 -@@ -34,14 +34,14 @@ - #LogClean +@@ -40,12 +40,12 @@ # Use system logger (can work together with LogFile). --#LogSyslog -+LogSyslog + # Default: no +-#LogSyslog yes ++LogSyslog yes - # Enable verbose logging. - #LogVerbose + # Specify the type of syslog messages - please refer to 'man syslog' + # for facility names. + # Default: LOG_LOCAL6 +-#LogFacility LOG_MAIL ++LogFacility LOG_MAIL - # This option allows you to save the process identifier of the listening + # Enable verbose logging. + # Default: no +@@ -58,7 +58,7 @@ + # This option allows you to save a process identifier of the listening # daemon (main thread). + # Default: disabled -#PidFile /var/run/clamd.pid +PidFile /var/run/clamav/clamd.pid # Optional path to the global temporary directory. - # Default is system specific - usually /var/tmp or /tmp. -@@ -58,10 +58,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 + # Default: system specific (usually /tmp or /var/tmp). +@@ -77,11 +77,11 @@ + + # Path to a local socket file the daemon will listen on. + # Default: disabled (must be specified by a user) +-#LocalSocket /tmp/clamd.socket +LocalSocket /var/lib/clamav/clamd.socket - # Remove stale socket after unclean shutdown. --#FixStaleSocket -+FixStaleSocket - - # TCP port address. - #TCPSocket 3310 -@@ -86,7 +86,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 - - # Thread (scanner - single task) will be stopped after this time (seconds). - # Default is 180. Value of 0 disables the timeout. SECURITY HINT: Increase the -@@ -119,11 +119,11 @@ - - # Run as selected user (clamd must be started by root). - # By default it doesn't drop privileges. + # Sets the group ownership on the unix socket. + # Default: disabled (the primary group of the user running clamd) +-#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 the supplementary group access (for all groups in /etc/group - # user is added in. clamd must be started by root). --#AllowSupplementaryGroups -+AllowSupplementaryGroups - - # Don't fork into background. Useful in debugging. - #Foreground -@@ -136,7 +136,7 @@ + # Stop daemon when libclamav reports out of memory condition. + #ExitOnOOM yes +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. ## - # Uncomment this option if you are planning to scan mail files. --#ScanMail -+ScanMail - - ## - ## 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 03:27:50.230380664 +0200 -@@ -3,23 +3,28 @@ - ## 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. ++## only for that. +## But if you have arguments please tell us. + # Comment or remove the line below. +-Example ++#Example - # You can change the default database directory here. - #DatabaseDirectory /var/lib/clamav - - # Path to the log file (make sure it has proper permissions) --#UpdateLogFile /var/log/freshclam.log -+UpdateLogFile /var/log/freshclam.log + # Path to the database directory. + # WARNING: It must match clamd.conf's directive! +@@ -30,11 +35,11 @@ # Enable verbose logging. --#LogVerbose -+LogVerbose + # Default: no +-#LogVerbose yes ++LogVerbose yes # Use system logger (can work together with UpdateLogFile). - #LogSyslog - - # By default when freshclam is started by root it drops privileges and - # switches to the "clamav" user. You can change this behaviour here. + # Default: no +-#LogSyslog yes ++LogSyslog yes + + # Specify the type of syslog messages - please refer to 'man syslog' + # for facility names. +@@ -48,7 +53,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 - # 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 -@@ -31,7 +36,7 @@ + # Initialize supplementary group access (freshclam must be started by root). + # Default: no +@@ -96,7 +101,7 @@ - # How often check for a new database. We suggest checking for it every - # two hours. --Checks 12 + # Number of database checks per day. + # Default: 12 (every two hours) +-#Checks 24 +Checks 2 # Proxy settings - #HTTPProxyServer myproxy.com -@@ -41,6 +46,7 @@ + # Default: disabled +@@ -118,7 +123,7 @@ # Send the RELOAD command to clamd. - #NotifyClamd [/optional/config/file/path] -+NotifyClamd /etc/clamav.conf + # Default: no +-#NotifyClamd /path/to/clamd.conf ++#NotifyClamd /etc/clamd.conf - # Run command after database update. - #OnUpdateExecute command + # Run command after successful database update. + # Default: disabled