You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@spamassassin.apache.org by he...@apache.org on 2019/07/25 15:56:36 UTC

svn commit: r1863742 - /spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm

Author: hege
Date: Thu Jul 25 15:56:36 2019
New Revision: 1863742

URL: http://svn.apache.org/viewvc?rev=1863742&view=rev
Log:
Revert Bug 7741

Modified:
    spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm?rev=1863742&r1=1863741&r2=1863742&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/RelayCountry.pm Thu Jul 25 15:56:36 2019
@@ -133,7 +133,6 @@ If not defined, GeoIP2 default search in
  /usr/local/share/GeoIP/GeoLite2-Country.mmdb
  /usr/share/GeoIP/GeoLite2-Country.mmdb
  /var/lib/GeoIP/GeoLite2-Country.mmdb
- (and same paths again for -City.mmdb)
 
 =back
 
@@ -166,12 +165,6 @@ If not defined, GeoIP2 default search in
       '/usr/local/share/GeoIP/GeoLite2-Country.mmdb',
       '/usr/share/GeoIP/GeoLite2-Country.mmdb',
       '/var/lib/GeoIP/GeoLite2-Country.mmdb',
-      '/usr/local/share/GeoIP/GeoIP2-City.mmdb',
-      '/usr/share/GeoIP/GeoIP2-City.mmdb',
-      '/var/lib/GeoIP/GeoIP2-City.mmdb',
-      '/usr/local/share/GeoIP/GeoLite2-City.mmdb',
-      '/usr/share/GeoIP/GeoLite2-City.mmdb',
-      '/var/lib/GeoIP/GeoLite2-City.mmdb',
       ],
     type => $Mail::SpamAssassin::Conf::CONF_TYPE_STRINGLIST,
     code => sub {