Mailing List Archive

Author: felicity
Date: Sun Aug 20 14:14:40 2006
New Revision: 433047

URL: http://svn.apache.org/viewvc?rev=433047&view=rev
Log:
bug 4952: set a default value for DEF_RULES_DIR_, LOCAL_RULES_DIR, and LOCAL_STATE_DIR. this fixes an issue where third-party code which hasn't been updated to deal with LOCAL_STATE_DIR can still use updates.

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

Modified: spamassassin/branches/3.1/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/Makefile.PL?rev=433047&r1=433046&r2=433047&view=diff
==============================================================================
--- spamassassin/branches/3.1/Makefile.PL (original)
+++ spamassassin/branches/3.1/Makefile.PL Sun Aug 20 14:14:40 2006
@@ -180,7 +180,12 @@

'PMLIBDIRS' => [ 'lib' ],

- 'PM_FILTER' => '$(PREPROCESS) -Mconditional -Mvars -DVERSION="$(VERSION)" -DPREFIX="$(I_PREFIX)"',
+ 'PM_FILTER' => '$(PREPROCESS) -Mconditional -Mvars -DVERSION="$(VERSION)" \
+ -DPREFIX="$(I_PREFIX)" \
+ -DDEF_RULES_DIR="$(I_DATADIR)" \
+ -DLOCAL_RULES_DIR="$(I_CONFDIR)" \
+ -DLOCAL_STATE_DIR="$(I_LOCALSTATEDIR)" \
+ ',

'macro' => {
DATAFILES => $datafiles,
@@ -634,10 +639,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/branches/3.1/lib/Mail/SpamAssassin.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/lib/Mail/SpamAssassin.pm?rev=433047&r1=433046&r2=433047&view=diff
==============================================================================
--- spamassassin/branches/3.1/lib/Mail/SpamAssassin.pm (original)
+++ spamassassin/branches/3.1/lib/Mail/SpamAssassin.pm Sun Aug 20 14:14:40 2006
@@ -125,7 +125,7 @@
@default_rules_path = (
'./rules', # REMOVEFORINST
'../rules', # REMOVEFORINST
- '__local_state_dir__/spamassassin/__version__',
+ '__local_state_dir__/__version__',
'__def_rules_dir__',
'__prefix__/share/spamassassin',
'/usr/local/share/spamassassin',
@@ -248,7 +248,37 @@

If none of C<rules_filename>, C<site_rules_filename>, C<userprefs_filename>, or
C<config_text> is set, the C<Mail::SpamAssassin> module will search for the
-configuration files in the usual installed locations.
+configuration files in the usual installed locations using the below variable
+definitions which can be passed in.
+
+=over 4
+
+=item PREFIX
+
+Used as the root for certain directory paths such as:
+
+ '__prefix__/etc/mail/spamassassin'
+ '__prefix__/etc/spamassassin'
+
+Defaults to "@@PREFIX@@".
+
+=item DEF_RULES_DIR
+
+Location where the default rules are installed. Defaults to
+"@@DEF_RULES_DIR@@".
+
+=item LOCAL_RULES_DIR
+
+Location where the local site rules are installed. Defaults to
+"@@LOCAL_RULES_DIR@@".
+
+=item LOCAL_STATE_DIR
+
+Location of the local state directory, mainly used for installing updates via
+C<sa-update>. Defaults to "@@LOCAL_STATE_DIR@@".
+
+=back
+

=cut

@@ -273,8 +303,12 @@
dbg("generic: SpamAssassin version " . Version());

# if the libs are installed in an alternate location, and the caller
- # didn't set PREFIX, we should have an estimated guess ready ...
- $self->{PREFIX} ||= '@@PREFIX@@'; # substituted at 'make' time
+ # didn't set PREFIX, we should have an estimated guess ready, values
+ # substituted at 'make' time
+ $self->{PREFIX} ||= '@@PREFIX@@';
+ $self->{DEF_RULES_DIR} ||= '@@DEF_RULES_DIR@@';
+ $self->{LOCAL_RULES_DIR} ||= '@@LOCAL_RULES_DIR@@';
+ $self->{LOCAL_STATE_DIR} ||= '@@LOCAL_STATE_DIR@@';

$self->{conf} ||= new Mail::SpamAssassin::Conf ($self);
$self->{plugins} = Mail::SpamAssassin::PluginHandler->new ($self);
@@ -1808,6 +1842,7 @@
Mail::SpamAssassin::Conf(3)
Mail::SpamAssassin::PerMsgStatus(3)
spamassassin(1)
+sa-update(1)

=head1 BUGS


Modified: spamassassin/branches/3.1/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/sa-update.raw?rev=433047&r1=433046&r2=433047&view=diff
==============================================================================
--- spamassassin/branches/3.1/sa-update.raw (original)
+++ spamassassin/branches/3.1/sa-update.raw Sun Aug 20 14:14:40 2006
@@ -211,7 +211,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/branches/3.1/spamassassin.raw
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.1/spamassassin.raw?rev=433047&r1=433046&r2=433047&view=diff
==============================================================================
--- spamassassin/branches/3.1/spamassassin.raw (original)
+++ spamassassin/branches/3.1/spamassassin.raw Sun Aug 20 14:14:40 2006
@@ -551,7 +551,7 @@

=over 4

-=item @@LOCAL_STATE_DIR@@/spamassassin/@@VERSION@@
+=item @@LOCAL_STATE_DIR@@/@@VERSION@@

=item @@DEF_RULES_DIR@@