-diff -urN clamav-0.80rc4.orig/etc/clamd.conf clamav-0.80rc4/etc/clamd.conf
---- clamav-0.80rc4.orig/etc/clamd.conf 2004-10-11 03:14:30.000000000 +0200
-+++ clamav-0.80rc4/etc/clamd.conf 2004-10-16 23:14:10.722021576 +0200
+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
+@@ -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)
+@@ -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).
+ #
+ # 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 /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 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
@@ -5,13 +5,13 @@
# 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.
-@@ -54,7 +54,7 @@
+ # Default: LOG_LOCAL6
+-#LogFacility LOG_MAIL
++LogFacility LOG_MAIL
+
+ # 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
# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
-@@ -69,7 +69,7 @@
+@@ -77,11 +77,11 @@
# Path to a local socket file the daemon will listen on.
- # Default: disabled
--LocalSocket /tmp/clamd
+ # Default: disabled (must be specified by a user)
+-#LocalSocket /tmp/clamd.socket
+LocalSocket /var/lib/clamav/clamd.socket
- # Remove stale socket after unclean shutdown.
- # Default: disabled
-@@ -130,11 +130,11 @@
+ # Sets the group ownership on the unix socket.
+ # Default: disabled (the primary group of the user running clamd)
+-#LocalSocketGroup virusgroup
++#LocalSocketGroup clamav
- # Run as a selected user (clamd must be started by root).
- # Default: disabled
+ # Sets the permissions on the unix socket to the specified mode.
+ # Default: disabled (socket is world accessible)
+@@ -186,11 +186,11 @@
+
+ # 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
-
- # Don't fork into background.
- # Default: disabled
-@@ -273,15 +273,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
+-#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.
+ # in a seperate line. (Dazuko only)
# Default: disabled
-#ClamukoIncludePath /home
+ClamukoIncludePath /home
#ClamukoIncludePath /students
- # Set the exclude paths. All subdirectories are also excluded.
-diff -urN clamav-0.80rc4.orig/etc/freshclam.conf clamav-0.80rc4/etc/freshclam.conf
---- clamav-0.80rc4.orig/etc/freshclam.conf 2004-09-27 22:35:01.000000000 +0200
-+++ clamav-0.80rc4/etc/freshclam.conf 2004-10-16 23:17:04.467608232 +0200
-@@ -3,10 +3,14 @@
+ # 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
+@@ -3,9 +3,14 @@
## 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
+## Check /etc/sysconfig/clamd for details
+## Seems better to run task once per period than keep daemon running
# Path to the database directory.
# WARNING: It must match clamd.conf's directive!
-@@ -19,11 +23,11 @@
+@@ -30,11 +35,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 +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
- # 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
+@@ -96,7 +101,7 @@
# Number of database checks per day.
# Default: 12 (every two hours)
# 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/clamav.conf
+@@ -118,7 +123,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
projects / packages / clamav.git / blobdiff