svn commit: r431050 - in /spamassassin/trunk: Makefile.PL lib/Mail/SpamAssassin.pm sa-update.raw spamassassin.raw

[fe...@apache.org]

Author: felicity
Date: Sat Aug 12 09:41:43 2006
New Revision: 431050

URL: http://svn.apache.org/viewvc?rev=431050&view=rev
Log:
bug 4952: adding in local_state_dir by itself to the default rules listing means that we'd normally end up looking at something like /var/lib for files, which is bad.  change the default local_state_dir to include a 'spamassassin' directory, then modify our previous references to remove the excess 'spamassassin'.

Modified:
    spamassassin/trunk/Makefile.PL
    spamassassin/trunk/lib/Mail/SpamAssassin.pm
    spamassassin/trunk/sa-update.raw
    spamassassin/trunk/spamassassin.raw

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=431050&r1=431049&r2=431050&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Sat Aug 12 09:41:43 2006
@@ -678,10 +678,10 @@
 
   # Set the default, depending on the corresponding full PREFIX
   set_macro($macro,
-    ($rprefix =~ m{^$})                ? ''         :
-    ($rprefix =~ m{^/usr(/local)?/?$}) ? '/var/lib' :
-    ($rprefix =~ m{^/opt(/|$)})        ? '/var/opt' :
-    macro_ref("${repository}PREFIX") . '/var'
+    ($rprefix =~ m{^$})                ? ''                      :
+    ($rprefix =~ m{^/usr(/local)?/?$}) ? '/var/lib/spamassassin' :
+    ($rprefix =~ m{^/opt(/|$)})        ? '/var/opt/spamassassin' :
+    macro_ref("${repository}PREFIX") . '/var/spamassassin'
   );
 }
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=431050&r1=431049&r2=431050&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Sat Aug 12 09:41:43 2006
@@ -123,7 +123,7 @@
 @default_rules_path = (
   './rules',              # REMOVEFORINST
   '../rules',             # REMOVEFORINST
-  '__local_state_dir__/spamassassin/__version__',
+  '__local_state_dir__/__version__',
   '__local_state_dir__',
   '__def_rules_dir__',
   '__prefix__/share/spamassassin',

Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?rev=431050&r1=431049&r2=431050&view=diff
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Sat Aug 12 09:41:43 2006
@@ -210,7 +210,7 @@
   $opt{'updatedir'} = Mail::SpamAssassin::Util::untaint_file_path($opt{'updatedir'});
 }
 else {
-  $opt{'updatedir'} = $SA->sed_path('__local_state_dir__/spamassassin/__version__');
+  $opt{'updatedir'} = $SA->sed_path('__local_state_dir__/__version__');
 }
 
 dbg("generic: sa-update version $VERSION");

Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamassassin.raw?rev=431050&r1=431049&r2=431050&view=diff
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Sat Aug 12 09:41:43 2006
@@ -553,7 +553,7 @@
 
 =over 4
 
-=item @@LOCAL_STATE_DIR@@/spamassassin/@@VERSION@@
+=item @@LOCAL_STATE_DIR@@/@@VERSION@@
 
 =item @@LOCAL_STATE_DIR@@