svn commit: r1841999 - in /spamassassin/trunk: UPGRADE lib/Mail/SpamAssassin/Conf.pm lib/Mail/SpamAssassin/GeoDB.pm

[he...@apache.org]

Author: hege
Date: Wed Sep 26 05:59:32 2018
New Revision: 1841999

URL: http://svn.apache.org/viewvc?rev=1841999&view=rev
Log:
Fix geoip_* to geodb_*. Doh!

Modified:
    spamassassin/trunk/UPGRADE
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm

Modified: spamassassin/trunk/UPGRADE
URL: http://svn.apache.org/viewvc/spamassassin/trunk/UPGRADE?rev=1841999&r1=1841998&r2=1841999&view=diff
==============================================================================
--- spamassassin/trunk/UPGRADE (original)
+++ spamassassin/trunk/UPGRADE Wed Sep 26 05:59:32 2018
@@ -21,7 +21,8 @@ Note for Users Upgrading to SpamAssassin
 
 - New internal Mail::SpamAssassin::GeoDB module that provides unified interface to
   modules GeoIP2::Database::Reader, Geo::IP, IP::Country::DB_File, IP::Country::Fast.
-  Utilized by RelayCountry and URILocalBL.
+  Utilized by RelayCountry and URILocalBL. Settings geodb_module, geodb_options,
+  geodb_search_path.
 
 
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1841999&r1=1841998&r2=1841999&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Wed Sep 26 05:59:32 2018
@@ -4358,7 +4358,7 @@ I<asn> - try loading ASN database
 Append full database path with colon, for example:
 I<isp:/opt/geoip/isp.mmdb>
 
-Plugins can internally request all types they require, geoip_options is only
+Plugins can internally request all types they require, geodb_options is only
 needed if the default location search (described below) does not work.
 
 GeoIP/GeoIP2 searches these files/directories:
@@ -4406,24 +4406,24 @@ GeoIP/GeoIP2 searches these files/direct
 
 =item geodb_search_path /path/to/GeoIP ...
 
-Alternative to geoip_options. Overrides the default list of directories to
+Alternative to geodb_options. Overrides the default list of directories to
 search for default filenames.
 
 =cut
 
   push (@cmds, {
-    setting => 'geoip_search_path',
+    setting => 'geodb_search_path',
     is_admin => 1,
     default => [],
     type => $CONF_TYPE_STRINGLIST,
     code => sub {
       my ($self, $key, $value, $line) = @_;
       if ($value eq 'reset') {
-        $self->{geodb}->{geoip_search_path} = [];
+        $self->{geodb}->{geodb_search_path} = [];
       } elsif ($value eq '') {
         return $MISSING_REQUIRED_VALUE;
       } else {
-        push(@{$self->{geodb}->{geoip_search_path}}, split(/\s+/, $value));
+        push(@{$self->{geodb}->{geodb_search_path}}, split(/\s+/, $value));
       }
     }
   });

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm?rev=1841999&r1=1841998&r2=1841999&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm Wed Sep 26 05:59:32 2018
@@ -130,8 +130,8 @@ sub init_database {
   my $geodb_dbs = $opts->{conf}->{options} || {};
   my $geodb_wanted = $opts->{wanted} || {};
 
-  my @geoip_search_path = defined $opts->{conf}->{geoip_search_path} ?
-    @{$opts->{conf}->{geoip_search_path}} : @geoip_default_path;
+  my @geoip_search_path = defined $opts->{conf}->{geodb_search_path} ?
+    @{$opts->{conf}->{geodb_search_path}} : @geoip_default_path;
 
   my $db;
   my $dbapi;