[Mldonkey-commits] mldonkey config/configure.in distrib/ChangeLog ...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/07/27 09:36:46

Modified files:
        config         : configure.in 
        distrib        : ChangeLog 
        src/networks/gnutella: gnutellaOptions.ml 

Log message:
        patch #6118

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/config/configure.in?cvsroot=mldonkey&r1=1.301&r2=1.302
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1304&r2=1.1305
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/gnutella/gnutellaOptions.ml?cvsroot=mldonkey&r1=1.22&r2=1.23

Patches:
Index: config/configure.in
===================================================================
RCS file: /sources/mldonkey/mldonkey/config/configure.in,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -b -r1.301 -r1.302
--- config/configure.in 26 Jun 2007 21:21:06 -0000      1.301
+++ config/configure.in 27 Jul 2007 09:36:45 -0000      1.302
@@ -303,11 +303,11 @@
 
 DONKEY=yes
 BITTORRENT=yes
-GNUTELLA=yes
-GNUTELLA2=yes
+GNUTELLA=no
+GNUTELLA2=no
 FASTTRACK=yes
 FILETP=yes
-DIRECT_CONNECT=no
+DIRECT_CONNECT=yes
 
 # **********   predefined configure variations
 
@@ -1490,16 +1490,16 @@
 
 echo -n " - Gnutella          "
 if test "$GNUTELLA" = "yes"; then
-  echo "enabled"
+  echo "enabled (warning: default hostcache URLs out-of-date)"
 else
-  echo "        disabled"
+  echo "        disabled - unmaintained"
 fi
 
 echo -n " - Gnutella2         "
 if test "$GNUTELLA2" = "yes"; then
-  echo "enabled"
+  echo "enabled (warning: default hostcache URLs out-of-date)"
 else
-  echo "        disabled"
+  echo "        disabled - unmaintained"
 fi
 
 echo -n " - Direct Connect    "

Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1304
retrieving revision 1.1305
diff -u -b -r1.1304 -r1.1305
--- distrib/ChangeLog   25 Jul 2007 19:27:09 -0000      1.1304
+++ distrib/ChangeLog   27 Jul 2007 09:36:45 -0000      1.1305
@@ -14,6 +14,16 @@
 ChangeLog
 =========
 
+2007/07/27
+6118: Configure: Update defaults
+- enable DirectConnect by default 
+- disable Gnutella & Gnutella2 by default
+  - MLDonkey does not support UDP host cache and contains
+    non-working GWebCache URLs
+  - Gnutella/G2 code has not been updated for several years,
+    its officially unmaintained for now
+  - remove non-existing GWebCache URLs
+
 2007/07/25
 6087: Fix logging of verbosity "bw", remove obsolete options
 6085: BT: Improve UTF8 support

Index: src/networks/gnutella/gnutellaOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/gnutella/gnutellaOptions.ml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/networks/gnutella/gnutellaOptions.ml    1 Jul 2007 13:00:12 -0000       
1.22
+++ src/networks/gnutella/gnutellaOptions.ml    27 Jul 2007 09:36:46 -0000      
1.23
@@ -53,19 +53,12 @@
   [
     "http://cache.kicks-ass.net:8000/";;
     "http://g2cache.theg2.net/gwcache/lynnx.asp";;
-    "http://galvatron.dyndns.org:59009/gwcache";;
-    "http://gcache.sexter.com:8080/gwc/";;
     "http://gwcrab.sarcastro.com:8001";;
     "http://gwebcache.bearshare.net/";;
     "http://gwebcache.bearshare.net/gcache.php";;
-    "http://intense.homelinux.coww.xolox.nl/gwebcache/";;
-    "http://kisama.ath.cx:8080/";;
-    "http://krill.shacknet.nu:20095/gwc";;
-    "http://loot.alumnigroup.org/";;
     "http://pokerface.ibiza.bishopston.net:3558/";;
     "http://t.az.is.teh.r0x0r.gtkg.de/";;
     "http://tribaldance.ibiza.bishopston.net:3558/";;
-    "http://www.deepnetexplorer.co.uk/webcache/";;
   ]
 
 let urlfiles = define_option gnutella_section 
@@ -73,7 +66,9 @@
   "A list of urlfile urls"
     (list_option string_option)
   [
+(*
     "http://loot.alumnigroup.org/";;
+*)
   ]
   
 let redirectors = define_option gnutella_section