--- assp_patched/ASSP/assp.pl	2007-06-16 11:45:31.000000000 -0600
+++ assp.pl	2007-07-04 09:44:43.000000000 -0600
@@ -1771,8 +1771,8 @@
   -d "/var/lib/assp/$correctedspam" or mkdir "/var/lib/assp/$correctedspam",0700;
   -d "/var/lib/assp/$correctednotspam" or mkdir "/var/lib/assp/$correctednotspam",0700;
   my $pbdir = $1 if $pbdb=~/(.*)\/.*/;
-  mkdir "$base/$pbdir",0700 if $pbdir;
-  -d "/etc/assp/notes" or mkdir "$base/notes",0770;
+  mkdir "/var/lib/assp/$pbdir",0700 if $pbdir;
+  -d "/etc/assp/notes" or mkdir "/var/lib/assp/notes",0770;
   if ( !-e "/etc/assp/reports/whitereport.txt") {
     -d "/etc/assp/reports" or mkdir "/etc/assp/reports",0770;
     copy("/usr/share/assp/whitereport.txt", "/etc/assp/reports/whitereport.txt");
@@ -1786,11 +1786,11 @@
 
 
 # put this after chroot so the paths don't change
-  $SpamdbObject=tie %Spamdb,orderedtie,"$base/$spamdb" if $spamdb;
-  mlog(0,"warning: Bayesian spam database is small or empty: '$base/$spamdb'") if $spamdb && -s "$base/$spamdb" < 10000;
-  $HeloBlackObject=tie %HeloBlack,orderedtie,"$base/$spamdb.helo" if $spamdb;
-  $DnsblObject=tie %Dnsbl,orderedtie,"$base/$dnsbl" if $dnsbl;
-  mlog(0,"warning: DNS blacklist database is small or empty: '$base/$dnsbl'") if $dnsbl && -s "$base/$dnsbl" < 10000;
+  $SpamdbObject=tie %Spamdb,orderedtie,"/var/lib/assp/$spamdb" if $spamdb;
+  mlog(0,"warning: Bayesian spam database is small or empty: '/var/lib/assp/$spamdb'") if $spamdb && -s "/var/lib/assp/$spamdb" < 10000;
+  $HeloBlackObject=tie %HeloBlack,orderedtie,"/var/lib/assp/$spamdb.helo" if $spamdb;
+  $DnsblObject=tie %Dnsbl,orderedtie,"/var/lib/assp/$dnsbl" if $dnsbl;
+  mlog(0,"warning: DNS blacklist database is small or empty: '/var/lib/assp/$dnsbl'") if $dnsbl && -s "/var/lib/assp/$dnsbl" < 10000;
   if ($CanUseTieRDBM && $whitelistdb =~ /mysql/) {
   eval {
     $WhitelistObject=tie %Whitelist,'Tie::RDBM',"dbi:mysql:database=$mydb;host=$myhost",{user=>"$myuser",password=>"$mypassword",table=>'whitelist',create=>1};};
@@ -1800,8 +1800,8 @@
     $whitelistdb ="whitelist";
     }
   } else {
-    $WhitelistObject=tie %Whitelist,orderedtie,"$base/$whitelistdb";
-    mlog(0,"warning: whitelist is small or empty: '$base/$whitelistdb' (ignore if this is a new install)") if $whitelistdb && -s "$base/$whitelistdb" < 1000;
+    $WhitelistObject=tie %Whitelist,orderedtie,"/var/lib/assp/$whitelistdb";
+    mlog(0,"warning: whitelist is small or empty: '/var/lib/assp/$whitelistdb' (ignore if this is a new install)") if $whitelistdb && -s "/var/lib/assp/$whitelistdb" < 1000;
   }
 
   if ($CanUseTieRDBM && $redlistdb =~ /mysql/) {
@@ -1813,14 +1813,14 @@
     $redlistdb ="redlist";
     }
   } else {
-    $RedlistObject=tie %Redlist,orderedtie,"$base/$redlistdb";
+    $RedlistObject=tie %Redlist,orderedtie,"/var/lib/assp/$redlistdb";
   }
-  $GriplistObject=tie %Griplist,orderedtie,"$base/$griplist" if $griplist;
+  $GriplistObject=tie %Griplist,orderedtie,"/var/lib/assp/$griplist" if $griplist;
 
-  $PBWhiteObject=tie %PBWhite,orderedtie,"$base/$pbdb.white.db";
-  $PBBlackObject=tie %PBBlack,orderedtie,"$base/$pbdb.black.db";
-  $RBLCacheObject=tie %RBLCache,orderedtie,"$base/$pbdb.rbl.db";
-  $URIBLCacheObject=tie %URIBLCache,orderedtie,"$base/$pbdb.uribl.db";
+  $PBWhiteObject=tie %PBWhite,orderedtie,"/var/lib/assp/$pbdb.white.db";
+  $PBBlackObject=tie %PBBlack,orderedtie,"/var/lib/assp/$pbdb.black.db";
+  $RBLCacheObject=tie %RBLCache,orderedtie,"/var/lib/assp/$pbdb.rbl.db";
+  $URIBLCacheObject=tie %URIBLCache,orderedtie,"/var/lib/assp/$pbdb.uribl.db";
   if ($CanUseTieRDBM && $delaydb =~ /mysql/) {
   eval {
    $DelayWhiteObject=tie %DelayWhite,'Tie::RDBM',"dbi:mysql:database=$mydb;host=$myhost",{user=>"$myuser",password=>"$mypassword",table=>'delaywhitedb',create=>1};
@@ -1832,8 +1832,8 @@
     }
    
   } else {
-    $DelayObject=tie %Delay,orderedtie,"$base/$delaydb";
-    $DelayWhiteObject=tie %DelayWhite,orderedtie,"$base/$delaydb.white";
+    $DelayObject=tie %Delay,orderedtie,"/var/lib/assp/$delaydb";
+    $DelayWhiteObject=tie %DelayWhite,orderedtie,"/var/lib/assp/$delaydb.white";
   }
 
 
