Update geoip (-28rc)

GeoIP update based on Maxmind GeoLite Country database from 2011-10-07.

LICENSE.txt

@@ -83,7 +83,7 @@ Public domain except as listed below:
    Copyright (C) 2003-2006 Satoshi Konno
    See licenses/LICENSE-UPnP.txt
 
-   GeoIP data free to use, courtesy http://ip-to-country.webhosting.info/
+   GeoIP data free to use, courtesy http://www.maxmind.com/
 
 
 Installer:
@@ -201,7 +201,7 @@ Applications:
        Silk icons: See licenses/LICENSE-SilkIcons.txt
 
        GeoIP Data:
-       Copyright (c) 2003 Direct Information Pvt. Ltd. All Rights Reserved.
+       Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
        See licenses/LICENSE-GeoIP.txt
 
    Router Console and I2PSnark themes:

history.txt

@@ -1,3 +1,9 @@
+2011-10-07 kytv
+  * GeoIP:
+    - Switch to Maxmind's GeoIP service (it's better maintained
+      than our old provider)
+    - Update based on Maxmind GeoLite Country database from 2011-10-07
+
 2011-10-07 zzz
   * Add https reseed thx h2ik
 

licenses/LICENSE-GeoIP.txt

@@ -1,18 +1,32 @@
-Copyright (c) 2003 Direct Information Pvt. Ltd. All Rights Reserved.
+OPEN DATA LICENSE (GeoLite Country and GeoLite City databases)
 
-This application uses the IP-to-Country Database
-provided by WebHosting.Info (http://www.webhosting.info),
-available from http://ip-to-country.webhosting.info.
+Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
 
-BECAUSE THE DATABASE IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE DATABASE,
-TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
-COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE DATABASE "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE OR ANY WARRANTIES
-REGARDING THE CONTENTS OR ACCURACY OF THE WORK.
+All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgment:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/"
+
+Redistribution and use with or without modification, are permitted provided
+that the following conditions are met:
+1. Redistributions must retain the above copyright notice, this list of
+conditions and the following disclaimer in the documentation and/or other
+materials provided with the distribution.
+2. All advertising materials and documentation mentioning features or use of
+this database must display the following acknowledgement:
+"This product includes GeoLite data created by MaxMind, available from
+http://maxmind.com/"
+3. "MaxMind" may not be used to endorse or promote products derived from this
+database without specific prior written permission.
+
+THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT
-HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE DATABASE AS PERMITTED
-ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE DATABASE, EVEN
-IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

router/java/src/net/i2p/router/RouterVersion.java

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 27;
+    public final static long BUILD = 28;
 
     /** for example "-test" */
     public final static String EXTRA = "-rc";