Author: zbyniu Date: Sun Mar 4 13:40:11 2007 GMT Module: SOURCES Tag: HEAD ---- Log message: - up to 2.4.5
---- Files affected: SOURCES: amavisd-new-config.patch (1.23 -> 1.24) ---- Diffs: ================================================================ Index: SOURCES/amavisd-new-config.patch diff -u SOURCES/amavisd-new-config.patch:1.23 SOURCES/amavisd-new-config.patch:1.24 --- SOURCES/amavisd-new-config.patch:1.23 Sun Aug 6 00:30:02 2006 +++ SOURCES/amavisd-new-config.patch Sun Mar 4 14:40:06 2007 @@ -1,5 +1,5 @@ ---- amavisd-new.orig/amavisd.conf-sample 2006-06-27 13:31:44.000000000 +0200 -+++ amavisd-new/amavisd.conf-sample 2006-08-06 00:22:10.986675750 +0200 +--- amavisd-new-2.4.5/amavisd.conf-sample.orig 2007-01-30 23:12:24.000000000 +0000 ++++ amavisd-new-2.4.5/amavisd.conf-sample 2007-03-04 00:19:16.457106000 +0000 @@ -63,7 +63,7 @@ # $MYHOME serves as a quick default for some other configuration settings. # More refined control is available with each individual setting further down. @@ -22,11 +22,11 @@ # temporary directories for unpacking mail are created. # (no trailing slash, may be a scratch file system) -$TEMPBASE = $MYHOME; # (must be set if other config vars use is), -T -+$TEMPBASE = $MYHOME/runtime; # (must be set if other config vars use is), -T ++$TEMPBASE = $MYHOME/runtime; # (must be set if other config vars use is), -T #$TEMPBASE = "$MYHOME/tmp"; # prefer to keep home dir /var/amavis clean? --#$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D -+$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D +-#$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D ++$db_home = "$MYHOME/db"; # DB databases directory, default "$MYHOME/db", -D # $helpers_home sets environment variable HOME, and is passed as option # 'home_dir_for_helpers' to Mail::SpamAssassin::new. It should be a directory @@ -88,7 +88,7 @@ # Customizable template for the most interesting log file entry (e.g. with # $log_level=0) (take care to properly quote Perl special characters like '\') -@@ -684,7 +686,8 @@ +@@ -689,7 +691,8 @@ # or a directory (no trailing slash) # (the default value is undef, meaning no quarantine) # @@ -98,7 +98,7 @@ #$quarantine_subdir_levels = 1; # add level of subdirs to disperse quarantine -@@ -1806,13 +1809,13 @@ +@@ -1900,15 +1903,15 @@ # ['Sophos SAVI', \&sophos_savi ], # ### http://www.clamav.net/ @@ -106,20 +106,24 @@ -# \&ask_daemon, ["CONTSCAN {}\n", "/var/run/clamav/clamd"], -# qr/\bOK$/, qr/\bFOUND$/, -# qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], --# # NOTE: the easiest is to run clamd under the same user as amavisd; match the --# # socket name (LocalSocket) in clamav.conf to the socket name in this entry --# # When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"], -+ ['ClamAV-clamd', -+ \&ask_daemon, ["CONTSCAN {}\n", "/var/lib/clamav/clamd.socket"], -+ qr/\bOK$/, qr/\bFOUND$/, -+ qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], -+# NOTE: the easiest is to run clamd under the same user as amavisd; match the -+# socket name (LocalSocket) in clamav.conf to the socket name in this entry -+# When running chrooted one may prefer: ["CONTSCAN {}\n","$MYHOME/clamd"], +-# # NOTE: run clamd under the same user as amavisd, or run it under its own +-# # uid such as clamav, add user clamav to the amavis group, and then add +-# # AllowSupplementaryGroups to clamd.conf; +-# # NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in +-# # this entry; when running chrooted one may prefer socket "$MYHOME/clamd". ++['ClamAV-clamd', ++ \&ask_daemon, ["CONTSCAN {}\n", "/var/lib/clamav/clamd.socket"], ++ qr/\bOK$/, qr/\bFOUND$/, ++ qr/^.*?: (?!Infected Archive)(.*) FOUND$/ ], ++# NOTE: run clamd under the same user as amavisd, or run it under its own ++# uid such as clamav, add user clamav to the amavis group, and then add ++# AllowSupplementaryGroups to clamd.conf; ++# NOTE: match socket name (LocalSocket) in clamav.conf to the socket name in ++# this entry; when running chrooted one may prefer socket "$MYHOME/clamd". # ### http://www.clamav.net/ and CPAN (memory-hungry! clamd is preferred) # ['Mail::ClamAV', \&ask_clamav, "*", [0], [1], qr/^INFECTED: (.+)/], -@@ -1969,10 +1972,11 @@ +@@ -2070,10 +2073,11 @@ # NOTE: requires suid wrapper around inocmd32; consider flag: -mod reviewer # see http://marc.theaimsgroup.com/?l=amavis-user&m=109229779912783 @@ -135,7 +139,7 @@ ### http://mks.com.pl/english.html ['MkS_Vir daemon', 'mksscan', -@@ -2175,6 +2179,10 @@ +@@ -2298,6 +2302,10 @@ # ], # # other options to consider: -mime -oe -idedir=/usr/local/sav ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/amavisd-new-config.patch?r1=1.23&r2=1.24&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