@@ -7535,7 +7535,7 @@
 
 sub downloadGrip {
  # let's check if we really need to
- my @s=stat("$base/$griplist");
+ my @s=stat("/var/lib/assp/$griplist");
  my $mtime=$s[9];
  if(time - $mtime< 12*3600) {
   $NextGriplistDownload=$mtime + 12*3600;
@@ -7562,7 +7562,7 @@
   $SocketCalls{$s}=\&GripTraffic;
   $readable->add($s);
   $NextGriplistDownload=time+3600*12;
-  open(GRIPTEMP,">$base/$griplist.tmp");
+  open(GRIPTEMP,">/var/lib/assp/$griplist.tmp");
   binmode(GRIPTEMP);
   $GriplistLen=0;
  } else {
@@ -7590,13 +7590,13 @@
    $GriplistLen-=length($buf);
    if(! $GriplistLen) {
     close GRIPTEMP;
-    unlink("$base/$griplist");
-    rename("$base/$griplist.tmp","$base/$griplist");
+    unlink("/var/lib/assp/$griplist");
+    rename("/var/lib/assp/$griplist.tmp","/var/lib/assp/$griplist");
     mlog(0,"griplist download complete") if $MaintenanceLog;
     if($GriplistObject) {
      $GriplistObject->resetCache();
     } else {
-     $GriplistObject=tie %Griplist,orderedtie,"$base/$griplist" if $griplist;
+     $GriplistObject=tie %Griplist,orderedtie,"/var/lib/assp/$griplist" if $griplist;
     }
     $readable->remove($fh);
     $fh->close;
@@ -10711,8 +10711,8 @@
 sub cleanBlackPB {
 if ($PenaltyExpiration==0) {
 $PBBlackObject->flush() if $PBBlackObject;
-unlink "$base/$pbdb.black.db.bak";
-rename("$base/$pbdb.black.db","$base/$pbdb.black.db.bak");
+unlink "/var/lib/assp/$pbdb.black.db.bak";
+rename("/var/lib/assp/$pbdb.black.db","/var/lib/assp/$pbdb.black.db.bak");
 $PBBlackObject->DESTROY() if $PBBlackObject;
 
 return;
@@ -10752,8 +10752,8 @@
 }
 if ($ips_before==0) {
 $PBBlackObject->flush() if $PBBlackObject;
-unlink "$base/$pbdb.black.db.bak";
-rename("$base/$pbdb.black.db","$base/$pbdb.black.db.bak");
+unlink "/var/lib/assp/$pbdb.black.db.bak";
+rename("/var/lib/assp/$pbdb.black.db","/var/lib/assp/$pbdb.black.db.bak");
 $PBBlackObject->DESTROY() if $PBBlackObject;}
 mlog(0,"PB: cleaning black finished; IPs before=$ips_before, deleted=$ips_deleted") if $DoPenalty;
 MainLoop2();
@@ -10794,8 +10794,8 @@
 mlog(0,"RBLCache: cleaning cache finished; IPs before=$ips_before, deleted=$ips_deleted") if  $MaintenanceLog;
 if ($ips_before==0 || ($ips_before>=5000 && $ips_deleted==0)) {
 $RBLCacheObject->flush() ;
-unlink "$base/$pbdb.rbl.db.bak";
-rename("$base/$pbdb.rbl.db","$base/$pbdb.rbl.db.bak");
+unlink "/var/lib/assp/$pbdb.rbl.db.bak";
+rename("/var/lib/assp/$pbdb.rbl.db","/var/lib/assp/$pbdb.rbl.db.bak");
 $RBLCacheObject->DESTROY();
 $RBLCache{""}="" if $ips_before==0;
 }}
@@ -10813,8 +10813,8 @@
 mlog(0,"URIBLCache: cleaning cache finished; Domains before=$domains_before, deleted=$domains_deleted") if  $MaintenanceLog;
 if ($domains_before==0 || ($domains_before>=5000 && $domains_deleted==0)) {
 $URIBLCacheObject->flush() ;
-unlink "$base/$pbdb.uribl.db.bak";
-rename("$base/$pbdb.uribl.db","$base/$pbdb.rbl.db.bak");
+unlink "/var/lib/assp/$pbdb.uribl.db.bak";
+rename("/var/lib/assp/$pbdb.uribl.db","/var/lib/assp/$pbdb.rbl.db.bak");
 $URIBLCacheObject->DESTROY();
 $URIBLCache{""}="" if $domains_before==0;
 }}