[Mldonkey-commits] mldonkey distrib/Authors.txt distrib/ChangeLog ...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/12 11:44:34

Modified files:
        distrib        : Authors.txt ChangeLog 
        src/daemon/common: commonComplexOptions.ml 
Added files:
        distrib        : GeoIP_LICENSE.txt 

Log message:
        patch #4792

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/Authors.txt.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.671&tr2=1.672&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/GeoIP_LICENSE.txt?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.ml.diff?tr1=1.46&tr2=1.47&r1=text&r2=text

Patches:
Index: mldonkey/distrib/Authors.txt
diff -u mldonkey/distrib/Authors.txt:1.3 mldonkey/distrib/Authors.txt:1.4
--- mldonkey/distrib/Authors.txt:1.3    Thu Jul  7 00:25:45 2005
+++ mldonkey/distrib/Authors.txt        Thu Jan 12 11:44:34 2006
@@ -39,3 +39,5 @@
 
 Fasttrack plugin from giFT-fasttrack:
 Markus Kern
+
+This product includes GeoLite data created by MaxMind, available from 
http://maxmind.com/
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.671 mldonkey/distrib/ChangeLog:1.672
--- mldonkey/distrib/ChangeLog:1.671    Thu Jan 12 09:03:11 2006
+++ mldonkey/distrib/ChangeLog  Thu Jan 12 11:44:34 2006
@@ -15,6 +15,9 @@
 =========
 
 2006/01/12
+4792: GeoIP: Add license (distrib/GeoIP_LICENSE.txt, runinfo)
+      This product includes GeoLite data created by MaxMind,
+      available from http://maxmind.com/
 4776: EDK: Avoid LowID if max_indirect_connections is reached (thx to zet)
 4787: EDK: Show server version (ported from Mulus - thx to Knocker),
       disconnect blocked server after loading IP blocklist
Index: mldonkey/src/daemon/common/commonComplexOptions.ml
diff -u mldonkey/src/daemon/common/commonComplexOptions.ml:1.46 
mldonkey/src/daemon/common/commonComplexOptions.ml:1.47
--- mldonkey/src/daemon/common/commonComplexOptions.ml:1.46     Thu Jan 12 
09:03:11 2006
+++ mldonkey/src/daemon/common/commonComplexOptions.ml  Thu Jan 12 11:44:34 2006
@@ -1165,6 +1165,7 @@
       ^   (if Autoconf.gnutella2 = "yes" && !!enable_gnutella2 then " G2" else 
"")
       ^   (if Autoconf.filetp = "yes" && !!enable_fileTP then " FileTP" else 
"")
       ^  "\nServer usage: " ^ (if !!enable_servers then "enabled" else 
"disabled (you are not able to connect to ED2K Servers)")
+      ^  (if !Geoip.active then "\nThis product includes GeoLite data created 
by MaxMind, available from http://maxmind.com/"; else "")
       ^ (let uname = Unix32.uname () in
           if uname <> "" then Printf.sprintf "\nSystem info: %s" uname else "")
       ^ "\nUptime: " ^ Date.time_to_string (last_time () - start_time) 
"verbose"