svn commit: r357279 - in /spamassassin/trunk: PACKAGING lib/Mail/SpamAssassin.pm spamassassin.raw spamd/spamd.raw

[jm...@apache.org]

Author: jm
Date: Fri Dec 16 18:35:22 2005
New Revision: 357279

URL: http://svn.apache.org/viewcvs?rev=357279&view=rev
Log:
add a new Makefile.PL parameter to support writing stuff to /var/lib/spamassassin: LOCAL_STATE_DIR

Modified:
    spamassassin/trunk/PACKAGING
    spamassassin/trunk/lib/Mail/SpamAssassin.pm
    spamassassin/trunk/spamassassin.raw
    spamassassin/trunk/spamd/spamd.raw

Modified: spamassassin/trunk/PACKAGING
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/PACKAGING?rev=357279&r1=357278&r2=357279&view=diff
==============================================================================
--- spamassassin/trunk/PACKAGING (original)
+++ spamassassin/trunk/PACKAGING Fri Dec 16 18:35:22 2005
@@ -156,6 +156,22 @@
     try this:
     	perl Makefile.PL CONFDIR=/etc/spamassassin
 
+LOCALSTATEDIR:
+  "sa-update" will download rule updates into LOCALSTATEDIR/spamassassin.
+
+  The default depends on the PREFIX and is compliant to the FHS:
+    - if PREFIX is either /usr or /usr/local:
+      /var/lib
+    - if PREFIX starts with /opt:
+      /var/opt
+    - else:
+      PREFIX/var
+
+  Samples:
+    If you'd like to have the downloaded rules files in /var/spamassassin
+    try this:
+    	perl Makefile.PL LOCALSTATEDIR=/var
+
 
 Installing to a directory different from the final destination
 --------------------------------------------------------------

Modified: spamassassin/trunk/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin.pm?rev=357279&r1=357278&r2=357279&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin.pm Fri Dec 16 18:35:22 2005
@@ -123,6 +123,7 @@
 @default_rules_path = (
   './rules',              # REMOVEFORINST
   '../rules',             # REMOVEFORINST
+  '__local_state_dir__/spamassassin/__version__',
   '__def_rules_dir__',
   '__prefix__/share/spamassassin',
   '/usr/local/share/spamassassin',
@@ -1586,9 +1587,11 @@
   my $orig_path = $path;
 
   $path =~ s/__local_rules_dir__/$self->{LOCAL_RULES_DIR} || ''/ges;
+  $path =~ s/__local_state_dir__/$self->{LOCAL_STATE_DIR} || ''/ges;
   $path =~ s/__def_rules_dir__/$self->{DEF_RULES_DIR} || ''/ges;
   $path =~ s{__prefix__}{$self->{PREFIX} || $Config{prefix} || '/usr'}ges;
   $path =~ s{__userstate__}{$self->get_and_create_userstate_dir()}ges;
+  $path =~ s/__version__/${VERSION}/gs;
   $path =~ s/^\~([^\/]*)/$self->expand_name($1)/es;
 
   $path = Mail::SpamAssassin::Util::untaint_file_path ($path);

Modified: spamassassin/trunk/spamassassin.raw
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamassassin.raw?rev=357279&r1=357278&r2=357279&view=diff
==============================================================================
--- spamassassin/trunk/spamassassin.raw (original)
+++ spamassassin/trunk/spamassassin.raw Fri Dec 16 18:35:22 2005
@@ -24,6 +24,7 @@
 my $PREFIX          = '@@PREFIX@@';             # substituted at 'make' time
 my $DEF_RULES_DIR   = '@@DEF_RULES_DIR@@';      # substituted at 'make' time
 my $LOCAL_RULES_DIR = '@@LOCAL_RULES_DIR@@';    # substituted at 'make' time
+my $LOCAL_STATE_DIR = '@@LOCAL_STATE_DIR@@';    # substituted at 'make' time
 
 use lib '@@INSTALLSITELIB@@';                   # substituted at 'make' time
 
@@ -248,6 +249,7 @@
     PREFIX              => $PREFIX,
     DEF_RULES_DIR       => $DEF_RULES_DIR,
     LOCAL_RULES_DIR     => $LOCAL_RULES_DIR,
+    LOCAL_STATE_DIR     => $LOCAL_STATE_DIR,
   }
 );
 
@@ -548,6 +550,8 @@
 
 =over 4
 
+=item @@LOCAL_STATE_DIR@@/spamassassin/@@VERSION@@
+
 =item @@DEF_RULES_DIR@@
 
 =item @@PREFIX@@/share/spamassassin
@@ -581,7 +585,7 @@
 
 =back
 
-From those two directories, SpamAssassin will first read files ending in
+From those three directories, SpamAssassin will first read files ending in
 ".pre" in lexical order and then it will read files ending in ".cf" in
 lexical order (most files begin with two numbers to make the sorting
 order obvious).

Modified: spamassassin/trunk/spamd/spamd.raw
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/spamd/spamd.raw?rev=357279&r1=357278&r2=357279&view=diff
==============================================================================
--- spamassassin/trunk/spamd/spamd.raw (original)
+++ spamassassin/trunk/spamd/spamd.raw Fri Dec 16 18:35:22 2005
@@ -18,6 +18,7 @@
 my $PREFIX          = '@@PREFIX@@';             # substituted at 'make' time
 my $DEF_RULES_DIR   = '@@DEF_RULES_DIR@@';      # substituted at 'make' time
 my $LOCAL_RULES_DIR = '@@LOCAL_RULES_DIR@@';    # substituted at 'make' time
+my $LOCAL_STATE_DIR = '@@LOCAL_STATE_DIR@@';    # substituted at 'make' time
 use lib '@@INSTALLSITELIB@@';                   # substituted at 'make' time
 
 BEGIN {    # added by jm for use inside the distro
@@ -698,6 +699,7 @@
     PREFIX          => $PREFIX,
     DEF_RULES_DIR   => $DEF_RULES_DIR,
     LOCAL_RULES_DIR => $LOCAL_RULES_DIR
+    LOCAL_STATE_DIR => $LOCAL_STATE_DIR
   }
 );