---- amavisd-new-2.1.0/amavisd-agent.fix 2004-08-06 20:15:48.125251504 +0200
-+++ amavisd-new-2.1.0/amavisd-agent 2004-08-06 20:16:01.096279608 +0200
-@@ -105,7 +105,7 @@
+--- amavisd-new-2.6.0/amavisd-agent.orig 2008-04-10 21:47:12.000000000 +0300
++++ amavisd-new-2.6.0/amavisd-agent 2008-05-07 13:48:25.000000000 +0300
+@@ -50,7 +50,7 @@
- # main program starts here
- my($env) = BerkeleyDB::Env->new(
-- '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
-+ '-Home'=>'/var/spool/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
- defined $env or die "BDB no env: $BerkeleyDB::Error $!";
- my($db) = BerkeleyDB::Hash->new(
- '-Filename'=>'snmp.db', '-Flags'=>DB_RDONLY, '-Env'=>$env );
---- amavisd-new-2.1.0/amavisd-nanny.fix 2004-08-06 20:17:18.246550984 +0200
-+++ amavisd-new-2.1.0/amavisd-nanny 2004-08-06 20:17:45.532402904 +0200
-@@ -60,7 +60,7 @@
+ my($dbfile) = 'snmp.db';
+ my($db_home) = # DB databases directory
+- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db';
++ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/spool/amavis/db';
- # main program starts here
- my($env) = BerkeleyDB::Env->new(
-- '-Home'=>'/var/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
-+ '-Home'=>'/var/spool/amavis/db', '-Flags'=> DB_INIT_CDB | DB_INIT_MPOOL);
- defined $env or die "BDB no env: $BerkeleyDB::Error $!";
- my($db) = BerkeleyDB::Hash->new(
- '-Filename'=>'nanny.db', '-Env'=>$env );
+ my($wakeuptime) = 10; # -w, sleep time in seconds, may be fractional
+ my($repeatcount); # -c, repeat count (when defined)
+--- amavisd-new-2.6.0/amavisd-nanny.orig 2008-03-29 00:55:02.000000000 +0200
++++ amavisd-new-2.6.0/amavisd-nanny 2008-05-07 13:49:19.000000000 +0300
+@@ -58,7 +58,7 @@
+
+ my($dbfile) = 'nanny.db';
+ my($db_home) = # DB databases directory
+- defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/amavis/db';
++ defined $ENV{'AMAVISD_DB_HOME'} ? $ENV{'AMAVISD_DB_HOME'} : '/var/spool/amavis/db';
+ my($wakeuptime) = 2; # -w, sleep time in seconds, may be fractional
+ my($repeatcount); # -c, repeat count (when defined)
+
+